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

标准合规评估流程！！！

Browse Source
This commit is contained in:
yuezhihang
2021-07-21 10:51:04 +08:00
parent 660a5c7969
commit f4689c6f71
8 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/DetailedUpDto.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class DetailedUpDto {
private String applicationScope; private String applicationScope;
@ApiModelProperty(value = "附件id") @ApiModelProperty(value = "附件id")
private String fileId; private String fileIds;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java
+1 -1
View File
@@ -70,7 +70,6 @@ public class PEPSumAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
// throw new ActivitiException("sshaifhiqhfka");
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -90,6 +89,7 @@ public class PEPSumAfter implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+25 -8
View File
@@ -46,7 +46,7 @@ public class PEPffresPersonAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("fenFlag"))) { if (StringUtils.isNotBlank(object.getString("fenFlag"))) {
if ("1".equals(object.getString("fenFlag"))) { if ("2".equals(object.getString("fenFlag"))) {
//通过 记录通过的流程条数 //通过 记录通过的流程条数
if (null!=delegateTask.getVariable("PEPCount")) { if (null!=delegateTask.getVariable("PEPCount")) {
String as = String.valueOf(delegateTask.getVariable("PEPCount")); String as = String.valueOf(delegateTask.getVariable("PEPCount"));
@@ -54,19 +54,35 @@ public class PEPffresPersonAfter implements TaskListener {
} else { } else {
delegateTask.setVariable("PEPCount", "1"); delegateTask.setVariable("PEPCount", "1");
} }
delegateTask.setVariable("fenFlag", object.getString("fenFlag")); delegateTask.setVariable("fenFlag", "1");
} else { } else {
//不通过就要驳回 //不通过就要驳回
nextUserList.add(object.getString("workPeople")); nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
delegateTask.setVariable("workPeople", object.getString("workPeople")); delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople")));
delegateTask.setVariable("fenFlag", object.getString("fenFlag")); delegateTask.setVariable("fenFlag", "2");
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setCommitText(object.getString("commentText"));
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(String.valueOf(delegateTask.getVariable("workPeople")));
busBean.save(busProcessNewNext);
} }
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class); String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "标准项目合规评估-汇总审批"; String prcName="";
if ("2".equals(object.getString("fenFlag"))) {
prcName= "标准项目合规评估-汇总审批";
}else {
prcName="标准项目合规评估-合规性评估";
}
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -89,8 +105,9 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNew);
if ("1".equals(object.getString("fenFlag"))) {
oneStep1(delegateTask, busBean, object, nextUserList); oneStep1(delegateTask, busBean, object, nextUserList);
}
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java
+3 -3
View File
@@ -37,7 +37,6 @@ public class PEPmanagerApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
PEPDTO pepdto = JSONObject.parseObject(datas.getFormValsJson(), PEPDTO.class); PEPDTO pepdto = JSONObject.parseObject(datas.getFormValsJson(), PEPDTO.class);
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
delegateTask.setVariable("passFlag",object.getString("passFlag"));
//后续节点所需要的数据 //后续节点所需要的数据
List<String> liablePeopleList = new ArrayList<>(); List<String> liablePeopleList = new ArrayList<>();
//获取对象中的项目的数据 //获取对象中的项目的数据
@@ -65,9 +64,11 @@ public class PEPmanagerApproveAfter implements TaskListener {
//生成任务信息 //生成任务信息
Map<String,PEPres> map=new HashMap<>(); Map<String,PEPres> map=new HashMap<>();
//是否审批通过 passFlag == 1 不通过 //是否审批通过 passFlag == 1 不通过
if ("2".equals(String.valueOf(object.get("passFlag")))) { if (null!=object.get("passFlag")) {
//如果流程通过标识为1 则为不通过发送消息给用户流程结束 //如果流程通过标识为1 则为不通过发送消息给用户流程结束
delegateTask.setVariable("passFlag","2");
} else { } else {
delegateTask.setVariable("passFlag","1");
int count=0; int count=0;
for (DataList da : dataList) { for (DataList da : dataList) {
PEPres pePres=new PEPres(); PEPres pePres=new PEPres();
@@ -131,7 +132,6 @@ public class PEPmanagerApproveAfter implements TaskListener {
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNew);
if(liablePeopleList != null && !liablePeopleList.isEmpty()){ if(liablePeopleList != null && !liablePeopleList.isEmpty()){
for(String liable : liablePeopleList){ for(String liable : liablePeopleList){
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java
+9 -9
View File
@@ -70,15 +70,15 @@ public class PEPstartAfter implements TaskListener {
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); // BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); // busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); // busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString()); // busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId()); // busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setFinishFlag("0"); // busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); // busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew); // busBean.saveOrUpdate(busProcessNew);
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java
+1
View File
@@ -86,6 +86,7 @@ public class PEPtaskEstimateAfter implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueAfter.java
+11 -11
View File
@@ -89,17 +89,17 @@ public class PEPtaskLssueAfter implements TaskListener {
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); // BusProcessNew busProcessNew = new BusProcessNew();
PEPres pePres=new PEPres(); // PEPres pePres=new PEPres();
pePres.setStep3DTOS(res); // pePres.setStep3DTOS(res);
busProcessNew.setMsgType("clause"); // busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); // busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(JSONObject.toJSONString(pePres)); // busProcessNew.setMesg(JSONObject.toJSONString(pePres));
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId()); // busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setFinishFlag("0"); // busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); // busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew); // busBean.saveOrUpdate(busProcessNew);
//更改遍历方式！！遍历生成的数据条数 每条都要判断！！ //更改遍历方式！！遍历生成的数据条数 每条都要判断！！
if (workPeoples != null && !workPeoples.isEmpty()) { if (workPeoples != null && !workPeoples.isEmpty()) {
for (String nextUser : workPeoples) { for (String nextUser : workPeoples) {
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class SRPManagerApproveAfter implements TaskListener{
DetailedUpDto detailed=new DetailedUpDto(); DetailedUpDto detailed=new DetailedUpDto();
detailed.setId(object.getString("standId")); detailed.setId(object.getString("standId"));
detailed.setApplicationScope(object.getString("applyRegion")); detailed.setApplicationScope(object.getString("applyRegion"));
detailed.setFileId(object.getString("model")); detailed.setFileIds(object.getString("model"));
detailed.setRemark(object.getString("descriptionList")); detailed.setRemark(object.getString("descriptionList"));
detailed.setInforlist(object.getString("inforlist")); detailed.setInforlist(object.getString("inforlist"));
detailed.setDetailedListState("1"); detailed.setDetailedListState("1");