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/common/DataDockTemplateVersionUtils.java

@@ -43,7 +43,7 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("工业管道设备", "V1.0.0");
         VERSION_MAP.put("公用管道设备", "V1.0.0");
         VERSION_MAP.put("历史无证_压力容器设备_氧舱", "V1.0.1");
-        VERSION_MAP.put("历史无证设备_场内机动车辆", "V1.0.0");
+        VERSION_MAP.put("历史无证设备_场内机动车辆", "V1.0.1");
         VERSION_MAP.put("历史无证设备_电梯设备", "V1.0.1");
         VERSION_MAP.put("历史无证设备_管道设备", "V1.0.0");
         VERSION_MAP.put("历史无证设备_锅炉设备", "V1.0.0");
@@ -71,7 +71,7 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("新设备_压力容器设备_固定式", "V1.0.1");
         VERSION_MAP.put("新设备_压力容器设备_氧舱", "V1.0.1");
         VERSION_MAP.put("新设备_游乐设施设备", "V1.0.0");
-        VERSION_MAP.put("压力容器设备", "V1.0.1");
+        VERSION_MAP.put("压力容器设备", "V1.0.2");
         VERSION_MAP.put("长输管道设备", "V1.0.0");
     }
 

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

@@ -31,262 +31,256 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @NotBlank(message = "设备名称不能为空")
     private String productName;
 
-    @ApiModelProperty(value = "品牌名称")
-    @ExcelProperty(value = "品牌名称", index = 1)
-    @NotBlank(message = "品牌名称不能为空")
-    @Size(min = 0, max = 100, message = "品牌名称不能超过100个字符")
-    private String brandName;
-
     @ApiModelProperty(value = "设备型号")
-    @ExcelProperty(value = "设备型号", index = 2)
+    @ExcelProperty(value = "设备型号", index = 1)
     @NotBlank(message = "设备型号不能为空")
     private String equType;
 
     @ApiModelProperty(value = "单位内部编号")
-    @ExcelProperty(value = "单位内部编号", index = 3)
+    @ExcelProperty(value = "单位内部编号", index = 2)
     @NotBlank(message = "单位内部编号不能为空")
     private String useInnerCode;
 
     @ApiModelProperty(value = "是否车用气瓶")
-    @ExcelProperty(value = "是否车用气瓶", index = 4, converter = VehicleCylinderConverter.class)
+    @ExcelProperty(value = "是否车用气瓶", index = 3, converter = VehicleCylinderConverter.class)
     @NotBlank(message = "是否车用气瓶不能为空")
     private String whetherVehicleCylinder;
 
     @ApiModelProperty(value = "有无设备代码")
-    @ExcelProperty(value = "有无设备代码", index = 5, converter = EquCodeTypeConverter.class)
+    @ExcelProperty(value = "有无设备代码", index = 4, converter = EquCodeTypeConverter.class)
     @NotBlank(message = "有无设备代码不能为空")
     private String equCodeType;
 
     @ApiModelProperty(value = "设备代码")
-    @ExcelProperty(value = "设备代码", index = 6)
+    @ExcelProperty(value = "设备代码", index = 5)
     private String equCode;//判断是否必填和位数
 
     @ApiModelProperty(value = "气瓶分类")
-    @ExcelProperty(value = "气瓶分类", index = 7, converter = CylinderCategoryConverter.class)
+    @ExcelProperty(value = "气瓶分类", index = 6, converter = CylinderCategoryConverter.class)
     private String cylinderCategory;
 
     @ApiModelProperty(value = "设备总价值(万元)")
-    @ExcelProperty(value = "设备总价值(万元)", index = 8)
+    @ExcelProperty(value = "设备总价值(万元)", index = 7)
     @NotBlank(message = "设备总价值(万元)不能为空")
     private String equPrice;
 
 
     //设计信息
     @ApiModelProperty(value = "设计单位统一社会信用代码")
-    @ExcelProperty(value = "设计单位统一社会信用代码", index = 9)
+    @ExcelProperty(value = "设计单位统一社会信用代码", index = 8)
     @NotBlank(message = "设计单位统一社会信用代码不能为空")
     private String designUnitCreditCode;
 
     @ApiModelProperty(value = "设计单位名称")
-    @ExcelProperty(value = "设计单位名称", index = 10)
+    @ExcelProperty(value = "设计单位名称", index = 9)
     @NotBlank(message = "设计单位名称不能为空")
     private String designUnitName;
 
     @ApiModelProperty(value = "设计许可编号")
-    @ExcelProperty(value = "设计许可编号", index = 11)
+    @ExcelProperty(value = "设计许可编号", index = 10)
     private String designLicenseNum;
 
     @ApiModelProperty(value = "设计使用年限(年)")
-    @ExcelProperty(value = "设计使用年限(年)", index = 12)
+    @ExcelProperty(value = "设计使用年限(年)", index = 11)
     private String designUseDate;
 
     @ApiModelProperty(value = "设计日期")
-    @ExcelProperty(value = "设计日期", index = 13)
+    @ExcelProperty(value = "设计日期", index = 12)
     @DateTimeFormat("yyyy-MM-dd")
     private String designDate;
 
     @ApiModelProperty(value = "总图图号")
-    @ExcelProperty(value = "总图图号", index = 14)
+    @ExcelProperty(value = "总图图号", index = 13)
     private String drawingDo;
 
     @ApiModelProperty(value = "设计文件鉴定单位")
-    @ExcelProperty(value = "设计文件鉴定单位", index = 15)
+    @ExcelProperty(value = "设计文件鉴定单位", index = 14)
     private String appraisalUnit;
 
     @ApiModelProperty(value = "设计文件鉴定日期")
-    @ExcelProperty(value = "设计文件鉴定日期", index = 16)
+    @ExcelProperty(value = "设计文件鉴定日期", index = 15)
     @DateTimeFormat("yyyy-MM-dd")
     private String appraisalDate;
 
     //制造信息
     @ApiModelProperty(value = "制造单位统一社会信用代码")
-    @ExcelProperty(value = "制造单位统一社会信用代码", index = 17)
+    @ExcelProperty(value = "制造单位统一社会信用代码", index = 16)
     @NotBlank(message = "制造单位统一社会信用代码不能为空")
     private String produceUnitCreditCode;
 
     @ApiModelProperty(value = "制造单位名称")
-    @ExcelProperty(value = "制造单位名称", index = 18)
+    @ExcelProperty(value = "制造单位名称", index = 17)
     @NotBlank(message = "制造单位名称不能为空")
     private String produceUnitName;
 
     @ApiModelProperty(value = "制造许可编号")
-    @ExcelProperty(value = "制造许可编号", index = 19)
+    @ExcelProperty(value = "制造许可编号", index = 18)
     @NotBlank(message = "制造许可编号不能为空")
     private String produceLicenseNum;
 
     @ApiModelProperty(value = "出厂编号/产品编码")
-    @ExcelProperty(value = "出厂编号/产品编码", index = 20)
+    @ExcelProperty(value = "出厂编号/产品编码", index = 19)
     @NotBlank(message = "出厂编号/产品编码不能为空")
     private String factoryNum;
 
     @ApiModelProperty(value = "制造日期")
-    @ExcelProperty(value = "制造日期", index = 21)
+    @ExcelProperty(value = "制造日期", index = 20)
     @NotBlank(message = "制造日期不能为空")
     @DateTimeFormat("yyyy-MM-dd")
     private String produceDate;
 
     @ApiModelProperty(value = "是否进口")
-    @ExcelProperty(value = "是否进口", index = 22, converter = ImportedConverter.class)
+    @ExcelProperty(value = "是否进口", index = 21, converter = ImportedConverter.class)
     private String imported;
 
     @ApiModelProperty(value = "制造国")
