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

制修订 更名 删除过才发起 没删除过不发起

Browse Source
This commit is contained in:
gaojiabao
2023-05-15 16:27:28 +08:00
parent de34688afc
commit 1352111b2f
2 changed files with 25 additions and 7 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
+16 -7
View File
@@ -1354,7 +1354,9 @@ public class WorkFlowController extends BaseController {
String prcName2 = bussSort2 + "-" + esName2 + "-计划立项";
String s1 = workFlowFeignClient.endPrcName(prcName1, esId1);
String s2 = workFlowFeignClient.endPrcName(prcName2, esId2);
if(s1.equals("成功") && s2.equals("成功")){
String[] split1 = s1.split("-");
String[] split2 = s2.split("-");
if(split1[0].equals("成功") && split2[0].equals("成功")){
return Result.success();
}else {
return Result.error();
@@ -1362,12 +1364,19 @@ public class WorkFlowController extends BaseController {
}
}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);
String[] split = s.split("-");
if(split[0].equals("成功")){
if(StringUtils.isNotBlank(split[1])){
EndPrcName endPrcName = new EndPrcName();
Map<String, String> objectObjectMap = new HashMap<>();
objectObjectMap.put("ids",split[1]);
objectObjectMap.put("prcCreateUser","xxx");
String s1 = JSONObject.toJSONString(objectObjectMap);
endPrcName.setIds(s1);
endPrcName.setIsNot("1");
return Result.success(endPrcName);
}
return Result.success();
}else {
return Result.error();
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/EndPrcName.java
+9
View File
@@ -0,0 +1,9 @@
package com.adc.da.workFlow.entity;
import lombok.Data;
@Data
public class EndPrcName {
private String ids;
private String isNot;
}