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/mapper/JgUseRegistrationMapper.java

@@ -44,8 +44,14 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject")JSONObject jsonObject);
 
+    @MapKey("records")
+    List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records")List<String> records);
+
     Page<JSONObject> queryForUnitPipelineEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject")JSONObject jsonObject);
 
+    @MapKey("records")
+    List<Map<String, Object>> queryForUnitPipelineEquipment(@Param("records")List<String> records);
+
     @MapKey("id")
     List<Map<String, Object>> selectEquipList(@Param("id")Long id);
 }

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

@@ -335,84 +335,110 @@
                  LEFT JOIN idx_biz_jg_other_info other on other.RECORD = jui.RECORD
         WHERE tjure.equip_transfer_id = #{id}
     </select>
-    <select id="queryForUnitPipelineEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
+    <sql id="page-list-pipeline">
         SELECT
-        ui."USE_UNIT_NAME" useUnitName,
-        ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
-        to_char(ui."USE_DATE", 'YYYY-MM') useDate,
-        (SELECT DESIGN_UNIT_NAME from idx_biz_jg_design_info where "RECORD" = ui."RECORD") designUnitName,
-        (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1) uscUnitName,
-        to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1), 'YYYY-MM') uscDate,
-        ui."RECORD" record,
-        ri."EQU_CODE" equCode,
-        ri."EQU_LIST" equList,
-        (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
-        ri."EQU_CATEGORY" equCategory,
-        (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
-        ri."EQU_DEFINE" equDefine,
-        (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-        ri."PRODUCT_NAME" productName,
-        ri."BRAND_NAME" brandName,
-        ri."EQU_TYPE" equType,
-        ri."EQU_CODE_TYPE" equCodeType,
-        ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
-        pp."DEVICE_NAME" deviceName,
-        pp."DEVICE_LEVEL" deviceLevel,
-        pp."PIPE_NAME" pipeName,
-        pp."PIPELINE_NUMBER" pipelineNumber,
-        pp."NOMINAL_DIAMETER" nominalDiameter,
-        pp."WALL_THICKNESS" wallThickness,
-        pp."PIPE_LENGTH" pipeLength,
-        pp."PRESSURE" pressure,
-        pp."TEMPERATURE" temperature,
-        pp."MEDIUM" medium,
-        (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1) inspectOrgName,
-        (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1) inspectConclusion,
-        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+            ui."USE_UNIT_NAME" useUnitName,
+            ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
+            to_char(ui."USE_DATE", 'YYYY-MM') useDate,
+            (SELECT DESIGN_UNIT_NAME from idx_biz_jg_design_info where "RECORD" = ui."RECORD") designUnitName,
+            (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1) uscUnitName,
+            to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE limit 1), 'YYYY-MM') uscDate,
+            ui."RECORD" record,
+            ri."EQU_CODE" equCode,
+            ri."EQU_LIST" equList,
+            (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+            ri."EQU_CATEGORY" equCategory,
+            (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
+            ri."EQU_DEFINE" equDefine,
+            (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
+            ri."PRODUCT_NAME" productName,
+            ri."BRAND_NAME" brandName,
+            ri."EQU_TYPE" equType,
+            ri."EQU_CODE_TYPE" equCodeType,
+            ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+            pp."DEVICE_NAME" deviceName,
+            pp."DEVICE_LEVEL" deviceLevel,
+            pp."PIPE_NAME" pipeName,
+            pp."PIPELINE_NUMBER" pipelineNumber,
+            pp."NOMINAL_DIAMETER" nominalDiameter,
+            pp."WALL_THICKNESS" wallThickness,
+            pp."PIPE_LENGTH" pipeLength,
+            pp."PRESSURE" pressure,
+            pp."TEMPERATURE" temperature,
+            pp."MEDIUM" medium,
+            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1) inspectOrgName,
+            (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1) inspectConclusion,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
-        idx_biz_jg_use_info ui
-        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_tech_params_pipeline pp ON pp."RECORD" = ui."RECORD"
+            idx_biz_jg_use_info ui
+            LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+            LEFT JOIN idx_biz_jg_tech_params_pipeline pp ON pp."RECORD" = ui."RECORD"
+    </sql>
+    <select id="queryForUnitPipelineEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-pipeline"/>
         WHERE ri."EQU_CATEGORY" = '8300'
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
             and ui."USE_UNIT_CREDIT_CODE" =  #{jsonObject.useUnitCreditCode}
         </if>
         ORDER BY ui.REC_DATE DESC
     </select>
-    <select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
+
+    <select id="queryForUnitPipelineEquipment" resultType="java.util.Map">
+        <include refid="page-list-pipeline"/>
+        WHERE ri."EQU_CATEGORY" = '8300'
+        and ui.record in
+        <foreach collection="records" item="record" open="(" close=")" separator=",">
+            #{record}
+        </foreach>
+        ORDER BY ui.REC_DATE DESC
+    </select>
+    <sql id="page-list-vessel">
         SELECT
-        ui."USE_UNIT_NAME" useUnitName,
-        ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
-        to_char(ui."USE_DATE", 'YYYY-MM') useDate,
-        (SELECT "PRODUCE_UNIT_NAME" from idx_biz_jg_factory_info where "RECORD" = ui."RECORD") produceUnitName,
-        to_char((SELECT "PRODUCE_DATE" from idx_biz_jg_factory_info where "RECORD" = ui."RECORD"), 'YYYY-MM') produceDate,
-        ui."RECORD" record,
-        ui."USE_INNER_CODE" useInnerCode,
-        ri."EQU_CODE" equCode,
-        ri."EQU_LIST" equList,
-        (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
-        ri."EQU_CATEGORY" equCategory,
-        (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
-        ri."EQU_DEFINE" equDefine,
-        (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-        ri."PRODUCT_NAME" productName,
-        ri."BRAND_NAME" brandName,
-        ri."EQU_TYPE" equType,
-        ri."EQU_CODE_TYPE" equCodeType,
-        ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
-        pv."CHARGING_MEDIUM" chargingMedium,
-        pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
-        pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
-        to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
-        to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+            ui."USE_UNIT_NAME" useUnitName,
+            ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
+            to_char(ui."USE_DATE", 'YYYY-MM') useDate,
+            (SELECT "PRODUCE_UNIT_NAME" from idx_biz_jg_factory_info where "RECORD" = ui."RECORD") produceUnitName,
+            to_char((SELECT "PRODUCE_DATE" from idx_biz_jg_factory_info where "RECORD" = ui."RECORD"), 'YYYY-MM') produceDate,
+            ui."RECORD" record,
+            ui."USE_INNER_CODE" useInnerCode,
+            ri."EQU_CODE" equCode,
+            ri."EQU_LIST" equList,
+            (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+            ri."EQU_CATEGORY" equCategory,
+            (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
+            ri."EQU_DEFINE" equDefine,
+            (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
+            ri."PRODUCT_NAME" productName,
+            ri."BRAND_NAME" brandName,
+            ri."EQU_TYPE" equType,
+            ri."EQU_CODE_TYPE" equCodeType,
+            ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+            pv."CHARGING_MEDIUM" chargingMedium,
+            pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
+            pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
+            to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
-        idx_biz_jg_use_info ui
-        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = ui."RECORD"
+            idx_biz_jg_use_info ui
+            LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+            LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = ui."RECORD"
+    </sql>
+    <select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-vessel"/>
         WHERE ri."EQU_CATEGORY" = '2300' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
             and ui."USE_UNIT_CREDIT_CODE" =  #{jsonObject.useUnitCreditCode}
         </if>
         ORDER BY ui.REC_DATE DESC
     </select>
+
+    <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
+        <include refid="page-list-vessel"/>
+        WHERE ri."EQU_CATEGORY" = '2300' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
+        and ui.record in
+        <foreach collection="records" item="record" open="(" close=")" separator=",">
+            #{record}
+        </foreach>
+        ORDER BY ui.REC_DATE DESC
+    </select>
 </mapper>

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

@@ -165,9 +165,8 @@ public class JgUseRegistrationController extends BaseController {
     @GetMapping(value = "/export")
     @ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
     public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
-                               @RequestParam(value = "printType", defaultValue = "0") String printType,
-                               @RequestParam(value = "manageType", defaultValue = "") String manageType) {
-        jgUseRegistrationServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType, manageType);
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
+        jgUseRegistrationServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -132,6 +132,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private JgUseRegistrationEqServiceImpl jgUseRegistrationEqService;
     @Autowired
     private IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
+    @Autowired
+    private JgUseRegistrationMapper jgUseRegistrationMapper;
 
     /**
      * @param auditPassDate   通过时间
@@ -1166,6 +1168,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
                 IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
                 jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
+            } else {
+                List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
+                List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(Collectors.toList());
+                jsonObject.remove("equipmentLists");
+                if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))){
+                    jsonObject.put("equipmentLists",jgUseRegistrationMapper.queryForUnitVesselEquipment(records));
+                }else {
+                    jsonObject.put("equipmentLists",jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
+                }
             }
             // 转化 附件 字段
             commonServiceImpl.convertStringToJsonobject(jsonObject, jsonFields);
@@ -1295,11 +1306,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return null;
     }
 
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType, String manageType) {
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
-        exportParamsMap.put("manageType", manageType);
         // 查询使用登记详情
         JgUseRegistration useRegistration = this.getById(sequenceNbr);
+        exportParamsMap.put("manageType", useRegistration.getManageType());
         LambdaQueryWrapper<JgUseRegistrationEq> useEqLambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
         useEqLambda.eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
         JgUseRegistrationEq useRegistrationEq = jgRelationEquipMapper.selectOne(useEqLambda);