Merge branch 'develop_tzs_register' of…

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

@@ -128,6 +128,7 @@
             ei.use_code AS useCode,
             isn.install_unit_credit_code AS installUnitCreditCode,
             idi.INSPECT_REPORT as inspectReport,
+            ei.address as useUnitLeaderAddress,
             re.equ_id as equId
         FROM
             tzs_jg_installation_notice isn

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

@@ -29,7 +29,8 @@
         tjtn.next_execute_user_ids as nextExecuteUserIds,
         oi.SUPERVISORY_CODE as supervisoryCode,
         tjtn.next_task_id AS nextTaskId,
-        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress,
+        ei.address as useUnitLeaderAddress
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
@@ -37,6 +38,7 @@
             LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
             LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
             left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
+            LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
         <where>
             tjtn.is_delete = false
             <if test="param != null ">

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

@@ -39,6 +39,7 @@
         LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
 
         <where>
+            ur.is_delete = 0
             <if test="dto.equCategory != null and dto.equCategory != ''">
                 and jri.EQU_CATEGORY = #{dto.equCategory}
             </if>

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

@@ -366,6 +366,9 @@ public class CommonServiceImpl implements ICommonService {
             if (!e.get("companyType").toString().contains(companyType)) {
                 it.remove();
             }
+            if (e.get("companyName").toString().contains("监管所")) {
+                it.remove();
+            }
             if (!ObjectUtils.isEmpty(e.get("children"))) {
                 deleteTreeData((List<LinkedHashMap>) e.get("children"),companyType);
             }
@@ -495,6 +498,8 @@ public class CommonServiceImpl implements ICommonService {
         map.put("giveOutYear", Optional.ofNullable(map.get("giveOutYear")).orElse("").toString());  // 发证日期-年
         map.put("giveOutMonth", Optional.ofNullable(map.get("giveOutMonth")).orElse("").toString());  // 发证日期-月
         map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString());  // 发证日期-日
+        map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString());  // 发证日期-日
+        map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString());  // 发证日期-日
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码

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

@@ -285,6 +285,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 resultMap.putAll(equipParamsMap);
             }
         }
+        resultMap.remove("instanceId");
         return resultMap;
     }
 
@@ -1091,6 +1092,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     String status = ConstructionEnum.getName.get(integer);
                     dto2.put(CONSTRUCTIONTYPE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(EQUSTATE))) {
+                    Integer integer = Integer.valueOf(dto2.get(EQUSTATE).toString());
+                    String status = EquimentEnum.getName.get(integer);
+                    dto2.put(EQUSTATE, status);
+                }
                 dto2.put("record",dto2.get("SEQUENCE_NBR"));
                 list.add(dto2);
             }

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

@@ -973,6 +973,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
         //调用生成使用登记证
+        exportParamsMap.put("excelType","变更登记");
+        exportParamsMap.put("tableName","特种设备单位变更登记");
         commonService.generateCertificateReport(exportParamsMap, response);
     }
 

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

@@ -135,7 +135,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 }
 
                 dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, submit);
+                ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, "0");
                 processTaskDTOS.add(processTaskDTO);
                 // 提取节点等信息
                 workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
@@ -607,6 +607,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             }
             resultMap.putAll(map);
         }
+        resultMap.put("sequenceNbr", sequenceNbr);
         return resultMap;
 
     }

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

@@ -469,7 +469,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("address"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);

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

@@ -237,7 +237,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
         placeholders.put("qrCode", qrCode);

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

@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -115,6 +116,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
         JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         map.remove("status");
+        map.remove("instanceId");
         // 安全管理员
         if (map.containsKey("safetyManagerName")){
             map.put("safetyManager", map.get("safetyManagerName"));
@@ -155,6 +157,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             useInfo.setEstateUnitCreditCode(data[0]);
             useInfo.setEstateUnitName(data[1]);
         }
+        // 修改设备使用状态为在用
+        useInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode()));
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -485,7 +485,7 @@
                                                 <w:sz w:val="46"/>
                                                 <w:sz-cs w:val="46"/>
                                             </w:rPr>
-                                            <w:t>按照《中华人民共和国特种设备安全法》的规定， 依据特种设备安全技术规范要求，予以使用登记。</w:t>
+                                            <w:t>按照《中华人民共和国特种设备安全法》的规定， 依据特种设备安全技术规范要求，予以${(excelType)!''}。</w:t>
                                         </w:r>
                                         <w:r>
                                             <w:rPr>
@@ -611,7 +611,7 @@
                                                 <w:sz w:val="58"/>
                                                 <w:sz-cs w:val="58"/>
                                             </w:rPr>
-                                            <w:t>特种设备使用登记证</w:t>
+                                            <w:t>${(tableName)!''}</w:t>
                                         </w:r>
                                     </w:p>
                                 </w:txbxContent>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -578,7 +578,7 @@
                                             <w:sz w:val="24"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>设备代码</w:t>
+                                        <w:t>设备注册代码</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>