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

add 调研模块

Browse Source
This commit is contained in:
yinglong zhang
2021-07-06 19:23:16 +08:00
parent d4873e31f2
commit 93f28c0c84
12 changed files with 146 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+35 -12
View File
@@ -28,30 +28,29 @@ public class DirectorSignAfter implements TaskListener {
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
if ("1".equals(object.getString("activeFlag"))) {
delegateTask.setVariable("activeFlag", 1);
}
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String prcName = standName + "标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcName(prcName);
@@ -70,10 +69,14 @@ public class DirectorSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -84,6 +87,26 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
} else {
if (delegateTask.getVariable("activeFlag", Integer.class) == 0) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busBean.save(busProcessNewNext);
} else {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+5 -1
View File
@@ -67,7 +67,11 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalBefore.java
+1
View File
@@ -18,6 +18,7 @@ public class DockingApprovalBefore implements TaskListener {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+45 -10
View File
@@ -32,16 +32,12 @@ public class MinisterAndDockerSignAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if("1".equals(object.getString("activeFlag"))){
delegateTask.setVariable("activeFlag",1);
}
}
if(delegateTask.getVariable("activeFlag",Integer.class)==1){
nextUserList=userList;
}
@@ -65,6 +61,10 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -75,21 +75,56 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(count==null)count=0;
count++;
delegateTask.setVariable("task3OKCount",count);
}
if(count>=userList.size()){
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
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);
busBean.save(busProcessNewNext);
}
}else {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
busBean.save(busProcessNewNext);
}
}else{
BusProcessNew busProcessNewNext = new BusProcessNew();
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.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignBefore.java
+1
View File
@@ -15,6 +15,7 @@ public class MinisterAndDockerSignBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+5 -1
View File
@@ -68,7 +68,11 @@ public class PresidentSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+32 -12
View File
@@ -77,26 +77,46 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(count==null)count=0;
count++;
delegateTask.setVariable("task2OKCount",count);
}
if(count>=responUserList.size()){
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
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);
busBean.save(busProcessNewNext);
}
}
}else {
BusProcessNew busProcessNewNext = new BusProcessNew();
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.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
}else {
if(delegateTask.getVariable("activeFlag",Integer.class)==0){
}else{
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+5 -1
View File
@@ -73,7 +73,11 @@ public class SelectResponsibleUserAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+4
View File
@@ -69,16 +69,20 @@ public class StartSurveyAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setUserId(delegateTask.getAssignee());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+5
View File
@@ -35,6 +35,11 @@ public class SummarySurveyAfter implements TaskListener {
List<String> responUserList=delegateTask.getVariable("responUserList",List.class);
for (int i=1;i<10;i++){
delegateTask.setVariable("task"+ i +"Count",0);
}
delegateTask.setVariable("activeFlag",0);
delegateTask.setVariable("responUserList",responUserList);
nextUserList=responUserList;
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+6 -2
View File
@@ -69,7 +69,11 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
@@ -90,7 +94,7 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人审批");
busProcessNewNext.setUserId(delegateTask.getAssignee());
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java
+2
View File
@@ -15,11 +15,13 @@ public class UploadResearchResultBefore implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
one1.setUserId();
busBean.saveOrUpdate(one1);
}
}