1.检验设备冗余设备监管码，3方对接及页面回显需要

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplicationEquip.java

@@ -59,4 +59,10 @@ public class JyjcInspectionApplicationEquip extends BaseEntity {
     @TableField("equ_define")
     private String equDefine;
 
+    /**
+     * 监管码
+     */
+    @TableField(value = "supervisory_code")
+    private String supervisoryCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -195,4 +195,10 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField(value = "application_unit_name")
     private String applicationUnitName;
+
+    /**
+     * 监管码
+     */
+    @TableField(value = "supervisory_code")
+    private String supervisoryCode;
 }

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

@@ -99,16 +99,18 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
 
     @ApiModelProperty(value = "设备名称 ")
     private String productName;
+
     @ApiModelProperty(value = "品牌")
     private String brandName;
+
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
+
     @ApiModelProperty(value = "型号")
     private String equType;
+
     @ApiModelProperty(value = "制造单位名称")
     private String produceUnitName;
-    @ApiModelProperty(value = "制造日期")
+
     private String produceDate;
-   // @ApiModelProperty(value = "使用年限")
-   // private String use;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -104,6 +104,7 @@
             ibjri.use_org_code,
             res.equ_define,
             res.result_type,
+            res.supervisory_code,
             ibjui.ADDRESS equUseAddress
         FROM
             tz_jyjc_inspection_result res

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

@@ -35,7 +35,7 @@ public class JyjcInspectionApplicationEquipServiceImpl extends BaseService<JyjcI
         return this.queryForList("" , false);
     }
 
-    public List<JyjcInspectionApplicationEquipModel> listApplicationEquipByApplicationSeq(Long applicationSeq)   {
+    public List listApplicationEquipByApplicationSeq(Long applicationSeq)   {
         // this.queryForList 尽量不要重载方法
         List<JyjcInspectionApplicationEquip> entitys = this.lambdaQuery().eq(JyjcInspectionApplicationEquip::getApplicationSeq, applicationSeq).list();
         if (ValidationUtil.isEmpty(entitys)) {

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

@@ -194,7 +194,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     equipInfo.setEquList(equip.getEquListCode());
                     equipInfo.setEquipUnicode(equip.getSequenceNbr());
                     equipInfo.setEquCategory(equip.getEquCategoryCode());
-                 //   equipInfo.setApplicationSeq(model.getSequenceNbr());
+                    equipInfo.setSupervisoryCode(equip.getSupervisoryCode());
                     equipInfos.add(equipInfo);
                 }
                 model.setEquList(model.getEquip().get(0).getOrDefault("EQU_LIST","").toString());
@@ -532,7 +532,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
         JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
 
-        ArrayList<String> roleList = new ArrayList<>();
         String taskId = entity.getNextTaskId();
         //组装信息
         TaskResultDTO task = new TaskResultDTO();
@@ -606,7 +605,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             resultModel.setResultType(inspectionApplicationModel.getResultType());
-            //resultModel.setResultType("input");
             resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
             resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType()));
             // 解析设备
@@ -614,6 +612,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setResultNo(codes.get(i));
             //设备唯一标识
             resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());
+            resultModel.setSupervisoryCode(applicationEquipModels.get(i).getSupervisoryCode());
             resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
             resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
             resultModel.setEquList(applicationEquipModels.get(i).getEquList());

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

@@ -420,6 +420,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         resultParam.setRecUserId(RequestContext.getExeUserId());
         resultParam.setRecDate(new Date());
         resultParam.setRemark("同步数据");
+        // 将设备种类code换成技术参数枚举
         resultParam.setParamType(this.getTypeByEquipList(jyjcInspectionResult.getEquList()));
         resultParams.add(resultParam);
     }
@@ -427,7 +428,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     private String getTypeByEquipList(String equList) {
         EquipCategoryEnum categoryEnum = EquipCategoryEnum.of(Integer.parseInt(equList));
         assert categoryEnum != null;
-        return StrUtil.toCamelCase(categoryEnum.name());
+        // 前端为枚举类名称的驼峰形式且首字母大写，故进行格式转化换
+        return StrUtil.upperFirst(StrUtil.toCamelCase(categoryEnum.name()));
     }
 
     private void fillResultAttachmentData(JyjcInspectionResultDataModel r, JyjcInspectionResult jyjcInspectionResult, List<JyjcInspectionResultAttachment> resultAttachments) {