资质证书同步修改，检验报告冷链报告支持多条，单据类型修改

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

@@ -614,8 +614,8 @@ public class IoOrderDetailBizController extends BaseController {
             orderEntity.setUpdateTime(new Date());
             orderService.update(orderEntity);
         }
-        ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getFilePath());
-        ioOrderDetailBizEntity.setCheckColdFileName(ioOrderDetailBizEntity.getColdFilePath());
+        ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getCheckFileName());
+        ioOrderDetailBizEntity.setCheckColdFileName(ioOrderDetailBizEntity.getCheckColdFileName());
         boolean b = orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success("修改成功！");
     }

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -299,11 +299,6 @@ public class PurOrderController {
     }
 
 
-    public void genOrder() {
-
-    }
-
-
     /**
      * 查询采购订单列表
      */

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -382,7 +382,7 @@ public class SpsSyncDownloadService {
                 Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT, createFile);
                 totalTimeMap.put(BasicExportStatusTimeEnum.SUP_CERT, map);
                 List<SupCertEntity> supCertList = supCertService.list(Wrappers.lambdaQuery(SupCertEntity.class)
-                        .eq(SupCertEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
+                        .ge(SupCertEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
                         .le(!ge && (boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now)
                         .between(ge, SupCertEntity::getUpdateTime, syncTime, now)
                         .between(!ge && !(boolean) map.get("isNew"), SupCertEntity::getUpdateTime
@@ -392,7 +392,8 @@ public class SpsSyncDownloadService {
                     jsonMap.put(SupCertEntity.class.getSimpleName(), supCertList);
                     for (SupCertEntity supCertEntity : supCertList) {
                         if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
-                            syncFiles.add(supCertEntity.getFilePath());
+                            String[] fileNames = supCertEntity.getFilePath().split(",");
+                            syncFiles.addAll(CollUtil.toList(fileNames));
                         }
                     }
                     if (CollUtil.isNotEmpty(syncFiles)) {
@@ -410,7 +411,7 @@ public class SpsSyncDownloadService {
                     jsonMap.put(SupCertSetEntity.class.getSimpleName(), supCertSetList);
                 }
                 List<SupCompanyEntity> supCompanyList = supCompanyService.list(Wrappers.lambdaQuery(SupCompanyEntity.class)
-                        .eq(SupCompanyEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
+                        .ge(SupCompanyEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
                         .le(!ge && (boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime, now)
                         .between(ge, SupCompanyEntity::getUpdateTime, syncTime, now)
                         .between(!ge && !(boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime
@@ -421,7 +422,7 @@ public class SpsSyncDownloadService {
                     jsonMap.put(SupCompanyEntity.class.getSimpleName(), supCompanyList);
                 }
                 List<SupManufacturerEntity> supManufacturerList = supManufacturerService.list(Wrappers.lambdaQuery(SupManufacturerEntity.class)
-                        .eq(SupManufacturerEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
+                        .ge(SupManufacturerEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
                         .le(!ge && (boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime, now)
                         .between(ge, SupManufacturerEntity::getUpdateTime, syncTime, now)
                         .between(!ge && !(boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime
@@ -432,7 +433,7 @@ public class SpsSyncDownloadService {
                     jsonMap.put(SupManufacturerEntity.class.getSimpleName(), supManufacturerList);
                 }
                 List<SupProductEntity> supProductList = supProductService.list(Wrappers.lambdaQuery(SupProductEntity.class)
-                        .eq(SupProductEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
+                        .ge(SupProductEntity::getAuditStatus, ConstantStatus.AUDIT_PASS)
                         .le(!ge && (boolean) map.get("isNew"), SupProductEntity::getUpdateTime, now)
                         .between(ge, SupProductEntity::getUpdateTime, syncTime, now)
                         .between(!ge && !(boolean) map.get("isNew"), SupProductEntity::getUpdateTime
@@ -876,8 +877,13 @@ public class SpsSyncDownloadService {
                 if (CollUtil.isNotEmpty(bizEntities)) {
                     orderDetailBizEntities.addAll(bizEntities);
                     for (IoOrderDetailBizEntity bizEntity : bizEntities) {
-                        if (StrUtil.isNotEmpty(bizEntity.getCheckFileName())) {
-                            syncFiles.add(bizEntity.getCheckFileName());
+                        if (StrUtil.isNotEmpty(bizEntity.getFilePath())) {
+                            String[] fileNames = bizEntity.getFilePath().split(",");
+                            syncFiles.addAll(CollUtil.toList(fileNames));
+                        }
+                        if (StrUtil.isNotEmpty(bizEntity.getColdFilePath())) {
+                            String[] fileNames = bizEntity.getColdFilePath().split(",");
+                            syncFiles.addAll(CollUtil.toList(fileNames));
                         }
                     }
                 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -260,7 +260,7 @@
                 AND auth_warehouse_bustype.code = #{code}
             </if>
             <if test="invCode != ''and invCode != null">
-                AND auth_warehouse_bustype.code = #{code}
+                AND auth_warehouse_bustype.code = #{invCode}
             </if>
         </where>
         group by basic_bussiness_type.action