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
2023-05-12 13:14:49 +08:00
parent 1ea4f820da
commit 1b1389f236
1 changed files with 41 additions and 8 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
+41 -8
View File
@@ -1328,18 +1328,51 @@ public class WorkFlowController extends BaseController {
@ApiOperation(value = "福企标制修订计划流程变更 在合并 延期 取消 更名 流程变更 批准则结束")
@GetMapping("/endPrcName")
public String endPrcName(String sort,String prcName,String json){
if(StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)){
return "失败,参数为空.";
}else {
prcName = sort+"-"+prcName+"-计划立项";
public ResponseMessage endPrcName(String sort,String prcName,String json){
String s = "";
if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) {
return Result.error("参数为空");
} else {
prcName = sort + "-" + prcName + "-计划立项";
}
JSONObject jsonObject = JSON.parseObject(json);
String esId = jsonObject.getString("esId");
if(StringUtils.isBlank(esId)){
return "失败,参数为空.";
String esId1 = jsonObject.getString("esId1");
if (StringUtils.isBlank(esId) && StringUtils.isBlank(esId1)) {
return Result.error("参数为空");
}
return workFlowFeignClient.endPrcName(prcName,esId);
if(StringUtils.isNotBlank(esId1)){
String esName1 = jsonObject.getString("esName1");
String bussSort1 = jsonObject.getString("bussSort1");
String esId2 = jsonObject.getString("esId2");
String esName2 = jsonObject.getString("esName2");
String bussSort2 = jsonObject.getString("bussSort2");
if(StringUtils.isNotBlank(esId1) && StringUtils.isNotBlank(esName1) && StringUtils.isNotBlank(bussSort1)
&& StringUtils.isNotBlank(esId2) && StringUtils.isNotBlank(esName2) && StringUtils.isNotBlank(bussSort2)
){
String prcName1 = bussSort1 + "-" + esName1 + "-计划立项";
String prcName2 = bussSort2 + "-" + esName2 + "-计划立项";
String s1 = workFlowFeignClient.endPrcName(prcName1, esId1);
String s2 = workFlowFeignClient.endPrcName(prcName2, esId2);
if(s1.equals("成功") && s2.equals("成功")){
return Result.success();
}else {
return Result.error();
}
}
}else {
s = workFlowFeignClient.endPrcName(prcName, esId);
Map<String, String> objectObjectMap = new HashMap<>();
objectObjectMap.put("ids",esId);
objectObjectMap.put("prcCreateUser","xxx");
String s1 = JSONObject.toJSONString(objectObjectMap);
if(s.equals("成功")){
return Result.success(s1);
}else {
return Result.error();
}
}
return Result.success();
}
}