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 13:21:13 +08:00
parent f4689c6f71
commit e5ede92abc
6 changed files with 65 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -17,7 +17,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
@Component @Component
@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @FeignClient(value = "FotonLAWSSystem454",path="/api",url="")
@RequestMapping("/") @RequestMapping("/")
public interface LawsUserInfoService { public interface LawsUserInfoService {
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java
+12 -9
View File
@@ -130,15 +130,18 @@ public class PEPDepartLeaderAfter implements TaskListener {
lawsUserInfoService.addsarStandUnqualified(sarStandUnqualifieds); lawsUserInfoService.addsarStandUnqualified(sarStandUnqualifieds);
lawsUserInfoService.addProduct(productAssesses); lawsUserInfoService.addProduct(productAssesses);
//是否审批通过 passFlag == 1 通过 //是否审批通过 passFlag == 1 通过
BusProcessNew busProcessNew = new BusProcessNew(); if (null!=object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setFinishFlag("0"); if(!list.isEmpty()){
busProcessNew.setTaskInfo(delegateTask.getName()); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setUserId(delegateTask.getVariable("DLUserId",String.class)); busProcessNews.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(busProcessNew); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
func1(delegateTask, busBean, object, "0"); func1(delegateTask, busBean, object, "0");
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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());
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java
+12 -11
View File
@@ -70,16 +70,18 @@ public class PEPSumAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null!=object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if(!list.isEmpty()){
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -89,7 +91,6 @@ 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
+13 -11
View File
@@ -95,17 +95,19 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null!=object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if(!list.isEmpty()){
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNews);
if ("1".equals(object.getString("fenFlag"))) { }
}
if ("2".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
+14 -11
View File
@@ -12,6 +12,7 @@ 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.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -121,17 +122,18 @@ public class PEPmanagerApproveAfter implements TaskListener {
delegateTask.setVariable("PEPAllCount",count); delegateTask.setVariable("PEPAllCount",count);
} }
// 存储当前节点意见1 // 存储当前节点意见1
// 存储当前节点意见 if (null!=object.getString("commentText")) {
BusProcessNew busProcessNew = new BusProcessNew(); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setMsgType("clause"); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setMesg(object.toJSONString()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); if(!list.isEmpty()){
busProcessNew.setTaskId(delegateTask.getId()); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setCommitText(object.getString("commentText")); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setFinishFlag("0"); busProcessNews.setCommitText(object.getString("commentText"));
busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNews);
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();
@@ -145,5 +147,6 @@ public class PEPmanagerApproveAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java
+13 -11
View File
@@ -67,16 +67,18 @@ public class PEPtaskEstimateAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null!=object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if(!list.isEmpty()){
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -86,7 +88,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);
} }