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

@@ -40,6 +40,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getDesDetail(@Param("id") String id);
 
+    Map<String, Object> getInspectDetailByRecord(@Param("id") String id);
+
     Page<Map<String, Object>> getEquipListPage(@Param("page") Page<Map<String, Object>> page, @Param("factoryNum") String factoryNum, @Param("equList") String equList, @Param("equCategory") String equCategory);
 
     void updatePromoter(@Param("id") Long id);

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

@@ -127,6 +127,8 @@
         SELECT
              jri.RECORD as equipId,
              jri.EQU_CODE                                                           as equCode,
+             jri.ORGANIZATION_CODE                                                  as organizationCode,
+             jri.ORGANIZATION_NAME                                                  as organizationName,
              jri.EQU_CATEGORY                                                       as equCategory,
              jri.EQU_LIST                                                           as equList,
              jri.EQU_DEFINE                                                         as equDefine,
@@ -246,6 +248,18 @@
         from idx_biz_jg_design_info
         where RECORD = #{id}
     </select>
+    <select id="getInspectDetailByRecord" resultType="java.util.Map">
+        SELECT
+            INSPECT_ORG_CODE as inspectOrgCode,
+            INSPECT_ORG_NAME as inspectOrgName,
+            INSPECT_CONCLUSION as inspectConclusion,
+            INSPECT_TYPE as inspectType,
+            INSPECT_DATE as inspectDate,
+            INSPECT_STAFF as inspectStaff,
+            NEXT_INSPECT_DATE as nextInspectDate,
+            INSPECT_REPORT as inspectReport
+        FROM "idx_biz_jg_inspection_detection_info"  where RECORD = #{id}
+    </select>
     <select id="getDetailById" resultType="java.util.Map">
         select ur.sequence_nbr                                                        as sequenceNbr,
                ur.audit_status                                                        as auditStatus,
@@ -322,7 +336,9 @@
             ibjui."STREET_NAME"                               as installStreet,
             ibjui."PROVINCE_NAME"                             as installProvince,
             ibjui."CITY_NAME"                                 as installCity,
-            ibjui."COUNTY_NAME"                               as installCounty
+            ibjui."COUNTY_NAME"                               as installCounty,
+            ibjci."USC_UNIT_CREDIT_CODE"                      as uscUnitCreditCode,
+            ibjci."USC_UNIT_NAME"                             as uscUnitName
         FROM "idx_biz_jg_construction_info" AS ibjci
         left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
         WHERE ibjci."RECORD" = #{id}
@@ -366,13 +382,17 @@
     <select id="getMaintenanceDetailByIdx" resultType="java.util.Map">
         SELECT ibjmri."ME_UNIT_NAME"         as maintenanceUnitName,
                ibjui."USE_UNIT_NAME"         as maintenanceUseUnitName,
---                ibjmri."ME_MASTER"      as maintenanceManagerName,
---                ibjmri."ME_MASTER_PHONE"     as maintenanceManagerPhone,
-               ibjmri."ME_MASTER"  as maintenanceManagerOneName,
-               ibjmri."ME_MASTER_PHONE" as maintenanceManagerOnePhone,
-               ibjmri."ME_MASTER1"  as maintenanceManagerTwoName,
-               ibjmri."ME_MASTER1_PHONE" as maintenanceManagerTwoPhone,
-               ibjmri."REPAIR_INFORM"          as maintenanceContract
+               ibjmri."ME_MASTER"            as maintenanceManagerOneName,
+               ibjmri."ME_MASTER_PHONE"      as maintenanceManagerOnePhone,
+               ibjmri."ME_MASTER_ID"         as maintenanceManagerOneID,
+               ibjmri."ME_MASTER1"           as maintenanceManagerTwoName,
+               ibjmri."ME_MASTER1_PHONE"     as maintenanceManagerTwoPhone,
+               ibjmri."REPAIR_INFORM"        as maintenanceContract,
+               ibjmri."ME_MASTER1_ID"        as maintenanceManagerTwoID,
+               ibjmri."INFORM_START"         as informStart,
+               ibjmri."INFORM_END"           as informEnd,
+               ibjmri."ME_UNIT_CREDIT_CODE"  as meUnitCreditCode,
+               ibjmri."ME_UNIT_NAME"         as meUnitName
         FROM "idx_biz_jg_maintenance_record_info" as ibjmri
         left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjmri."RECORD"
         WHERE ibjmri."RECORD" = #{id}

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

@@ -136,6 +136,13 @@ public class JgUseRegistrationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "从一码通的表中查询详情", notes = "从一码通的表中查询详情")
+    @GetMapping(value = "/getDetailByIdx")
+    public ResponseModel<Map<String, Object>> getDetailByIdx(@RequestParam(value = "record") String record) {
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetailByIdx(record));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/getMessage")
     public ResponseModel<Map<String, Object>> getMessage() {

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

@@ -1645,6 +1645,70 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return detail;
     }
 
+    public Map<String, Object> getDetailByIdx(String record) {
+        // 基本信息 + 制造信息
+        Map<String, Object> detail = this.baseMapper.getDetail(record);
+
+        if (!ObjectUtils.isEmpty(detail) && !StringUtils.isEmpty(detail.get("organizationCode")) && !StringUtils.isEmpty(detail.get("organizationName"))) {
+            String receiveOrgCode = (String) detail.get("organizationCode");
+            String receiveOrgName = (String) detail.get("organizationName");
+            detail.put("receiveOrgCode", receiveOrgCode + "_" + receiveOrgName);
+        }
+
+        // 监督管理信息
+        Map<String, Object> supervisionInfo = this.baseMapper.getSupervisionInfoDetail(record);
+        // 检验信息
+        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetailByRecord(record);
+        // 使用信息
+        Map<String, Object> useDetail = this.baseMapper.getUseDetail(record);
+        // 设计信息
+        Map<String, Object> desDetail = this.baseMapper.getDesDetail(record);
+        // 安装信息
+        Map<String, Object> installDetail = this.baseMapper.getiInstallDetailByIdx(record);
+        if (!ObjectUtils.isEmpty(installDetail) && !StringUtils.isEmpty(installDetail.get("uscUnitCreditCode"))
+                && !StringUtils.isEmpty(installDetail.get("uscUnitName"))) {
+            String uscUnitCreditCode = (String) installDetail.get("uscUnitCreditCode");
+            String uscUnitName = (String) installDetail.get("uscUnitName");
+            installDetail.put("uscUnitCodeAndName", uscUnitCreditCode + "_" + uscUnitName);
+        }
+
+        // 维保信息
+        Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
+        if (!ObjectUtils.isEmpty(maintenanceDetail) && !StringUtils.isEmpty(maintenanceDetail.get("meUnitCreditCode"))
+                && !StringUtils.isEmpty(maintenanceDetail.get("meUnitName"))) {
+            String meUnitCreditCode = (String) maintenanceDetail.get("meUnitCreditCode");
+            String meUnitName = (String) maintenanceDetail.get("meUnitName");
+            maintenanceDetail.put("meUnitName", meUnitCreditCode + "_" + meUnitName);
+        }
+
+        if (!ObjectUtils.isEmpty(inspectDetail)) {
+            detail.putAll(inspectDetail);
+        }
+        if (!ObjectUtils.isEmpty(useDetail)) {
+            detail.putAll(useDetail);
+        }
+        if (!ObjectUtils.isEmpty(desDetail)) {
+            detail.putAll(desDetail);
+        }
+        if (!ObjectUtils.isEmpty(maintenanceDetail)) {
+            detail.putAll(maintenanceDetail);
+        }
+        if (!ObjectUtils.isEmpty(installDetail)) {
+            detail.putAll(installDetail);
+        }
+        if (!ObjectUtils.isEmpty(supervisionInfo) && !StringUtils.isEmpty(supervisionInfo.get("orgBranchCode"))) {
+            String orgBranchCode = (String) supervisionInfo.get("orgBranchCode");
+            String orgBranchName = (String) supervisionInfo.get("orgBranchName");
+            supervisionInfo.put("orgBranchCode", orgBranchCode + "_" + orgBranchName);
+            supervisionInfo.put("hasOrgBranchCode", true);
+            detail.putAll(supervisionInfo);
+        }
+        // 附件解析
+        commonServiceImpl.convertStringToJsonobject(detail, jsonFields);
+        detail.put("province", "610000");
+        return detail;
+    }
+
     private String setDefaultRecord(JgUseRegistration jgUseRegistration, String record) {
         if (StringUtils.isEmpty(record)) {
             JgUseRegistrationEq jgUseRegistrationEq = jgUseRegistrationEqService.getOne(new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr()));
@@ -2582,7 +2646,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setAuditPassDate(new Date());
                 jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
                 jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
-                jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useRegistrationCode")) ? "" : String.valueOf(map.get("useRegistrationCode")));
+                jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useOrgCode")) ? "" : String.valueOf(map.get("useOrgCode")));
                 jgUseRegistration.setRegType("1");//历史登记
                 this.save(jgUseRegistration);
                 jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());