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

Merge branch 'develop' into develop_oa

Browse Source
This commit is contained in:
super_liu
2021-09-16 15:06:15 +08:00
parent 22812a7f6e 83812a2668
commit d15b0f8ac8
19 changed files with 195 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+13
View File
@@ -45,6 +45,19 @@ public class TaskController {
@Autowired
private IBusProcessEntrustService iBusProcessEntrustService;
@ApiOperation(value = "流程实例明细验证是否完成")
@GetMapping("/get_verify_by_instance")
public long get_verify_by_instance(String taskId,String pId) {
Map<String, Object> map = new TreeMap<>();
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("TASK_ID",taskId);
queryWrapper.eq("P_ID",pId);
queryWrapper.eq("COMMIT_FLAG","0");
long count = iBusProcessNewService.count(queryWrapper);
return count;
}
@ApiOperation(value = "流程实例明细列表")
@ApiImplicitParam(name = "prcNum", value = "流程实例id")
@GetMapping("/get_list_by_instance")
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java
+1
View File
@@ -12,6 +12,7 @@ import lombok.Data;
@Data
public class Step3DTO {
private String id;
private String uname;
private String itemNum;
private String itemsName;
src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java
+4
View File
@@ -30,5 +30,9 @@ public class SarPublicIdea{
private String uniques;
private String files;
private String filesName;
}
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
+6 -6
View File
@@ -101,9 +101,9 @@ public class PCAdlApproveAfter implements TaskListener {
SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess();
sarStandard.setStandId(pcAdataList.getStandId());
sarStandard.setStandName(pcAdataList.getStandName());
sarStandard.setProductLineId(pcAdataList.getProductLineId());
sarStandard.setProductId(pcAdataList.getProductId());
sarStandard.setProductName(pcAdataList.getProductName());
sarStandard.setProductLineId(res.getProductLine());
sarStandard.setProductId(res.getProjectNumber());
sarStandard.setProductName(res.getProjectName());
sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandard.setStandType(pcAdataList.getStandType());
sarStandard.setType(pcAdataList.getTypeId());
@@ -177,9 +177,9 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandardChild.setStandName(pcAdataList.getStandName());
sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear());
sarStandardChild.setType(pcAchildren.getTypeId());
sarStandardChild.setProductLineId(pcAdataList.getProductLineId());
sarStandardChild.setProductId(pcAdataList.getProductId());
sarStandardChild.setProductName(pcAdataList.getProductName());
sarStandardChild.setProductLineId(res.getProductLine());
sarStandardChild.setProductId(res.getProjectNumber());
sarStandardChild.setProductName(res.getProjectName());
sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime());
sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures());
sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class DirectorSignAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class DockingApprovalAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class PresidentSignAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ResponUserSignAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+29 -22
View File
@@ -85,13 +85,12 @@ public class SelectResponsibleUserAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
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("3");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -115,37 +114,45 @@ public class SelectResponsibleUserAfter implements TaskListener {
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (null==delegateTask.getVariable("zs")) {
delegateTask.setVariable("zs", strings);
}else {
delegateTask.getVariable("zs",List.class).addAll(strings);
delegateTask.setVariable("zs",delegateTask.getVariable("zs") );
}
if(selectResponCompletedCount>=dockUserList.size()){
// Collection<Object> values = userListJson;
// Collection<Map<String,Object>> respon=new ArrayList<>();
// for (Object value : values) {
// respon.add(((JSONObject)value).getInnerMap());
// }
delegateTask.setVariable("zqazqazqaUserList",strings);
delegateTask.setVariable("zqazqazqaUserList", delegateTask.getVariable("zs",List.class));
delegateTask.setVariable("datas",map);
if(nextUserList != null && !nextUserList.isEmpty()){
List<BusProcessNew> busProcessNews=new ArrayList<>();
for(String zqa : strings){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// object.put("dockUser",(String)zqa.get("dockUser"));
object.put("dockUser",map.get(zqa).getString("dockUser"));
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(map.get(zqa).getString("id"));
busProcessNewNext.setPrcName(prcName);
busProcessNews.add(busProcessNewNext);
}
saveBusPress(delegateTask, object, strings, map, prcName, busProcessNews);
busBean.saveBatch(busProcessNews);
}
}else {
List<BusProcessNew> busProcessNews=new ArrayList<>();
saveBusPress(delegateTask, object, strings, map, prcName, busProcessNews);
busBean.saveBatch(busProcessNews);
}
}
private void saveBusPress(DelegateTask delegateTask, JSONObject object, List<String> strings, Map<String, JSONObject> map, String prcName, List<BusProcessNew> busProcessNews) {
for (String zqa : strings) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
object.put("dockUser", map.get(zqa).getString("dockUser"));
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(map.get(zqa).getString("id"));
busProcessNewNext.setPrcName(prcName);
busProcessNews.add(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+3
View File
@@ -70,6 +70,7 @@ public class StartSurveyAfter implements TaskListener {
String user = object.getString("startUser");
String username = object.getString("startUserName");
String standName = object.getString("cid");
delegateTask.setVariable("cid",standName);
String prcName = standName+"-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -144,6 +145,8 @@ public class StartSurveyAfter implements TaskListener {
.standType(object.getString("standType"))
.standId(object.getString("standId"))
.uniques(uniques)
.files(object.getString("filesId"))
.filesName(object.getString("filesName"))
.build();
ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
if(!result.isOk()){
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class SummarySurveyAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class UploadResearchResultAfter 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");
String standName = object.getString("cid");
String standName = delegateTask.getVariable("cid",String.class);
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class UploadResearchResultAfter implements TaskListener {
object.put("responUser",obj.getString("id"));
object.put("responUserName",obj.getString("name"));
obj.put("dyhz",object.getString("dyhz"));
obj.put("fileId",object.getString("fileId"));
obj.put("fileName",object.getString("fileName"));
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java
+90
View File
@@ -0,0 +1,90 @@
package com.ydw.bat.wkflow.listener.itemlistvalidationprocess;
import com.alibaba.fastjson.JSONArray;
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.StandProjectRelationDto;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class bzApproveAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("passFlag"))) {
delegateTask.setVariable("passFlag","0");
List<StandProjectRelationDto> standProjectRelationDtos = new ArrayList<>();
JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList"));
for (Object os : jsonArray) {
JSONObject jsonObject = JSONObject.parseObject(os.toString());
StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto();
standProjectRelationDto.setProjectId(object.getString("projectId"));
standProjectRelationDto.setStandId(jsonObject.getString("id"));
standProjectRelationDtos.add(standProjectRelationDto);
}
lawsUserInfoService.batchInsert(standProjectRelationDtos);
}else {
delegateTask.setVariable("passFlag","1");
nextUserList.add(delegateTask.getVariable("confirmId",String.class));
}
//截止时间 流程描述 创建人
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 = "项目清单确认流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if ("0".equals(object.getString("passFlag"))) {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("10");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if(!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);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveBefore.java
+27
View File
@@ -0,0 +1,27 @@
package com.ydw.bat.wkflow.listener.itemlistvalidationprocess;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.List;
public class bzApproveBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID");
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.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java
+12 -11
View File
@@ -34,18 +34,19 @@ public class confirmAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
delegateTask.setVariable("approveId",object.getString("approveId"));
nextUserList.add(object.getString("approveId"));
List<StandProjectRelationDto> standProjectRelationDtos = new ArrayList<>();
JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList"));
for (Object os:jsonArray) {
JSONObject jsonObject=JSONObject.parseObject(os.toString());
StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto();
standProjectRelationDto.setProjectId(object.getString("projectId"));
standProjectRelationDto.setStandId(jsonObject.getString("id"));
standProjectRelationDtos.add(standProjectRelationDto);
}
lawsUserInfoService.batchInsert(standProjectRelationDtos);
// JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList"));
// for (Object os:jsonArray) {
// JSONObject jsonObject=JSONObject.parseObject(os.toString());
// StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto();
// standProjectRelationDto.setProjectId(object.getString("projectId"));
// standProjectRelationDto.setStandId(jsonObject.getString("id"));
// standProjectRelationDtos.add(standProjectRelationDto);
// }
// lawsUserInfoService.batchInsert(standProjectRelationDtos);
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("startId",String.class);
@@ -55,7 +56,7 @@ public class confirmAfter implements TaskListener {
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
// one1.setOverTime(OVERTIME);
one1.setPrcType("10");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java
+2
View File
@@ -35,6 +35,8 @@ public class itemlistvalidationprocessStartAfter implements TaskListener {
nextUserList.add(object.getString("confirmId"));
delegateTask.setVariable("confirmId",object.getString("confirmId"));
delegateTask.setVariable("dl",object.getString("approveId"));
//截止时间 流程描述 创建人
String user = object.getString("startUser");
String username = object.getString("startUserName");
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java
-1
View File
@@ -62,7 +62,6 @@ public class PEPSumAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("5");
one1.setPrcName(prcName);
one1.setCreatUser(user);