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 b810403f..2099b410 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 @@ -535,30 +535,9 @@ public class WorkFlowController { @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); - - 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); - } - } + 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 16b82934..43eaf36e 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