diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index ddef31c6..b810403f 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -13,6 +13,10 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; import com.adc.da.login.util.JwtUtils; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.common.EmailUtils; @@ -70,6 +74,15 @@ public class WorkFlowController { @Autowired private ITsUserService userService; + @Autowired + private IEsRevisePlanService iEsRevisePlanService; + + @Autowired + private EsRevisePlanDao esRevisePlanDao; + + @Autowired + private IEsRevisePlanLogService esRevisePlanLogService; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -522,9 +535,30 @@ public class WorkFlowController { @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); - if(str.getCode() == 500){ - str.setSuccess(false); - } + + EsRevisePlan EsRevisePlan = new EsRevisePlan(); + String json = busMes.getJson(); + Map map = JSON.parseObject(json, Map.class); + Object esId = map.get("esId"); + if(esId!=null){ + Object renameEs = map.get("renameEs"); + EsRevisePlan.setId(esId.toString()); + if(renameEs!=null){ + EsRevisePlan.setEsName(renameEs.toString()); + } + //日志 + EsRevisePlan selectById = esRevisePlanDao.selectById(esId.toString()); + HashMap mapJson = new HashMap<>(); + mapJson.put("type","4"); + mapJson.put("esId",esId.toString()); + mapJson.put("esName",selectById.getEsName()); + mapJson.put("renameEs",renameEs.toString()); + esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson))); + iEsRevisePlanService.updateById(EsRevisePlan); + if(str.getCode() == 500){ + str.setSuccess(false); + } + } return str; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java index 43eaf36e..16b82934 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java @@ -70,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl