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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!78
This commit is contained in:
高嵩
2023-05-15 18:07:13 +08:00
parent 81991ef0c3 d7754c7ca7
commit 0c81d39e74
5 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+4 -1
View File
@@ -85,9 +85,12 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/hastodoTasksList",method = RequestMethod.POST)
Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); List<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListShow",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserIdInfo(@RequestBody TaskCommonQuery taskCommonQuery);
@RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST)
List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+5
View File
@@ -473,4 +473,9 @@ public class workFlowFeignClientImpl {
public String endPrcName(String prcName,String esId) { public String endPrcName(String prcName,String esId) {
return workFlowFeignClient.endPrcName(prcName,esId); return workFlowFeignClient.endPrcName(prcName,esId);
} }
public List<BusProcessName> todoTaskListByUserIdInfo(TaskCommonQuery taskCommonQuery) {
List<BusProcessName> mapWrapper = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
return mapWrapper;
}
} }
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+21 -8
View File
@@ -532,7 +532,7 @@ public class WorkFlowController extends BaseController {
@ApiOperation(value = "我的待办任务列表") @ApiOperation(value = "我的待办任务列表")
@PostMapping("/todoTaskList") @PostMapping("/todoTaskList")
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) { public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserIdInfo(taskCommonQuery);
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>(); PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
if (busProcessNames != null) { if (busProcessNames != null) {
@@ -1354,7 +1354,9 @@ public class WorkFlowController extends BaseController {
String prcName2 = bussSort2 + "-" + esName2 + "-计划立项"; String prcName2 = bussSort2 + "-" + esName2 + "-计划立项";
String s1 = workFlowFeignClient.endPrcName(prcName1, esId1); String s1 = workFlowFeignClient.endPrcName(prcName1, esId1);
String s2 = workFlowFeignClient.endPrcName(prcName2, esId2); 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(); return Result.success();
}else { }else {
return Result.error(); return Result.error();
@@ -1362,12 +1364,23 @@ public class WorkFlowController extends BaseController {
} }
}else { }else {
s = workFlowFeignClient.endPrcName(prcName, esId); s = workFlowFeignClient.endPrcName(prcName, esId);
Map<String, String> objectObjectMap = new HashMap<>(); String[] split = s.split("-");
objectObjectMap.put("ids",esId); List<String> asList = Arrays.asList(split);
objectObjectMap.put("prcCreateUser","xxx"); if(split[0].equals("成功")){
String s1 = JSONObject.toJSONString(objectObjectMap); if(asList.size()>1){
if(s.equals("成功")){ EndPrcName endPrcName = new EndPrcName();
return Result.success(s1); 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();
endPrcName.setIsNot("2");
endPrcName.setIds("xxx");
return Result.success(endPrcName);
}else { }else {
return Result.error(); 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;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+15 -15
View File
@@ -3194,21 +3194,21 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
int size = sarStandMenuEODao.insert(sarStandMenuEO); int size = sarStandMenuEODao.insert(sarStandMenuEO);
} }
} }
// if (getInfo == null || getInfo.isEmpty()) { if (getInfo == null || getInfo.isEmpty()) {
// sarStandMenuEO.setId(UUIDUtils.randomUUID20()); sarStandMenuEO.setId(UUIDUtils.randomUUID20());
// int size = sarStandMenuEODao.insert(sarStandMenuEO); int size = sarStandMenuEODao.insert(sarStandMenuEO);
//// if (size>0){ if (size>0){
//// return true; return true;
//// } }
// } else { } else {
// sarStandMenuEO.setOldMenuId(secondLevelId); sarStandMenuEO.setOldMenuId(secondLevelId);
// List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); List<String> menuOldIdsInfo = sarMenuEOService.getChildMenuList(secondLevelId);
// sarStandMenuEO.setMenuIds(menuOldIds); sarStandMenuEO.setMenuIds(menuOldIdsInfo);
// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
//// if (size>0) { if (size>0) {
//// return true; return true;
//// } }
// } }
} }
return true; return true;
} }