-    @ExcelProperty(value = "制造国", index = 23)
+    @ExcelProperty(value = "制造国", index = 22)
     private String produceCountry;
 
     //检验检测
     @ApiModelProperty(value = "检测机构名称")
-    @ExcelProperty(value = "检测机构名称", index = 24)
+    @ExcelProperty(value = "检测机构名称", index = 23)
     @NotBlank(message = "检测机构名称不能为空")
     private String inspectOrgName;
 
     @ApiModelProperty(value = "检测机构代码")
-    @ExcelProperty(value = "检测机构代码", index = 25)
+    @ExcelProperty(value = "检测机构代码", index = 24)
     @NotBlank(message = "检测机构代码不能为空")
     private String inspectOrgCode;
 
     @ApiModelProperty(value = "检测人员名称")
-    @ExcelProperty(value = "检测人员名称", index = 26)
+    @ExcelProperty(value = "检测人员名称", index = 25)
     @NotBlank(message = "检测人员名称不能为空")
     private String inspectStaff;
 
     @ApiModelProperty(value = "检测日期")
-    @ExcelProperty(value = "检测日期", index = 27)
+    @ExcelProperty(value = "检测日期", index = 26)
     @NotBlank(message = "检测日期不能为空")
     @DateTimeFormat("yyyy-MM-dd")
     private String inspectDate;
 
     @ApiModelProperty(value = "检验报告编号")
-    @ExcelProperty(value = "检验报告编号", index = 28)
+    @ExcelProperty(value = "检验报告编号", index = 27)
     private String inspectReportNo;
 
     //技术参数
-    @ExcelProperty(value = "额定质量(kg)", index = 29)
+    @ExcelProperty(value = "额定质量(kg)", index = 28)
     @ApiModelProperty(value = "额定质量(kg)")
     private String ratedQuality;
 
-    @ExcelProperty(value = "使用环境温度(℃)", index = 30)
+    @ExcelProperty(value = "使用环境温度(℃)", index = 29)
     @ApiModelProperty(value = "使用环境温度(℃)")
     private String ambientTemperature;
 
-    @ExcelProperty(value = "单瓶容积(m3)", index = 31)
+    @ExcelProperty(value = "单瓶容积(m3)", index = 30)
     @ApiModelProperty(value = "单瓶容积(m3)")
     @NotBlank(message = "单瓶容积(m3)不能为空")
     private String singleBottleVolume;
 
-    @ExcelProperty(value = "型号", index = 32)
+    @ExcelProperty(value = "型号", index = 31)
     @ApiModelProperty(value = "型号")
     private String modelNumber;
 
-    @ExcelProperty(value = "充装介质", index = 33)
+    @ExcelProperty(value = "充装介质", index = 32)
     @ApiModelProperty(value = "充装介质")
     @NotBlank(message = "充装介质不能为空")
     private String chargingMedium;
 
-    @ExcelProperty(value = "规格", index = 34)
+    @ExcelProperty(value = "规格", index = 33)
     @ApiModelProperty(value = "规格")
     private String specification;
 
-    @ExcelProperty(value = "外径", index = 35)
+    @ExcelProperty(value = "外径", index = 34)
     @ApiModelProperty(value = "外径")
     private String outsideDiameter;
 
-    @ExcelProperty(value = "壁厚", index = 36)
+    @ExcelProperty(value = "壁厚", index = 35)
     @ApiModelProperty(value = "壁厚")
     private String wallThickness;
 
-    @ExcelProperty(value = "长度", index = 37)
+    @ExcelProperty(value = "长度", index = 36)
     @ApiModelProperty(value = "长度")
     private String length;
 
-    @ExcelProperty(value = "公称工作压力(MPa)", index = 38)
+    @ExcelProperty(value = "公称工作压力(MPa)", index = 37)
     @ApiModelProperty(value = "公称工作压力(MPa)")
     @NotBlank(message = "公称工作压力(MPa)不能为空")
     private String nominalWorkingPressure;
 
-    @ExcelProperty(value = "材料(管路)", index = 39)
+    @ExcelProperty(value = "材料(管路)", index = 38)
     @ApiModelProperty(value = "材料(管路)")
     private String piping;
 
-    @ExcelProperty(value = "无损检测方法(气瓶)", index = 40, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(气瓶)", index = 39, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(气瓶)")
     private String qpLossless;//5988
 
-    @ExcelProperty(value = "材料(瓶体)", index = 41)
+    @ExcelProperty(value = "材料(瓶体)", index = 40)
     @ApiModelProperty(value = "材料(瓶体)")
     private String bottleBody;
 
-    @ExcelProperty(value = "材料(端塞)", index = 42)
+    @ExcelProperty(value = "材料(端塞)", index = 41)
     @ApiModelProperty(value = "材料(端塞)")
     private String endPlug;
 
-    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 43)
+    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 42)
     @ApiModelProperty(value = "无损检测比例(管路)(%)")
     private String glRatio;
 
-    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 44)
+    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 43)
     @ApiModelProperty(value = "无损检测比例(气瓶)(%)")
     private String qpRatio;
 
-    @ExcelProperty(value = "无损检测方法(管路)", index = 45, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(管路)", index = 44, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(管路)")
     private String glLossless;
 
-    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 46)
+    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 45)
     @ApiModelProperty(value = "耐压实验压力(气瓶)(Mpa)")
     private String qpPressure;
 
-    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 47)
+    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 46)
     @ApiModelProperty(value = "耐压实验压力(管路)(Mpa)")
     private String glPressure;
 
-    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 48)
+    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 47)
     @ApiModelProperty(value = "气密性试验压力(气瓶)(Mpa)")
     private String qpAirTightness;
 
-    @ExcelProperty(value = "气体置换后压力(MPa)", index = 49)
+    @ExcelProperty(value = "气体置换后压力(MPa)", index = 48)
     @ApiModelProperty(value = "气体置换后压力(MPa)")
     private String displacementPressure;
 
-    @ExcelProperty(value = "热处理方式", index = 50)
+    @ExcelProperty(value = "热处理方式", index = 49)
     @ApiModelProperty(value = "热处理方式")
     private String heatTreatmentMethod;
 
-    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 51)
+    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 50)
     @ApiModelProperty(value = "气密性实验压力(管路)(MPa)")
     private String glAirTightness;
 
-    @ExcelProperty(value = "气瓶安装位置", index = 52)
+    @ExcelProperty(value = "气瓶安装位置", index = 51)
     @ApiModelProperty(value = "气瓶安装位置")
     private String installationPosition;
 
-    @ExcelProperty(value = "瓶体内含氧量(%)", index = 53)
+    @ExcelProperty(value = "瓶体内含氧量(%)", index = 52)
     @ApiModelProperty(value = "瓶体内含氧量(%)")
     private String oxygen;
 
-    @ExcelProperty(value = "热处理温度(℃)", index = 54)
+    @ExcelProperty(value = "热处理温度(℃)", index = 53)
     @ApiModelProperty(value = "热处理温度(℃)")
     private String qpHeatTreatmentTemperature;
 
     /**
      * 信息化管理字段-信息化管理情况
      */
-    @ExcelProperty(value = "信息化管理情况", index = 55, converter = InformationSituationConverter.class)
+    @ExcelProperty(value = "信息化管理情况", index = 54, converter = InformationSituationConverter.class)
     private String informationSituation;
 
     /**
      * 信息化管理字段-二维码或者电子标签编号
      */
-    @ExcelProperty(value = "二维码或者电子标签编号", index = 56)
+    @ExcelProperty(value = "二维码或者电子标签编号", index = 55)
     private String informationManageCode;
 
     @ExcelIgnore

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -94,7 +94,6 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
             log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
             // 检查各字段是否为空，如果为空则追加错误信息
             checkNotBlank(data.getProductName(), "设备名称不能为空");
