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

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

@@ -55,8 +55,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.alibaba.fastjson.JSON.parseArray;
-
 /**
  * 设备注销报废服务实现类
  *
@@ -461,6 +459,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         params.put("taskStatusLabel", flowStatusEnum.getName());
         params.put("flowStatus", this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
         params.put("flowStatusLabel", jgScrapCancelDto.getAuditStatus());
+        params.put("model", jgScrapCancelDto);
         return commonService.updateTaskModel(params);
     }
 
@@ -492,7 +491,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
         Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
         installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
-        installationInfo.put("cancelCertificateList", parseArray(installationInfo.get("cancelCertificate").toString()));
+        installationInfo.put("cancelCertificateList", JSON.parseArray(String.valueOf(installationInfo.get("cancelCertificate"))));
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
         JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
@@ -540,7 +539,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
-
+    @Transactional
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
             JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
@@ -606,8 +605,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 更新上一步待办、创建待办
             executeOneStep(scrapCancelDto, taskName, nextUserIds, operate);
         } else {
-            jgScrapCancel.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
-            jgScrapCancel.setAuditPassDate(new Date());
             // 完成时 下一步骤可执行人清空
             jgScrapCancel.setNextExecuteUserIds("");
             // 修改业务信息