fix(jg):八大类设备导入调整：制造设计和技术参数是否齐全逻辑调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoExcelDto.java

@@ -21,6 +21,14 @@ public class EquipInfoExcelDto extends BaseDto {
     @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
+    @ApiModelProperty("资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】")
+    private String designIsComplete;
+
+    @ExcelIgnore
+    @ApiModelProperty("资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】")
+    private String factoryIsComplete;
+
     //----------------------------------------------------------------------基本信息
 
     @ApiModelProperty(value = "设备种类")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -193,7 +193,6 @@ public class DataDockServiceImpl {
         IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgDesignInfo.class);
         if (!ValidationUtil.isEmpty(designInfo)) {
             designInfo.setRecord(record);
-            designInfo.setDesignIsComplete("1");
             designInfo.setRecDate(new Date());
             idxBizJgDesignInfoService.save(designInfo);
         }
@@ -210,7 +209,6 @@ public class DataDockServiceImpl {
         if (!ValidationUtil.isEmpty(factoryInfo)) {
             factoryInfo.setRecord(record);
             factoryInfo.setRecDate(new Date());
-            factoryInfo.setFactoryIsComplete("1");
             idxBizJgFactoryInfoService.save(factoryInfo);
         }
     }
@@ -786,25 +784,34 @@ public class DataDockServiceImpl {
         checkNotBlank(data.getUseUnit(), "使用单位名称不能为空；", rowError);
         // 设计信息  电梯、场车、起重机械无"设计信息"
         if (!isDT && !isCC && !isQZJX) {
-            checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
-            Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
-            checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
-            if (!isYLGD) {
-                checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError);
-                Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
-                checkNotBlank(data.getDesignUseDate(), "设计日期不能为空；", rowError);
-                Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", rowError));
-                Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
+            if (ValidationUtil.isEmpty(data.getDesignUnitCreditCode()) || ValidationUtil.isEmpty(data.getDesignUnitName()) || ValidationUtil.isEmpty(data.getDesignUseDate()) || ValidationUtil.isEmpty(data.getDesignDate())) {
+                data.setDesignIsComplete("2");
+            } else {
+                data.setDesignIsComplete("1");
             }
+            // checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
+            Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
+            // checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
+            // checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError);
+            Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
+            // checkNotBlank(data.getDesignDate(), "设计日期不能为空；", rowError);
+            Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", rowError));
+            Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
+
         }
         // 制造信息
         if (!isYLGD) {
-            checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError);
+            if (ValidationUtil.isEmpty(data.getProduceUnitCreditCode()) || ValidationUtil.isEmpty(data.getProduceUnitName()) || ValidationUtil.isEmpty(data.getProduceLicenseNum()) || ValidationUtil.isEmpty(data.getFactoryNum()) || ValidationUtil.isEmpty(data.getProduceDate())) {
+                data.setFactoryIsComplete("2");
+            } else {
+                data.setFactoryIsComplete("1");
+            }
+            // checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError);
             Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确；", rowError));
-            checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", rowError);
-            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", rowError);
-            checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", rowError);
-            checkNotBlank(data.getProduceDate(), "制造日期不能为空；", rowError);
+            // checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", rowError);
+            // checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", rowError);
+            // checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", rowError);
+            // checkNotBlank(data.getProduceDate(), "制造日期不能为空；", rowError);
             Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", rowError));
         }
     }