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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!89
This commit is contained in:
王夏晖
2022-01-04 16:44:53 +08:00
parent 217def1be8 9d22f721f7
commit d4b14b6558
4 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+3 -1
View File
@@ -133,8 +133,10 @@ public class TaskController {
historicTaskInstance.put("prcNum",one.getPrcNum());
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID",historicTaskInstance.get("id"));
queryWrapper1.eq("TASK_INFO",historicTaskInstance.get("name"));
queryWrapper1.isNotNull("COMMIT_TEXT");
List<BusProcessNew> list1 = iBusProcessNewService.list(queryWrapper1);
if(list1.size()>0){
if(!list1.isEmpty()){
historicTaskInstance.put("comment",list1.get(0).getCommitFlag());
historicTaskInstance.put("commentText",list1.get(0).getCommitText());
}else{
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -167,7 +167,7 @@ public interface LawsUserInfoService {
@PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);
@PostMapping("/wg_work_group/updateData")
@PostMapping("/wg_work_group/updateDataByWk")
public ResponseMessage<Object> wg_work_group_update(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java
+28
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -29,6 +30,9 @@ public class WriteMaterialAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -82,6 +86,30 @@ public class WriteMaterialAfter implements TaskListener {
busBean.save(busProcessNews);
}
JSONObject object1 = object.getJSONObject("rh_pageData");
WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityName"));
wgWorkGroupShowDTO.setLevel("1");
wgWorkGroupShowDTO.setNature("1");
if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameOne"));
wgWorkGroupShowDTO.setLevel("2");
wgWorkGroupShowDTO.setNature("2");
if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo"));
wgWorkGroupShowDTO.setLevel("3");
wgWorkGroupShowDTO.setNature("3");
}
}
}
wgWorkGroupShowDTO.setTypes("0");
wgWorkGroupShowDTO.setStatus("0");
infoService.wg_work_group_update(wgWorkGroupShowDTO);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java
+26
View File
@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.WG.WgWorkGroupShowDTO;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -29,6 +31,7 @@ public class WriteMaterialAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService infoService=SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -89,6 +92,29 @@ public class WriteMaterialAfter implements TaskListener {
busBean.save(busProcessNews);
}
JSONObject object1 = object.getJSONObject("rh_pageData");
WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityName"));
wgWorkGroupShowDTO.setLevel("1");
wgWorkGroupShowDTO.setNature("1");
if (StringUtils.isNotEmpty(object1.getString("comityNameOne"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameOne"));
wgWorkGroupShowDTO.setLevel("2");
wgWorkGroupShowDTO.setNature("2");
if (StringUtils.isNotEmpty(object1.getString("comityNameTwo"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityNameTwo"));
wgWorkGroupShowDTO.setLevel("3");
wgWorkGroupShowDTO.setNature("3");
}
}
}
wgWorkGroupShowDTO.setTypes("0");
wgWorkGroupShowDTO.setStatus("0");
infoService.wg_work_group_update(wgWorkGroupShowDTO);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();