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

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

@@ -1495,14 +1495,14 @@
         FROM
             privilege_company pc
             INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
-            INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
-            AND ur.status = '已完成'
-            INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
-            INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
-        WHERE pc.company_code = #{cityCode} and (ur.audit_pass_date between #{beginDate} and #{endDate})
-          and ur.is_delete = 0
-        GROUP BY
-            jri.equ_category
+               INNER JOIN tzs_jg_use_registration tjur ON tjur.use_unit_credit_code = bi.use_unit_code
+            AND tjur.status = '已完成'
+            INNER JOIN tzs_jg_use_registration_eq tjure ON tjure.equip_transfer_id = tjur.sequence_nbr
+            INNER JOIN idx_biz_jg_register_info jri ON tjure.equ_id = jri.record
+        WHERE pc.company_code = #{cityCode}
+          and (tjur.audit_pass_date between #{beginDate} and #{endDate})
+          and tjur.is_delete = 0
+        GROUP BY jri.equ_category
     </select>
 
     <select id="getUseRegisterCount" resultType="java.util.Map">

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

@@ -4070,10 +4070,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             workflowResultDto.setNextTaskCode("已完成");
             workflowResultDto.setNextTaskId(jgUseRegistration.getNextTaskId());
             workflowResultDto.setNextExecutorUserIds(jgUseRegistration.getNextExecuteUserIds());
+            JSONObject jsonObject = Optional.ofNullable(jgRegistrationHistoryService.queryLatestRegistrationHistory(jgUseRegistration.getSequenceNbr()))
+                    .map(JgRegistrationHistory::getChangeData)
+                    .map(JSON::parseObject)
+                    .orElse(new JSONObject());
             if (jgUseRegistration.getManageType().equals("unit")) {
-                this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, false, null);
+                this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, false, jsonObject);
             } else {
-                this.updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, null, false, null);
+                this.updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, null, false, jsonObject);
             }
         });
     }