FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG

Browse Source
This commit is contained in:
gaojiabao
2022-12-05 15:15:08 +08:00
parent c0839a370b
commit e715c57b7e
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -24
View File
@@ -535,30 +535,9 @@ public class WorkFlowController {
@PostMapping("/completeTask") @PostMapping("/completeTask")
public Wrapper<String> completeTaskByUserId( BusMes busMes){ public Wrapper<String> completeTaskByUserId( BusMes busMes){
Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes); Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
if(str.getCode() == 500){
EsRevisePlan EsRevisePlan = new EsRevisePlan(); str.setSuccess(false);
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<String, String> 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; return str;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
+2 -2
View File
@@ -70,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
case "4": case "4":
//更名 //更名
String renameEs = (String) qbfsForm.get("renameEs"); String renameEs = (String) qbfsForm.get("renameEs");
if(!esName.equals(renameEs)) { //if(!esName.equals(renameEs)) {
msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;"; msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
} //}
break; break;
} }
if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) { if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {