Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -575,18 +575,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     String status = ConstructionEnum.getName.get(integer);
                     dto2.put(CONSTRUCTIONTYPE, status);
                 }
-                if (!ValidationUtil.isEmpty(dto2.get(EQUDEFINE))) {
-                    //转化设备品种名称
-                    String code = dto2.get(EQUDEFINE).toString();
-                    List<EquipmentCategory> equipmentCategoryList = commonService.getEquipmentCategoryList(code, null);
-                    if (!ValidationUtil.isEmpty(equipmentCategoryList)) {
-                        String name = equipmentCategoryList.get(0).getName();
-                        dto2.put(EQUDEFINE, name);
-                    } else {
-                        dto2.put(EQUDEFINE, code);
-                    }
-                    dto2.put(EQUDEFINECODE, code);
-                }
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationEquipModel.java

@@ -34,6 +34,8 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
 
     @ApiModelProperty(value = "设备类别")
     private String equCategory;
+    @ApiModelProperty(value = "设备类别Code")
+    private String equCategoryCode;
 
     @ApiModelProperty(value = "设备类别名称")
     private String equCategoryName;
@@ -52,12 +54,16 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
 
     @ApiModelProperty(value = "设备种类")
     private String equList;
+    @ApiModelProperty(value = "设备种类Code")
+    private String equListCode;
 
     @ApiModelProperty(value = "设备种类名称")
     private String equListName;
 
     @ApiModelProperty(value = "设备品种")
     private String equDefine;
+    @ApiModelProperty(value = "设备品种Code")
+    private String equDefineCode;
 
     @ApiModelProperty(value = "使用登记证编号")
     private String useOrgCode;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -108,7 +108,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
  @ApiModelProperty(value = "产品质量证明书")
  private List<Map<String,Object>> cpzl;
  @ApiModelProperty(value = "施工自行检查报告")
- private List<Map<String,Object>> sgzx ;
+ private List<Map<String,Object>> sgzxbg ;
  @ApiModelProperty(value = "施工合同或证明")
  private List<Map<String,Object>> sght;
  @ApiModelProperty(value = "施工方案/施工设计文件")

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

@@ -137,22 +137,28 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             } else {
                 model.setWorkflowRole(role);
             }
-            // endregion
-            model = this.createWithModel(model);
-            //保存报检装备监管码
+
+            List<JyjcInspectionApplicationEquip>  equipInfos = new ArrayList<>();
             if (null != model.getEquip() && model.getEquip().size() > 0) {
                 List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
                 for (JyjcInspectionApplicationEquipModel equip : equips) {
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
-                    equipInfo.setEquDefine(equip.getEquDefine());
-                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquDefine(equip.getEquDefineCode());
+                    equipInfo.setEquList(equip.getEquListCode());
                     equipInfo.setEquipUnicode(equip.getSupervisoryCode());
-                    equipInfo.setEquCategory(equip.getEquCategoryName());
-                    equipInfo.setApplicationSeq(model.getSequenceNbr());
-                    jyjcInspectionApplicationEquipService.save(equipInfo);
+                    equipInfo.setEquCategory(equip.getEquCategoryCode());
+                 //   equipInfo.setApplicationSeq(model.getSequenceNbr());
+                    equipInfos.add(equipInfo);
                 }
             }
-
+            model.setNumberOfEquip(equipInfos.size());
+            // endregion
+            model = this.createWithModel(model);
+            //保存报检装备监管码
+            for (JyjcInspectionApplicationEquip equipInfo : equipInfos) {
+                equipInfo.setApplicationSeq(model.getSequenceNbr());
+            }
+            applicationEquipService.saveBatch(equipInfos);
     //        Map<String, Object> map = BeanUtil.beanToMap(model);
             // 附件保存
             List<String> enumNameList = DocumentEnum.getEnumNameList();
@@ -180,12 +186,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                // List<Map<String, Object>> equip = model.getEquip();
                // List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
                 List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
+                int num = equips.size();
+                model.setNumberOfEquip(num);
                 for (JyjcInspectionApplicationEquipModel equip : equips) {
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
-                    equipInfo.setEquDefine(equip.getEquDefine());
-                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquDefine(equip.getEquDefineCode());
+                    equipInfo.setEquList(equip.getEquListCode());
                     equipInfo.setEquipUnicode(equip.getSupervisoryCode());
-                    equipInfo.setEquCategory(equip.getEquCategoryName());
+                    equipInfo.setEquCategory(equip.getEquCategoryCode());
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
                     jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
@@ -342,6 +350,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             resultModel.setResultType(inspectionApplicationModel.getResultType());
+            resultModel.setInspectionType(applicationEquipModels.get(i).getInspectionType());
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
@@ -458,6 +467,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             entity.setWorkflowRole(role);
         }
         entity.setStatus(status);
+        entity.setAcceptDate(new Date());
         this.updateById(entity);
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -113,6 +113,9 @@ public class ESEquipmentCategoryDto {
     private String EQU_DEFINE;
 
     @Field(type = FieldType.Text)
+    private String EQU_DEFINE_CODE;
+
+    @Field(type = FieldType.Text)
     private String PRODUCT_NAME;
 
     @Field(type = FieldType.Text)

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -97,6 +97,7 @@
                USC_UNIT_NAME,
                DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE,
                EQU_DEFINE,
+               EQU_DEFINE_CODE,
                PRODUCT_NAME,
                BRAND_NAME,
                EQU_TYPE,