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

fix: 修改计划管控更名bug

Browse Source
This commit is contained in:
wxyclub
2023-11-20 08:59:03 +08:00
parent 318127cf14
commit 31a775e2d0
2 changed files with 25 additions and 18 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
+24 -18
View File
@@ -1484,7 +1484,8 @@ public class WorkFlowController extends BaseController {
String s = "";
if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) {
return Result.error("参数为空");
} else {
}
else {
prcName = sort + "-" + prcName + "-计划立项";
}
JSONObject jsonObject = JSON.parseObject(json);
@@ -1515,26 +1516,31 @@ public class WorkFlowController extends BaseController {
}
}
}else {
s = workFlowFeignClient.endPrcName(prcName, esId);
String[] split = s.split("-");
List<String> asList = Arrays.asList(split);
if(split[0].equals("成功")){
if(asList.size()>1){
if ("4".equals(jsonObject.getString("type")) || "3".equals(jsonObject.getString("type"))) {
s = workFlowFeignClient.endPrcName(prcName, esId);
if (StringUtils.isBlank(s)) {
return Result.error();
}
String[] split = s.split("-");
List<String> asList = Arrays.asList(split);
if(split[0].equals("成功")){
if(asList.size()>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);
}
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");
endPrcName.setIsNot("2");
endPrcName.setIds("xxx");
return Result.success(endPrcName);
}else {
return Result.error();
}
EndPrcName endPrcName = new EndPrcName();
endPrcName.setIsNot("2");
endPrcName.setIds("xxx");
return Result.success(endPrcName);
}else {
return Result.error();
}
}
return Result.success();
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+1
View File
@@ -154,6 +154,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/OtConvert/convertFileToFileId");
addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew");
addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNewOnlyOffice");
addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew");
addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew");
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile");