长泰添加多个字段查询

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1381,13 +1381,25 @@ public class CtqyyClient extends CommonHttpClient {
             wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime + " 23:59:59");
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
+            String key = udiwmsBasicSkPrescribeRequest.getKey();
             wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code));
+            wrapper.and(StrUtil.isNotEmpty(key), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, key)
+                    .or().eq(VInsurNationGoodsPhysic::getRXNO, key)
+                    .or().eq(VInsurNationGoodsPhysic::getPSN_NAME, key)
+                    .or().eq(VInsurNationGoodsPhysic::getPSN_NO, key)
+            );
+
             IPage<VInsurNationGoodsPhysic> page = goodsPhysicMapper
                     .selectPage(new Page<VInsurNationGoodsPhysic>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
             return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page);
         } else {
             LambdaQueryWrapper<VInsurNationGoodsReturn> wrapper = new LambdaQueryWrapper<>();
             String code = udiwmsBasicSkPrescribeRequest.getCode();
+            String key = udiwmsBasicSkPrescribeRequest.getKey();
+            wrapper.and(StrUtil.isNotEmpty(key), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, key)
+                    .or().eq(VInsurNationGoodsReturn::getPSN_NAME, key)
+                    .or().eq(VInsurNationGoodsReturn::getPSN_NO, key)
+            );
             wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code));
             IPage<VInsurNationGoodsReturn> page = vInsurNationGoodsReturnMapper
                     .selectPage(new Page<VInsurNationGoodsReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
@@ -1470,6 +1482,7 @@ public class CtqyyClient extends CommonHttpClient {
             String endTime = udiwmsThrOrderRequest.getEndTime();
             wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, startTime + " 00:00:00");
             wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, endTime + " 23:59:59");
+            wrapper.and(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getCorpName()), t -> t.like(VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getCorpName()).or().eq(VYpzsIoInfo::getCONSIGNOR_NAME, udiwmsThrOrderRequest.getCorpName()));
 
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType());
@@ -1608,6 +1621,9 @@ public class CtqyyClient extends CommonHttpClient {
                 ioCollectOrder.setCreateTime(new Date());
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
                 ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO());
+                ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
+                ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
+                ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
                 ioCollectOrder.setUpdateTime(new Date());
                 ioCollectOrder.setSplitStatus(0);
                 ioCollectOrder.setTagStatus(0);

src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java

@@ -126,5 +126,7 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
 
     private String startTime;
     private String endTime;
+
+    private String key;
 }