feat(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

@@ -22,6 +22,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getDetail(@Param("id")String id);
 
+    Map<String, Object> getSupervisionInfoDetail(@Param("id")String id);
+
     Map<String, Object> getInspectDetail(@Param("id") String id, @Param("permissionInspectTypes") List<String> permissionInspectTypes);
 
     Map<String, Object> getUseDetail(@Param("id")String id);

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

@@ -136,6 +136,18 @@
                LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
       where jri.RECORD = #{id}
     </select>
+
+    <select id="getSupervisionInfoDetail" resultType="java.util.Map">
+        SELECT
+        ibjsi.ORG_BRANCH_CODE                                                        as orgBranchCode,
+        ibjsi.ORG_BRANCH_NAME                                                        as orgBranchName,
+        ibjsi.KEY_MONITORING_EQU                                                     as keyMonitoringEqu,
+        ibjsi.DENSELY_POPULATED_AREAS                                                as denselyPopulatedAreas,
+        ibjsi.IMPORTANT_PLACES                                                       as importantPlaces,
+        ibjsi.COMPANY_ORG_BRANCH_CODE                                                as companyOrgBranchCode
+        from idx_biz_jg_supervision_info ibjsi
+        where ibjsi.RECORD = #{id}
+    </select>
     <select id="getInspectDetail" resultType="java.util.Map">
         SELECT INSPECT_TYPE       as inspectType,
                INSPECT_STAFF      as inspectStaff,

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

@@ -61,6 +61,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -568,7 +569,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     map.put("safetyManagerName", data[1]);
                 });
 
-        //其他附件
+        // 其他附件
         if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
             useRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
         }
@@ -621,7 +622,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 保存关联设备信息
         jgUseRegistrationEqService.saveBatch(equipList);
 
-        //启动流程
+        // 启动流程
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             // 删除暂存代办
             commonServiceImpl.deleteTaskModel(String.valueOf(useRegistration.getSequenceNbr()));
@@ -688,7 +689,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
         }
 
-        //非完成，进行审核
+        // 非完成，进行审核
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setInstanceStatus(
@@ -696,7 +697,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .map(status -> String.join(",", status, role))
                             .orElse(role)
             );
-            //通过或者驳回
+            // 通过或者驳回
             jgUseRegistration.setStatus("0".equals(operate) ?
                     Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getPass() :
                     Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getReject());
@@ -719,7 +720,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
-                    //taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
+                    // taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
                     taskModelDto.setModel(taskMessageDto);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                     taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -740,7 +741,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setStatus(taskCode);
             jgUseRegistration.setNextExecuteUserIds("");
 
-            //查询历史暂存表
+            // 查询历史暂存表
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getOne(Wrappers.<JgRegistrationHistory>lambdaQuery()
                     .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr)));
 
@@ -1061,7 +1062,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
             if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
                 WorkflowResultDto workflowResultDto = resultDto.get(0);
-                //按单位办理
+                // 按单位办理
                 if ("unit".equals(manageType)) {
                     this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false);
                 } else {
@@ -1121,7 +1122,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
             jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
             jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
-            //非单位办理
+            // 非单位办理
             if (!"unit".equals(manageType)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
                 lambda1.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(data.getSequenceNbr()));
@@ -1190,6 +1191,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         // 基本信息 + 制造信息
         Map<String, Object> detail = this.baseMapper.getDetail(record);
+        // 监督管理信息
+        Map<String, Object> supervisionInfo = this.baseMapper.getSupervisionInfoDetail(record);
         // 检验信息
         Map<String, Object> inspectDetail = this.getInspectDetail(record);
         // 使用信息
@@ -1215,6 +1218,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         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);
+        }
         detail.remove("safetyManager");
         // 附件解析
         commonServiceImpl.convertStringToJsonobject(detail, jsonFields);
@@ -1442,8 +1452,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useFlagParamDto.setEquipCode(registerInfo.getEquCode());
         useFlagParamDto.setEquipCategory(exportParamsMap.get("equCategory").toString());
         useFlagParamDto.setEquipDefine(Optional.ofNullable(exportParamsMap.get("equDefine"))
-                        .orElse(exportParamsMap.get("equCategory").toString())
-                        .toString());
+                .orElse(exportParamsMap.get("equCategory").toString())
+                .toString());
         useFlagParamDto.setUseUnitName(exportParamsMap.get("useUnitName").toString());
         useFlagParamDto.setUseInnerCode(exportParamsMap.get("useInnerCode").toString());
         useFlagParamDto.setReceiveOrgName(useRegistration.getReceiveOrgName());