监管报废注销业务tzs_jg_certificate_change_record表中添加routePath

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

@@ -809,17 +809,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 完成时 下一步骤可执行人清空
             jgScrapCancel.setNextExecuteUserIds("");
             jgScrapCancel.setNextTaskId(nextTaskId);
-            // 修改业务信息
-            updateInfoOther(jgScrapCancel);
             JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();
             BeanUtils.copyProperties(jgScrapCancel, scrapCancelDto);
             // 更新代办
-            updateTaskModel(scrapCancelDto, operate);
+            TaskV2Model taskV2Model = updateTaskModel(scrapCancelDto, operate);
+            // 修改业务信息
+            updateInfoOther(jgScrapCancel, taskV2Model.getRoutePath());
         }
         this.getBaseMapper().updateById(jgScrapCancel);
     }
 
-    public void updateInfoOther(JgScrapCancel jgScrapCancel) {
+    public void updateInfoOther(JgScrapCancel jgScrapCancel, String routePath) {
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
         List<JgScrapCancelEq> jgScrapCancelEqList = jgScrapCancelEqMapper.selectList(lambdaEq);
@@ -893,7 +893,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             resultMap.put(equipId, map1);
         }
         // 流水表
-        saveRecord(jgScrapCancel, jgScrapCancelEqList);
+        saveRecord(jgScrapCancel, jgScrapCancelEqList,routePath);
         try {
             tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
         } catch (Exception e) {
@@ -919,7 +919,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
 
-    private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList) {
+    private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList,String routePath) {
 
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String userName = reginParams.getUserModel().getRealName();
@@ -945,6 +945,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             changeRecord.setEquCategory(String.valueOf(jsonObject.get("equCategory")));
             changeRecord.setCreateDate(new Date());
             changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
+            changeRecord.setRoutePath(routePath);
             certificateChangeRecordService.save(changeRecord);
             List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();
             JSONArray jsonArray = JSONObject.parseArray(jgScrapCancelEq.getEquipInfo());