This commit is contained in:
super_liu
2022-03-31 18:07:25 +08:00
parent 69a479d224
commit 99ed88c922
3 changed files with 6 additions and 2 deletions
@@ -24,6 +24,8 @@ public class LCLApplicantBefore implements TaskListener{
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1); List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){ if(!list.isEmpty()){
BusProcessNew one1 = list.get(0); BusProcessNew one1 = list.get(0);
@@ -8,6 +8,7 @@ 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.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.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -34,7 +35,6 @@ public class LawsManagerApproveAfter implements TaskListener {
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String prcName = "政策入库流程"; String prcName = "政策入库流程";
if ("1".equalsIgnoreCase(approvalOpinion)) { if ("1".equalsIgnoreCase(approvalOpinion)) {
delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
@@ -47,7 +47,8 @@ public class LawsManagerApproveAfter implements TaskListener {
busProcessNew.setPrcName(prcName); busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew); busBean.save(busProcessNew);
func1(delegateTask, busBean, object, "1"); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
delegateTask.setVariable("jlFlag", 1); delegateTask.setVariable("jlFlag", 1);
} else { } else {
delegateTask.setVariable("jlFlag", 0); delegateTask.setVariable("jlFlag", 0);
@@ -23,6 +23,7 @@ public class LawsManagerApproveBefore implements TaskListener{
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1); List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){ if(!list.isEmpty()){
BusProcessNew one1 = list.get(0); BusProcessNew one1 = list.get(0);