fix(改造告知)：1.fixed 流程撤回或驳回再次提交后显示为“已通过”; 2. fixed 通过 & 驳回的时候意见没有传给工作流

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

@@ -88,8 +88,6 @@
         isn.next_execute_ids as nextExecuteIds,
         isn.promoter,
         isn.notice_status AS noticeStatus,
-<!--        isn.install_start_date AS installLicenseExpirationDate,-->
-<!--        isn.install_license_no AS installLicenseNo,-->
         isn.plan_date AS installStartDate,
         isn.construction_manager AS installLeaderName,
         isn.construction_manager_phone AS installLeaderPhone,
@@ -126,16 +124,17 @@
         ei.legal_person AS safetyManager,
         ei.legal_phone AS safetyManagerPhone,
         ei.ADDRESS AS useUnitAddress,
-        ei.use_code AS useCode
+        ei2.use_code AS useCode
         FROM
         tzs_jg_reform_notice isn
-        LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-        LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
-        LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
-        LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
-        LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+            LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+            LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+            LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+            LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+            LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+            LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+            LEFT JOIN tz_base_enterprise_info ei2 ON ei2.use_code = isn.install_unit_credit_code
         WHERE
         isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -293,6 +293,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         String useCode = String.valueOf(installation.get("useCode"));
         LambdaQueryWrapper<TzBaseUnitLicence> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzBaseUnitLicence::getUnitCode, useCode);
+        wrapper.last(" LIMIT 3");
         List<TzBaseUnitLicence> list = baseUnitLicenceMapper.selectList(wrapper);
 
         ArrayList<String> installLicenseNoList = new ArrayList<>();