切换分支备份

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -233,7 +234,7 @@ public class UdiRelevanceController extends BaseController {
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
                 BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
-                BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
+                BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
                 udiRelevanceResponses.add(udiRelevanceResponse);
             }
         }

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -803,12 +803,12 @@ public class IoOrderController extends BaseController {
         //这个不等于空表示要查询发票对应的单据
         if (filterOrderRequest.getInvoiceEncode() != null) {
             //查询发票详情
-            QueryWrapper<IoOrderInvoiceEntity> ew=new QueryWrapper<IoOrderInvoiceEntity>();
+            QueryWrapper<IoOrderInvoiceEntity> ew = new QueryWrapper<IoOrderInvoiceEntity>();
-            ew.eq("invoiceEncode",filterOrderRequest.getInvoiceEncode());
+            ew.eq("invoiceEncode", filterOrderRequest.getInvoiceEncode());
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list(ew);
             List<String> orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList());
             filterOrderRequest.setOrderIds(orderIds);
-            if(CollectionUtils.isEmpty(orderIds)){
+            if (CollectionUtils.isEmpty(orderIds)) {
                 PageInfo<IoOrderResponse> pageInfo = new PageInfo<>();
                 return ResultVOUtils.page(pageInfo);
             }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari: