Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-02-15 16:26:15 +08:00
151 changed files with 254 additions and 220 deletions
@@ -173,12 +173,12 @@ public class TodoTaskController extends BaseAction {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime"));
res.setAcceptTime(data);
//获取新的流程名称
QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
queryWrapper1.eq("P_ID",res.getPrcId());
queryWrapper1.eq("TASK_ID",res.getTaskIds());
BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
// //获取新的流程名称
// QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
// queryWrapper1.eq("P_ID",res.getPrcId());
// queryWrapper1.eq("TASK_ID",res.getTaskIds());
// BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
// res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
todoList.add(res);
}
}
@@ -63,7 +63,7 @@ public class JSFAuditAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("15");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -106,7 +106,7 @@ public class JSFFillinformationAfter implements TaskListener {
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setPrcName("加入标准化协会信息备案-流程结束");
// one1.setPrcName("加入标准化协会信息备案-流程结束");
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
@@ -71,7 +71,7 @@ public class AdminReviewAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -70,7 +70,7 @@ public class DeptLeaderReviewAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -69,7 +69,7 @@ public class DistributionAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -63,7 +63,7 @@ public class FeedBackAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -79,7 +79,7 @@ public class MinisterReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -62,7 +62,7 @@ public class ReLaunchAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -68,7 +68,7 @@ public class SubMinisterReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -83,7 +83,7 @@ public class ViceDirectorAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -59,7 +59,7 @@ public class DockingApprovalAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -75,7 +75,7 @@ public class SelectDockUserAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -104,7 +104,7 @@ public class SelectResponUserAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -90,7 +90,7 @@ public class UploadCommentAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -60,7 +60,7 @@ public class PRFApproveAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -65,7 +65,7 @@ public class PRFEngineerreviewAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -60,7 +60,7 @@ public class PRFFillinformationAfter implements TaskListener {
if (one1 != null) {
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -65,7 +65,7 @@ public class PRFReviewdockAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -57,7 +57,7 @@ public class PRFUnderengineerAfter implements TaskListener {
if (one1 != null) {
one1.setPrcType("14");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -81,7 +81,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -74,7 +74,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -67,7 +67,7 @@ public class PCAbzManagerApproveAfter implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -226,7 +226,7 @@ public class PCAdlApproveAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class PCAffLiableApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -169,7 +169,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -65,7 +65,7 @@ public class PCAgcManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -56,7 +56,7 @@ public class PCAgcManagerDeliverAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -65,7 +65,7 @@ public class PCAjgManagerApproveAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -83,7 +83,7 @@ public class PCAjgManagerDistributeAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -50,7 +50,7 @@ public class PCAsumAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("6");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -90,7 +90,7 @@ public class RAApproveAfter implements TaskListener {
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setPrcName("外部署名推荐批准-入库流程结束");
// one1.setPrcName("外部署名推荐批准-入库流程结束");
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class RAAuditAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -49,7 +49,7 @@ public class RAModifyInformationAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class RASignAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -65,7 +65,7 @@ public class RAValidationAfter implements TaskListener {
if(one1!=null){
one1.setPrcType("16");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -83,7 +83,7 @@ public class DirectorVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("22");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setOverTime(OVERTIME);
one1.setCreatUserName(username);
@@ -58,7 +58,7 @@ public class MemberUploadInfoAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("22");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -60,14 +60,13 @@ public class StartSurveyAfter implements TaskListener {
object.put("uniques",uniques);
delegateTask.setVariable("uniqueMark",uniques);
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
delegateTask.setVariable("userName",username);
delegateTask.setVariable("user",user);
delegateTask.setVariable("cid",standName);
String prcName = standName+"-标准征求意见流程-责任部门对接人选择责任人";
String prcName = standName+"-征求意见";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -95,7 +95,7 @@ public class Step10After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -77,7 +77,7 @@ public class Step1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -116,7 +116,7 @@ public class Step1After implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setTaskInfo("意见反馈");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
@@ -73,7 +73,7 @@ public class Step2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -52,7 +52,7 @@ public class Step3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -59,7 +59,7 @@ public class Step4After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -83,7 +83,7 @@ public class Step5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -53,7 +53,7 @@ public class Step6After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -89,7 +89,7 @@ public class Step7After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -77,7 +77,7 @@ public class Step8After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class Step9After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -52,7 +52,7 @@ public class DirectorSignAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -70,7 +70,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -51,7 +51,7 @@ public class PresidentSignAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -58,7 +58,7 @@ public class ResponUserSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -103,7 +103,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -56,7 +56,7 @@ public class SummarySurveyAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -75,7 +75,7 @@ public class UploadResearchResultAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -107,7 +107,7 @@ public class ChargeVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -113,7 +113,7 @@ public class DirectorChooseAfter implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -52,7 +52,7 @@ public class EngineerReviseAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -128,7 +128,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setOverTime(OVERTIME);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -85,7 +85,7 @@ public class LeaderVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -86,7 +86,7 @@ public class ManageSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -74,7 +74,7 @@ public class PresidentVerifyAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -55,7 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("21");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class DirectorSignAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -91,7 +91,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setTaskInfo("批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -103,7 +103,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
@@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -98,7 +98,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -110,7 +110,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任人上传调研结果");
busProcessNewNext.setTaskInfo("调研结果反馈");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("responUser",String.class));
busBean.save(busProcessNewNext);
@@ -56,7 +56,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -120,7 +120,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -52,7 +52,7 @@ public class PresidentSignAfter implements TaskListener {
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -60,7 +60,7 @@ public class ResponUserSignAfter implements TaskListener {
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -132,7 +132,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("调研结果处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
@@ -84,7 +84,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -53,7 +53,6 @@ public class StartSurveyAfter implements TaskListener {
delegateTask.setVariable("dockUserList",dockUserList);
List<String> userList = new ArrayList<>(dockUserList);
// userList.add(object.getString("dockUser"));
userList.add(object.getString("ministerUser"));
delegateTask.setVariable("userList",userList);
@@ -63,19 +62,17 @@ public class StartSurveyAfter implements TaskListener {
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("startUser");
String username = object.getString("startUserName");
delegateTask.setVariable("startId",user);
delegateTask.setVariable("startName",username);
String standName = object.getString("title");
String standName = object.getString("processName");
delegateTask.setVariable("title",standName);
String prcName = standName+"-标准调研流程";
String prcName = standName;
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -118,7 +115,7 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setTaskInfo("任务分发");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
@@ -58,7 +58,7 @@ public class SummarySurveyAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -74,7 +74,7 @@ public class UploadResearchResultAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -87,7 +87,7 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人审批");
busProcessNewNext.setTaskInfo("调研结果审批");
busProcessNewNext.setUserId(os.getString("dockUser"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
@@ -62,7 +62,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -47,7 +47,7 @@ public class ProcessStep3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -58,7 +58,7 @@ public class ProcessStep4After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -58,7 +58,7 @@ public class ProcessStep5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -73,7 +73,7 @@ public class ProcessStep6After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("24");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -62,7 +62,7 @@ public class BussFs2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -63,7 +63,7 @@ public class BussFs3After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -60,7 +60,7 @@ public class BussFsC2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -61,7 +61,7 @@ public class BussFsSub1After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -62,7 +62,7 @@ public class BussFsSub2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -53,7 +53,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("23");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -70,7 +70,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("23");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -64,7 +64,7 @@ public class ProcessStep1After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -67,7 +67,7 @@ public class ProcessStep2After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -59,7 +59,7 @@ public class ProcessStep3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -149,7 +149,7 @@ public class ProcessStep4After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -47,7 +47,7 @@ public class ProcessStep5After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -56,7 +56,7 @@ public class Step1After implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("10");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -50,7 +50,7 @@ public class Step3After implements TaskListener {
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("10");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -72,7 +72,7 @@ public class bzApproveAfter implements TaskListener {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("10");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -97,7 +97,7 @@ public class confirmAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("10");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -57,7 +57,7 @@ public class DirectorAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -73,7 +73,7 @@ public class DistributionAfter implements TaskListener {
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("laws2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -63,7 +63,7 @@ public class DockerReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -73,7 +73,7 @@ public class EngineerReviewAfter implements TaskListener {
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("laws2");
one1.setPrcName(prcName);
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);

Some files were not shown because too many files have changed in this diff Show More