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
This commit is contained in:
super_liu
2022-03-27 20:51:19 +08:00
parent 7761fa4687 792c1e1fe2
commit 476ac00845
15 changed files with 169 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+53 -37
View File
@@ -1983,18 +1983,18 @@ public class TodoTaskController extends BaseAction {
// }
// }
// }
String end = this.isEnd(busProcessName.getPrcId());
if(end.equals("0")){
ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
if(listUser.getData()!=null){
// List<String> qbgcs = new ArrayList<>();
for (OrgEO orgEO : listUser.getData()) {
assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
}
// String str= StringUtils.join(qbgcs, ",");
// assignee+=str;
}
}
// String end = this.isEnd(busProcessName.getPrcId());
// if(end.equals("0")){
// ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
// if(listUser.getData()!=null){
//// List<String> qbgcs = new ArrayList<>();
// for (OrgEO orgEO : listUser.getData()) {
// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
// }
//// String str= StringUtils.join(qbgcs, ",");
//// assignee+=str;
// }
// }
}
// //获取新的流程名称·
// QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
@@ -2105,19 +2105,19 @@ public class TodoTaskController extends BaseAction {
}
}
else{
String end = this.isEnd(busProcessName.getPrcId());
if(end.equals("0")){
// ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
ResponseMessage<List<OrgEO>> listUser=new ResponseMessage<>();
if(false){
List<String> qbgcs = new ArrayList<>();
for (OrgEO orgEO : listUser.getData()) {
assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
}
String str= StringUtils.join(qbgcs, ",");
assignee+=str;
}
}
// String end = this.isEnd(busProcessName.getPrcId());
// if(end.equals("0")){
//// ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
// ResponseMessage<List<OrgEO>> listUser=new ResponseMessage<>();
// if(false){
// List<String> qbgcs = new ArrayList<>();
// for (OrgEO orgEO : listUser.getData()) {
// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
// }
// String str= StringUtils.join(qbgcs, ",");
// assignee+=str;
// }
// }
}
// //获取新的流程名称·
// QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
@@ -2223,18 +2223,18 @@ public class TodoTaskController extends BaseAction {
}
}
}else{
String end = this.isEnd(busProcessName.getPrcId());
if(end.equals("0")){
ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
if(listUser.getData()!=null){
// List<String> qbgcs = new ArrayList<>();
for (OrgEO orgEO : listUser.getData()) {
assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
}
// String str= StringUtils.join(qbgcs, ",");
// assignee+=str;
}
}
// String end = this.isEnd(busProcessName.getPrcId());
// if(end.equals("0")){
// ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
// if(listUser.getData()!=null){
//// List<String> qbgcs = new ArrayList<>();
// for (OrgEO orgEO : listUser.getData()) {
// assignee+=orgEO.getRoleName()+"-"+orgEO.getUserName();
// }
//// String str= StringUtils.join(qbgcs, ",");
//// assignee+=str;
// }
// }
}
}
}
@@ -2326,6 +2326,22 @@ public class TodoTaskController extends BaseAction {
@ApiOperation(value = "强制撤回", notes = "强制撤回")
@GetMapping("/forceRecall")
public Wrapper<String> forceRecall(String prcId) {
QueryWrapper<BusProcessName> wrapper=new QueryWrapper<>();
wrapper.eq("PRC_ID",prcId);
List<BusProcessName> busProcessNames=iBusProcessNameService.list(wrapper);
if (!busProcessNames.isEmpty()){
BusProcessName busProcessName=busProcessNames.get(0);
if ("3".equals(busProcessName.getPrcType())){
QueryWrapper<BusProcessNew> wrapper1=new QueryWrapper<>();
wrapper1.eq("P_ID",prcId).eq("TASK_INFO","起草");
List<BusProcessNew> list=iBusProcessNewService.list(wrapper1);
if (!list.isEmpty()){
JSONObject object=JSONObject.parseObject(list.get(0).getMesg());
lawsUserInfoService.deletePublicIdea(object.getString("uniques"));
}
}
}
runtimeService.deleteProcessInstance(prcId, "用户强制撤回");
if(StringUtils.isNotBlank(prcId)){
webServiceOAService.deleteOAByPid(prcId);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java
+13
View File
@@ -70,6 +70,19 @@ public class ProcessStep1After implements TaskListener {
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java
+13
View File
@@ -83,6 +83,19 @@ public class ProcessStep2After implements TaskListener {
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java
+13
View File
@@ -60,6 +60,19 @@ public class ProcessStep3After implements TaskListener {
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java
+13
View File
@@ -66,6 +66,19 @@ public class ProcessStep4After implements TaskListener {
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java
+13
View File
@@ -66,6 +66,19 @@ public class ProcessStep5After implements TaskListener {
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java
+7 -3
View File
@@ -17,9 +17,7 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
public class ProcessStep6After implements TaskListener {
@@ -49,6 +47,12 @@ public class ProcessStep6After implements TaskListener {
SarBussionessStand sarBussionessStand = new SarBussionessStand();
sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus"));
sarBussionessStand.setId(object.getString("standId"));
Map<String, Object> map=new HashMap<>();
SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
map.put("fzrqbuss",dateFormat.format(new Date()));
sarBussionessStand.setAttrInfoCaseMap(map);
String as="{'FZRQBUSS':'"+dateFormat.format(new Date())+"'}";
sarBussionessStand.setSarStandAttrEOStr(as);
lawsUserInfoService.updateSarBussionessStand(sarBussionessStand);
}
}else {
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java
+15
View File
@@ -69,6 +69,21 @@ public class ProcessstartAfter implements TaskListener {
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
busProcessNews.setCommitText(object.getString("commentText"));
busBean.save(busProcessNews);
}
// 存储当前节点意见
if (nextUserList != null && !nextUserList.isEmpty()) {
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java
-2
View File
@@ -82,9 +82,7 @@ public class BussLibrary4After implements TaskListener{
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("hzUserId"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java
+8 -9
View File
@@ -33,7 +33,7 @@ public class BussLibraryC3After implements TaskListener{
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
// JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
// delegateTask.setVariable("objectJson",object);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -57,13 +57,13 @@ public class BussLibraryC3After implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String user = objectNew.getString("prcCreateUser");
String username = objectNew.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){
prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
@@ -80,14 +80,15 @@ public class BussLibraryC3After implements TaskListener{
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setId(one.getId());
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setMesg(objectNew.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(objectNew.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew);
@@ -98,9 +99,7 @@ public class BussLibraryC3After implements TaskListener{
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java
+10 -12
View File
@@ -33,7 +33,7 @@ public class BussLibraryC6After implements TaskListener{
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
// JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
// delegateTask.setVariable("objectJson",object);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -57,13 +57,13 @@ public class BussLibraryC6After implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String user = objectNew.getString("prcCreateUser");
String username = objectNew.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){
prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
@@ -84,10 +84,9 @@ public class BussLibraryC6After implements TaskListener{
busProcessNew.setId(one.getId());
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setMesg(objectNew.toJSONString());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(objectNew.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew);
@@ -97,8 +96,7 @@ public class BussLibraryC6After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setMesg(objectNew.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
@@ -106,8 +104,8 @@ public class BussLibraryC6After implements TaskListener{
busBean.save(busProcessNewNext);
}
// 评分存储
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")) {
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
+1
View File
@@ -129,6 +129,7 @@ public class BussUtils {
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setTaskInfo(delegateTask.getName());
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1
View File
@@ -62,6 +62,7 @@ public class ResolveAfter implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
delegateTask.setVariable("userId",user);
String username = object.getString("applyUserIdName");
delegateTask.setVariable("createDate",new Date());
String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+8 -4
View File
@@ -44,10 +44,14 @@ public class ZrApplayAfter implements TaskListener{
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);
prcName=prcName+"-工程师审核";
if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId"));
}
// if(StringUtils.isNotBlank(object.getString("applyUserId"))){
// delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
// nextUserList.add(object.getString("applyUserId"));
// }
// if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",delegateTask.getVariable("userId",String.class));
nextUserList.add(delegateTask.getVariable("userId",String.class));
// }
}else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2);
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
+1
View File
@@ -117,6 +117,7 @@ public class SRPManagerApproveAfter implements TaskListener{
queryWrapper1.eq("TASK_ID",delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){
one1.setTaskInfo(delegateTask.getName());
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);