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-06-10 17:10:07 +08:00
parent bdf10949af 908d178ee0
commit eaa87da338
9 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class SendMQService {
oaTaskExec.setEndTime(object.getEndTime());
oaTaskExec.setExecStatus(0);
oaTaskExecService.save(oaTaskExec);
object.setPrcName(object.getPrcName()+",请接受任务!");
object.setPrcName(object.getPrcName());
// 3 天 外 发送 OA 接受待办
insertOrUpdateInfo(object);
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13After.java
+12
View File
@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
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.NewsFeed;
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;
@@ -18,6 +20,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* 发布后
@@ -28,6 +31,7 @@ public class BussLibrary13After implements TaskListener{
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -42,6 +46,14 @@ public class BussLibrary13After implements TaskListener{
}else {
prcName = "企标制修订";
}
// NewsFeed newsFeed = new NewsFeed();
// newsFeed.setId(String.valueOf(UUID.randomUUID()));
// newsFeed.setRenewTime(new Date());
// newsFeed.setMessageType("2");
// newsFeed.setStandard(object.getString("standNumber"));
// newsFeed.setStandardName(object.getString("standName"));
// newsFeed.setReleaseDate(object.getString("issueTime"));
// lawsUserInfoService.insertNewsFeed(newsFeed);
BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService);
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
+16
View File
@@ -2,6 +2,8 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct;
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.NewsFeed;
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;
@@ -16,7 +18,9 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* 总院标准法规部产品标准工程师/各事业部标准化员发布后
@@ -27,6 +31,7 @@ public class BussLibraryProduct13After implements TaskListener{
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -41,6 +46,17 @@ public class BussLibraryProduct13After implements TaskListener{
}else {
prcName = "企标制修订";
}
// if(!("3".equals(object.getString("standStatus")))) {
// NewsFeed newsFeed = new NewsFeed();
// newsFeed.setId(String.valueOf(UUID.randomUUID()));
// newsFeed.setRenewTime(new Date());
//// newsFeed.setResourceType(object.getString("standType"));
// newsFeed.setMessageType("2");
// newsFeed.setStandard(object.getString("standNumber"));
// newsFeed.setStandardName(object.getString("standName"));
// newsFeed.setReleaseDate(object.getString("issueTime"));
// lawsUserInfoService.insertNewsFeed(newsFeed);
// }
BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
}
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step1After.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class Step1After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String prcName = "项目清单确认流程-确认人确认";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step2After.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class Step2After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String prcName = "项目清单确认流程-确认人确认";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class Step3After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String prcName = "项目清单确认流程-标准法规部经理审批";
String prcName = object.getString("projectNumber")+object.getString("projectName")+"清单确认";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+2 -2
View File
@@ -56,9 +56,9 @@ public class ApplyApplicantAfter implements TaskListener{
// object.getString("standName")
String standName = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
standName = object.getString("standName");
}else {
standName = "海外";
standName = object.getString("standEnName");
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+2 -2
View File
@@ -55,9 +55,9 @@ public class CountersignAfter implements TaskListener{
// object.getString("standName")
String standName = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
standName = object.getString("standName");
}else {
standName = "海外";
standName = object.getString("standEnName");
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java
+18 -12
View File
@@ -40,9 +40,9 @@ public class ManagerApproveAfter implements TaskListener {
String standName = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
standName = object.getString("standName");
}else {
standName = "海外";
standName = object.getString("standEnName");
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
@@ -75,16 +75,22 @@ public class ManagerApproveAfter implements TaskListener {
func1(delegateTask, busBean, object, "1");
delegateTask.setVariable("jlFlag", 1);
} else {
NewsFeed newsFeed = new NewsFeed();
newsFeed.setId(String.valueOf(UUID.randomUUID()));
newsFeed.setRenewTime(new Date());
newsFeed.setResourceType(object.getString("standType"));
newsFeed.setMessageType("0");
newsFeed.setStandard(object.getString("standNumber"));
newsFeed.setStandardName(object.getString("standName"));
newsFeed.setReleaseDate(object.getString("issueTime"));
newsFeed.setTextState(object.getString("textStatus"));
lawsUserInfoService.insertNewsFeed(newsFeed);
// NewsFeed newsFeed = new NewsFeed();
// newsFeed.setId(String.valueOf(UUID.randomUUID()));
// newsFeed.setRenewTime(new Date());
// newsFeed.setResourceType(object.getString("standType"));
// newsFeed.setStandard(object.getString("standNumber"));
// newsFeed.setStandardName(object.getString("standName"));
// newsFeed.setReleaseDate(object.getString("issueTime"));
// newsFeed.setTextState(object.getString("textStatus"));
// if("hc99551723c".equals(object.getString("textStatus"))){
// newsFeed.setMessageType("0");
// lawsUserInfoService.insertNewsFeed(newsFeed);
// }else if("8rjsx83ows".equals(object.getString("textStatus")) ||"hya6gay4vx".equals(object.getString("textStatus"))
// ||"ncb6osftj8".equals(object.getString("textStatus")) ||"3dx7oy5jff".equals(object.getString("textStatus"))){
// newsFeed.setMessageType("1");
// lawsUserInfoService.insertNewsFeed(newsFeed);
// }
delegateTask.setVariable("jlFlag", 0);
func2(delegateTask, busBean, object, "0", busProcessNameService);
}