-            checkNotBlank(data.getBrandName(), "品牌名称不能为空");
             checkNotBlank(data.getEquType(), "设备型号不能为空");
             checkNotBlank(data.getUseInnerCode(), "单位内部编号不能为空");
             if (useInnerCodeList.contains(data.getUseInnerCode())) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/MaintainNoticeStrategyHandler.java

@@ -24,7 +24,8 @@ public class MaintainNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.WXGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", maintainInfo.get("receiveOrgCreditCode"));
-
+        basic.put("code", maintainInfo.get("EQU_LIST_CODE"));
+        basic.put("equCategory", maintainInfo.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", maintainInfo);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/ReformNoticeStrategyHandler.java

@@ -23,6 +23,8 @@ public class ReformNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.GZGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", reformNotice.get("receiveOrgCode"));
+        basic.put("code", reformNotice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", reformNotice.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", reformNotice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationReformStrategyHandler.java

@@ -25,6 +25,7 @@ public class RegistrationReformStrategyHandler implements ToBeSubmitDetailStrate
         basic.put("receiveOrgCreditCode1", notice.get("receiveCompanyCode"));
         basic.put("businessScenarios", "0");
         basic.put("code", notice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
         Map<String, Object> responseDetail = (Map<String, Object>) notice.get("responseDetail");
         if (responseDetail != null) {
             responseDetail.put("techInfo", notice.get("techInfo"));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/TransferNoticeStrategyHandler.java

@@ -24,7 +24,8 @@ public class TransferNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
         Map<String, Object> basic = new HashMap<>();
         basic.put("type", ApplicationFormTypeEnum.YZGZ.getBusinessCode());
         basic.put("receiveOrgCreditCode", transferInfo.get("receiveOrgCreditCode"));
-
+        basic.put("code", transferInfo.get("EQU_LIST_CODE"));
+        basic.put("equCategory", transferInfo.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", transferInfo);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/UseRegistrationStrategyHandler.java

@@ -25,6 +25,8 @@ public class UseRegistrationStrategyHandler implements ToBeSubmitDetailStrategy
         basic.put("type", ApplicationFormTypeEnum.SYDJ.getBusinessCode());
         basic.put("businessScenarios", "0");
         basic.put("receiveOrgCreditCode1", notice.get("receiveOrgCode"));
+        basic.put("code", notice.get("EQU_LIST_CODE"));
+        basic.put("equCategory", notice.get("EQU_CATEGORY_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", notice);
         result.put("basic", basic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

@@ -30,6 +30,7 @@ public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrat
         basic.put("receiveOrgCreditCode1", vo.getReceiveOrgCode());
         basic.put("businessScenarios", "1");
         basic.put("code", "2300");
+        basic.put("equCategory", "23T0");
         Map<String, Map<String, Object>> result = new HashMap<>();
         useRegFormUpload.put("useRegistrationFormUrl", vo.getUseRegistrationFormUrl());
         result.put("notice", Bean.BeantoMap(vo));

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -3616,7 +3616,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
 
-        if (!equipmentParamsForm.isEmpty()){
         // 电梯
         if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
             IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsElevator.class);
@@ -3746,7 +3745,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
 
         }
-        }
 
         // 八大类技术参数和主要零部件和安全附件表
         if (!ValidationUtil.isEmpty(mainPartsList)) {
@@ -4666,9 +4664,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 //            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
             //checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
             if ("0".equals(data.getWhetherVehicleCylinder())) {
-                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-                if (!StringUtils.isEmpty(data.getFactoryNum())){
-                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(),data.getProduceUnitName(), result);
+//                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
+                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
+                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
                 }
             } else {
                 if (!StringUtils.isEmpty(data.getFactoryNum())){