Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -128,6 +128,8 @@
             ei.use_code AS useCode,
             isn.install_unit_credit_code AS installUnitCreditCode,
             idi.INSPECT_REPORT as inspectReport,
+            concat(ei.province, '', ei.city, '', ei.district, '', ei.street, '',ei.community, '', 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,
+        concat(ei.province, '', ei.city, '', ei.district, '', ei.street, '',ei.community, '', 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/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;
@@ -155,6 +156,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             useInfo.setEstateUnitCreditCode(data[0]);
             useInfo.setEstateUnitName(data[1]);
         }
+        // 修改设备使用状态为在用
+        useInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();