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

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

Browse Source
This commit is contained in:
yuezhihang
2021-07-30 15:22:52 +08:00
parent 41674988c5 6f93401e43
commit 3c90f61432
28 changed files with 456 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+4
View File
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.tmsps.fk.common.wrapper.Wrapper;
import com.ydw.bat.wkflow.business_main.datas.dto.*;
import com.ydw.bat.wkflow.business_main.datas.entity.*;
import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea;
import feign.Headers;
import org.apache.ibatis.annotations.Param;
import org.springframework.cloud.openfeign.FeignClient;
@@ -101,6 +102,9 @@ public interface LawsUserInfoService {
@PostMapping(value = "sarLawsDetailedList/sar-laws-detailed-list/getStandById")
public SarLawsDetailedList getStandById(@RequestParam("id") String id);
@PostMapping("/slrs/sar-public-idea/addSarPublicIdea")
public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea);
src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java
+27
View File
@@ -0,0 +1,27 @@
package com.ydw.bat.wkflow.business_slrs.dao;
import lombok.Builder;
import lombok.Data;
import java.util.Date;
@Data
@Builder
public class SarPublicIdea{
private String id;
private String category;
private String cid;
private String cname;
private Date startTime;
private Date endTime;
private String categoryFlag;
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java
+4 -5
View File
@@ -42,11 +42,10 @@ public class DirectorSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java
+4 -5
View File
@@ -40,11 +40,10 @@ public class DockingApprovalAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java
+19 -5
View File
@@ -36,6 +36,21 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
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));
QueryWrapper qw = new QueryWrapper();
qw.isNull("task_id");
List<BusProcessNew> list = busBean.list(qw);
if(list == null || list.isEmpty()){
busBean.save(busProcessNewNext);
}
}
}
@@ -44,11 +59,10 @@ public class MinisterAndDockerSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java
+4 -5
View File
@@ -41,11 +41,10 @@ public class PresidentSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java
+5 -6
View File
@@ -49,11 +49,10 @@ public class ResponUserSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -115,7 +114,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+4 -5
View File
@@ -78,11 +78,10 @@ public class SelectResponsibleUserAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+25 -5
View File
@@ -2,13 +2,17 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
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.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import com.ydw.bat.wkflow.util.http.ResponseMessage;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -16,8 +20,12 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
public class StartSurveyAfter implements TaskListener {
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
@Override
public void notify(DelegateTask delegateTask) {
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
@@ -58,10 +66,10 @@ public class StartSurveyAfter 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 = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
String prcName = standName+"-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -74,8 +82,6 @@ public class StartSurveyAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -112,5 +118,19 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
}
//发起公开征求意见
SarPublicIdea sarPublicIdea = SarPublicIdea.builder()
.id(UUID.randomUUID().toString())
.category("标准")
.cid(object.getString("cid"))
.cname(object.getString("cname"))
.startTime(new Date())
.endTime(new Date())
.build();
ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
if(!result.isOk()){
throw new ActivitiException("发起公开征求意见失败");
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java
+4 -5
View File
@@ -46,11 +46,10 @@ public class SummarySurveyAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java
+35 -5
View File
@@ -22,8 +22,41 @@ public class SummarySurveyBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
String mesg = one1.getMesg();
JSONObject obj = JSON.parseObject(mesg);
JSONArray array = JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class));
if(!one1.getMesg().contains("summaryList")){
JSONArray summaryList=new JSONArray();
JSONObject obj= JSON.parseObject(one1.getMesg());
for (Object o : array) {
JSONObject object=(JSONObject)o;
JSONArray infoList=object.getObject("info",JSONArray.class);
for (Object o1 : infoList) {
JSONObject summaryEntity=new JSONObject();
JSONObject info=(JSONObject)o1;//info 具体反馈的信息
summaryEntity.put("responUser",object.getString("id"));
summaryEntity.put("responUserName",object.getString("name"));
summaryEntity.put("department",object.getString("department"));
summaryEntity.put("dockUser",object.getString("dockUser"));
summaryEntity.put("chapterNumber",info.getString("chapterNumber"));//章节编号
summaryEntity.put("chapterName",info.getString("chapterName"));//章节名称
summaryEntity.put("commentText",info.getString("commentText"));//修改意见内容
summaryEntity.put("state",null);//修改意见内容
summaryEntity.put("stateInfo",null);//修改意见内容
summaryList.add(summaryEntity);
}
}
obj.put("summaryList",summaryList);
one1.setMesg(obj.toJSONString());
}
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
/*JSONObject obj= JSON.parseObject(one1.getMesg());
//看全局变量里有没有存Summary,有的话就直接走，没的话就就初始化
JSONArray summaryList=JSON.parseArray(delegateTask.getVariable("summaryList",String.class));
@@ -57,10 +90,7 @@ public class SummarySurveyBefore implements TaskListener {
obj.put("summaryList",summaryList);
delegateTask.setVariable("summaryList",summaryList.toJSONString());
one1.setMesg(obj.toJSONString());
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
one1.setMesg(obj.toJSONString());*/
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+4 -5
View File
@@ -65,11 +65,10 @@ public class UploadResearchResultAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准征求意见流程";
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+2 -3
View File
@@ -44,9 +44,8 @@ public class DirectorSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+2 -3
View File
@@ -43,9 +43,8 @@ public class DockingApprovalAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+2 -3
View File
@@ -46,9 +46,8 @@ public class MinisterAndDockerSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+2 -3
View File
@@ -43,9 +43,8 @@ public class PresidentSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName + "标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+2 -3
View File
@@ -53,9 +53,8 @@ public class ResponUserSignAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+11 -9
View File
@@ -10,9 +10,11 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.rmi.activation.ActivationException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,6 +36,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String userListString=object.getString("responUserList");
String userListStringName=object.getString("responUserListName");
@@ -52,24 +55,23 @@ public class SelectResponsibleUserAfter implements TaskListener {
json.put("dockUser",delegateTask.getAssignee());
responUserList.add(json);
}
//1个Lsit 存id 两个Map key=id dockUser
delegateTask.setVariable("responUserList",responUserList);
//截止时间 流程描述 创建人
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 user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("title");
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("1");
one1.setPrcType("2");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -113,7 +115,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
}
}
}
// throw new ActivitiException("dahsdgadiauhfugauyfgqffiygv");
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java
+1
View File
@@ -15,6 +15,7 @@ public class SelectResponsibleUserBefore 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/SummarySurveyAfter.java
+2 -3
View File
@@ -50,9 +50,8 @@ public class SummarySurveyAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+2 -3
View File
@@ -69,9 +69,8 @@ public class UploadResearchResultAfter 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");
// object.getString("standName")
String standName = "";
String prcName = standName+"标准调研流程";
String standName = object.getString("title");
String prcName = standName+"-标准调研流程";
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
+1 -1
View File
@@ -61,7 +61,7 @@ public class ApplyApplicantAfter implements TaskListener{
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class CountersignAfter implements TaskListener{
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class SLApplicantAfter implements TaskListener{
}
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
src/main/java/com/ydw/bat/wkflow/util/http/PageInfo.java
+168
View File
@@ -0,0 +1,168 @@
package com.ydw.bat.wkflow.util.http;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class PageInfo<T> {
private Integer pageNo;
private Integer pageSize;
private Long count;
private Long pageCount;
private List<T> list;
private List<Map<String, Object>> title;
private Map<String, String> ext;
private String orderBy;
public PageInfo() {
this.pageNo = 1;
this.pageSize = 10;
this.list = new ArrayList();
this.title = new ArrayList();
this.ext = new HashMap();
this.orderBy = "";
this.pageSize = 1;
}
public PageInfo(HttpServletRequest request) {
this.pageNo = 1;
this.pageSize = 10;
this.list = new ArrayList();
this.title = new ArrayList();
this.ext = new HashMap();
this.orderBy = "";
String no = request.getParameter("pageNo");
if (StringUtils.isEmpty(no)) {
this.setPageNo(1);
} else if (StringUtils.isNumeric(no)) {
this.setPageNo(Integer.parseInt(no));
}
String size = request.getParameter("pageSize");
if (StringUtils.isEmpty(size)) {
this.setPageSize(10);
}
if (StringUtils.isNumeric(size)) {
this.setPageSize(Integer.parseInt(size));
}
String orderByParam = request.getParameter("orderBy");
if (StringUtils.isNotBlank(orderByParam)) {
this.setOrderBy(orderByParam);
}
}
public PageInfo(Integer pageNo, Integer pageSize) {
this(pageNo, pageSize, 0L);
}
public PageInfo(Integer pageNo, Integer pageSize, Long count) {
this(pageNo, pageSize, count, new ArrayList());
}
public PageInfo(Integer pageNo, Integer pageSize, Long count, List<T> list) {
this.pageNo = 1;
this.pageSize = 10;
this.list = new ArrayList();
this.title = new ArrayList();
this.ext = new HashMap();
this.orderBy = "";
if (pageNo == null) {
pageNo = 1;
}
if (pageSize == null) {
pageSize = 10;
}
this.setCount(count);
this.setPageNo(Math.abs(pageNo));
this.setPageSize(Math.abs(pageSize));
this.setList(list);
}
public Long getCount() {
return this.count;
}
public void setCount(Long count) {
this.count = count;
if ((long) this.pageSize >= count) {
this.pageNo = 1;
}
}
public Integer getPageNo() {
return this.pageNo;
}
public void setPageNo(Integer pageNo) {
this.pageNo = pageNo;
}
public Integer getPageSize() {
return this.pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize <= 0 ? 10 : pageSize;
}
public List<T> getList() {
return this.list;
}
public PageInfo<T> setList(List<T> list) {
this.list = list;
return this;
}
public String getOrderBy() {
return this.orderBy;
}
public void setOrderBy(String orderBy) {
this.orderBy = orderBy;
}
public Map<String, String> getExt() {
return this.ext;
}
public void setExt(Map<String, String> ext) {
this.ext = ext;
}
public Long getPageCount() {
if (this.count % (long) this.pageSize != 0L) {
this.pageCount = this.count / (long) this.pageSize + 1L;
} else {
this.pageCount = this.count / (long) this.pageSize;
}
if (this.pageCount < 1L) {
this.pageCount = 1L;
}
return this.pageCount;
}
public void setPageCount(Long pageCount) {
this.pageCount = pageCount;
}
public List<Map<String, Object>> getTitle() {
return this.title;
}
public void setTitle(List<Map<String, Object>> title) {
this.title = title;
}
}
src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessage.java
+58
View File
@@ -0,0 +1,58 @@
package com.ydw.bat.wkflow.util.http;
public class ResponseMessage<T> {
private String respCode;
private String respMsg;
private T data;
private boolean ok;
public ResponseMessage() {
}
public ResponseMessage(String respCode, String message) {
this.respCode = respCode;
this.respMsg = message;
}
public ResponseMessage(String respCode, String message, boolean ok) {
this.respCode = respCode;
this.respMsg = message;
this.ok = ok;
}
public ResponseMessage(String respCode, String message, boolean ok, T data) {
this.respCode = respCode;
this.respMsg = message;
this.ok = ok;
this.data = data;
}
public String getRespCode() {
return this.respCode;
}
public void setRespCode(String respCode) {
this.respCode = respCode;
}
public String getMessage() {
return this.respMsg;
}
public void setMessage(String message) {
this.respMsg = message;
}
public T getData() {
return this.data;
}
public void setData(T data) {
this.data = data;
}
public boolean isOk() {
return this.ok;
}
}
src/main/java/com/ydw/bat/wkflow/util/http/ResponseMessageCodeEnum.java
+20
View File
@@ -0,0 +1,20 @@
package com.ydw.bat.wkflow.util.http;
public enum ResponseMessageCodeEnum {
SUCCESS("0"),
ERROR("-1"),
VALID_ERROR("1000"),
SAVE_SUCCESS("r0001"),
UPDATE_SUCCESS("r0002"),
REMOVE_SUCCESS("r0003");
private String code;
private ResponseMessageCodeEnum(String code) {
this.code = code;
}
public String getCode() {
return this.code;
}
}
src/main/java/com/ydw/bat/wkflow/util/http/Result.java
+42
View File
@@ -0,0 +1,42 @@
package com.ydw.bat.wkflow.util.http;
public class Result {
public Result() {
}
public static ResponseMessage success() {
return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true);
}
public static <T> ResponseMessage<T> success(String code, T t) {
return new ResponseMessage(code, "", true, t);
}
public static <T> ResponseMessage<T> success(String code, String message) {
return new ResponseMessage(code, message);
}
public static <T> ResponseMessage<T> success(String code, String message, T t) {
return new ResponseMessage(code, message, true, t);
}
public static <T> ResponseMessage<T> success(T t) {
return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true, t);
}
public static ResponseMessage error() {
return error("");
}
public static ResponseMessage error(String message) {
return error(ResponseMessageCodeEnum.ERROR.getCode(), message);
}
public static ResponseMessage error(String code, String message) {
return error(code, message, (Object)null);
}
public static <T> ResponseMessage<T> error(String code, String message, T t) {
return new ResponseMessage(code, message, false, t);
}
}