bug修改

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

@@ -17,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -267,12 +266,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     @Transactional
     public void revocation(String instanceId) {
-        JgMaintenanceContract contract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
         List<String> roleListNext = new ArrayList<>();
         List<String> roleListAll = new ArrayList<>();
-        contract = this.getOne(lambda);
+        JgMaintenanceContract contract = this.getOne(lambda);
         ProcessTaskDTO processTaskDTO = workflowService.rollBack(instanceId);
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -296,7 +294,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         jsonObject.put("taskType", BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode());
         jsonObject.put("flowStatus", this.getTaskCodeByName(contract.getStatus()));
         jsonObject.put("flowStatusLabel", contract.getStatus());
-        jsonObject.put("changeCertificate", null);
+        jsonObject.put("maintenanceContract", null);//不传合同照片附件信息
         commonService.rollbackTask(instanceId, jsonObject);
     }
 
@@ -399,6 +397,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                     contract.setNextTaskId(nextTaskId);
                     contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                     contract.setNextExecuteUserIds(nextUserIds);
+                    commonService.deleteTaskModel(contract.getSequenceNbr() + "");
                     // 创建待办
                     JgMaintenanceContract bean = new JgMaintenanceContract();
                     BeanUtil.copyProperties(contract, bean);
@@ -426,9 +425,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextTaskId(nextTaskId);
                 contract.setNextExecuteUserIds(nextUserIds);
+                commonService.deleteTaskModel(contract.getSequenceNbr() + "");
                 executeOneStep(contract, taskName, nextUserIds, "0");
             }
-            commonService.deleteTaskModel(contract.getSequenceNbr()+"");
         } else {
             List<TaskModelDto> modelDtos = new ArrayList<>();
             TaskModelDto dto = new TaskModelDto();