修改使用单位撤回或者一级驳回再提交时数据需要将已同意修改为已提交。

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

@@ -18,7 +18,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgRegistrationHistoryService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -351,6 +350,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     public void flowExecute(Long id, String instanceId, String operate, String comment) {
         try {
+            JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(id);
             JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
             String taskId = taskMessage.getString("id");
@@ -360,6 +360,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setTaskId(taskId);
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
+            if(!ObjectUtils.isEmpty(jgChangeRegistrationReform)&&(jgChangeRegistrationReform.getStatus().equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getRollBack())||jgChangeRegistrationReform.getStatus().equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getReject()))){
+                operate="提交";
+            }
             map.put("approvalStatus", operate);
             dto.setVariable(map);
             //执行流程