fix(JG)：使用登记证添加气瓶类别bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -223,4 +223,8 @@ public class JgVehicleInformationVo implements Serializable {
 
     @ApiModelProperty(value = "下次检验日期")
     private Date nextInspectionDate;
+
+    @ApiModelProperty(value = "设备品种")
+    private String equDefineCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -176,12 +176,13 @@
                (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as EQU_DEFINE,
                jri.PRODUCT_NAME,
                jri.EQU_CODE,
+               jri.EQU_DEFINE as EQU_DEFINE_CODE,
                (select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE,
                (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
         from tzs_jg_vehicle_information_eq tjvie
                  LEFT JOIN idx_biz_jg_use_info jui on tjvie.equ_id = jui.RECORD
                  LEFT JOIN idx_biz_jg_factory_info jfi on tjvie.equ_id = jfi.RECORD
-                 left JOIN idx_biz_jg_register_info jri on tjvie.equ_id = jri.RECORD
+                 LEFT JOIN idx_biz_jg_register_info jri on tjvie.equ_id = jri.RECORD
         WHERE tjvie.vehicle_id = #{id}
     </select>
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -63,7 +63,7 @@ public class JgVehicleInformationController extends BaseController {
                 String.valueOf(map.get("operate")),
                 String.valueOf(map.get("comment")),
                 String.valueOf(map.get("nextTaskId")),
-                String.valueOf(map.get("EQU_DEFINE_CODE")));
+                String.valueOf(map.get("equDefineCode")));
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -237,11 +237,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 List<WorkflowResultDto> workflowResultDtoList = commonService.buildWorkFlowInfo(processTasks);
                 if (!ObjectUtils.isEmpty(workflowResultDtoList) && !ObjectUtils.isEmpty(workflowResultDtoList.get(0))) {
                     WorkflowResultDto workflowResultDto = workflowResultDtoList.get(0);
-                    this.updateData(vehicleInformation.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE, String.valueOf(map.get("EQU_DEFINE_CODE")));
+                    this.updateData(vehicleInformation.getSequenceNbr(), "0", workflowResultDto, Boolean.TRUE, String.valueOf(map.get("equDefineCode")));
                 }
             } else {
                 // 执行流程
-                flowExecute(vehicleInformation.getSequenceNbr(), vehicleInformation.getInstanceId(), "0", "", String.valueOf(map.get("nextTaskId")), String.valueOf(map.get("EQU_DEFINE_CODE")));
+                flowExecute(vehicleInformation.getSequenceNbr(), vehicleInformation.getInstanceId(), "0", "", String.valueOf(map.get("nextTaskId")), String.valueOf(map.get("equDefineCode")));
             }
         } else {
             ArrayList<TaskModelDto> list = new ArrayList<>();
@@ -384,10 +384,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vo.setInspectionCertificate(ObjectUtils.isEmpty(dto.getInspectionCertificate()) ? null : JSON.parseArray(dto.getInspectionCertificate()));
         vo.setFilingNotice(ObjectUtils.isEmpty(dto.getFilingNotice()) ? null : JSON.parseArray(dto.getFilingNotice()));
 
-        List<Map<String, Object>> list = this.baseMapper.selectEquipList(sequenceNbr);
-        if (!ObjectUtils.isEmpty(list)) {
-            vo.setEquipmentLists(list);
-        }
+        List<Map<String, Object>> equipList = this.baseMapper.selectEquipList(sequenceNbr);
+        vo.setEquipmentLists(equipList);
+        vo.setEquDefineCode(equipList.stream()
+                .findFirst()
+                .map(map -> (String) map.get("EQU_DEFINE_CODE"))
+                .orElse(null));
         return vo;
     }