feat: 新流程模板提交

src/main/java/com/ydw/bat/wkflow/BatWkflowApplication.java

@@ -18,8 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  */
 @EnableEurekaClient
 @EnableFeignClients
-@SpringBootApplication
+@SpringBootApplication(exclude = {
-@EnableAutoConfiguration(exclude = {
 		org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
 		org.activiti.spring.boot.SecurityAutoConfiguration.class })
 @MapperScan("com.ydw.bat.wkflow.business.*.mapper")

src/main/java/com/ydw/bat/wkflow/business_activiti/define/ActivitDefineController.java

@@ -124,7 +124,7 @@ public class ActivitDefineController extends BaseAction {
 		// 创建查询对象
 		ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
 		// 使用流程定义的名称模糊查询
-		processDefinitionQuery.processDefinitionCategory("4bdf0b396b4aa6ea10dd5e19956a1e22");
+		processDefinitionQuery.processDefinitionCategory("e05707228fa5ed7b549198208ab19d97");
 		long total = processDefinitionQuery.count();
 		List<ProcessDefinition> list = processDefinitionQuery.orderByProcessDefinitionKey().asc().list();
 		List<Map<String, Object>> definitions = ActivitiTools.turnProcessDefinitions(list);
@@ -155,7 +155,7 @@ public class ActivitDefineController extends BaseAction {
 		// 创建查询对象
 		ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
 		// 使用流程定义的名称模糊查询
-		processDefinitionQuery.processDefinitionCategory("4bdf0b396b4aa6ea10dd5e19956a1e22");
+		processDefinitionQuery.processDefinitionCategory("e05707228fa5ed7b549198208ab19d97");
 		long total = processDefinitionQuery.count();
 		List<ProcessDefinition> list = processDefinitionQuery.orderByProcessDefinitionKey().asc().list();
 		List<Map<String, Object>> definitions = ActivitiTools.turnProcessDefinitions(list);
@@ -182,36 +182,14 @@ public class ActivitDefineController extends BaseAction {
             ResponseMessage<UserVO> byId = lawsUserInfoService.getById(userId);
             busProcessName.setCreatUserName(byId.getData().getUname());
             busProcessName.setPrcNum(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
-			if(id.equals("bzhyhhgllc")){
-				String prcName = bpnId;
-				busProcessName.setPrcType("16");
-				busProcessName.setPrcName(prcName);
-			}
 			ibusprocessnameService.save(busProcessName);
 		}else {
-			if (bpnId.indexOf("会议会后") != -1) {
+			QueryWrapper<BusProcessName> queryWrapper = new QueryWrapper<>();
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			queryWrapper.eq("ID", bpnId);
-				BusProcessName busProcessName = new BusProcessName();
+			BusProcessName one = ibusprocessnameService.getOne(queryWrapper);
-				busProcessName.setPrcId(pi.getId());
+			one.setPrcNum(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
-				busProcessName.setCreatTime(sdf.format(new Date()));
+			one.setPrcId(pi.getId());
-				busProcessName.setCreatUser(userId);
+			ibusprocessnameService.saveOrUpdate(one);
-				ResponseMessage<UserVO> byId = lawsUserInfoService.getById(userId);
-				busProcessName.setCreatUserName(byId.getData().getUname());
-				busProcessName.setPrcNum(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
-				if (id.equals("bzhyhhgllc")) {
-					String prcName = bpnId;
-					busProcessName.setPrcType("16");
-					busProcessName.setPrcName(prcName);
-				}
-				ibusprocessnameService.save(busProcessName);
-			} else {
-				QueryWrapper<BusProcessName> queryWrapper = new QueryWrapper<>();
-				queryWrapper.eq("ID", bpnId);
-				BusProcessName one = ibusprocessnameService.getOne(queryWrapper);
-				one.setPrcNum(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
-				one.setPrcId(pi.getId());
-				ibusprocessnameService.saveOrUpdate(one);
-			}
 		}
 		logger.info("启动流程实例,获取id-->{},实例名称-->{}", pi.getId(), pd.getName());
 		return WrapMapper.ok(task.getId());

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java

@@ -0,0 +1,71 @@
+package com.ydw.bat.wkflow.listener.standardLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+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.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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.Date;
+
+/**
+ *  标准入库申请人发起后
+ */
+public class SLApplicantAfter 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);
+
+        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
+        Datas datas = datasService.getOne(queryWrapper);
+
+        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+
+        JSONObject array = object.getJSONObject("hqsqForm");
+        boolean flag = true;
+        if(array.getString("opinion").equals("1")){
+            flag=false;
+        }
+
+//        if(!flag){
+//            delegateTask.setVariable("jlspFlag",1);
+//            BusProcessNew busProcessNew = new BusProcessNew();
+//            busProcessNew.setUserId(delegateTask.getVariable("fqr").toString());
+//            busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//            busProcessNew.setFinishFlag("0");
+//            busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//            busProcessNew.setMsgType("10");
+//            array.put("opinionTime",new Date());
+//            busProcessNew.setMesg(object.toJSONString());
+//            busBean.save(busProcessNew);
+//
+//            QueryWrapper queryWrapper1 = new QueryWrapper();
+//            queryWrapper1.eq("TASK_ID",delegateTask.getId());
+//            BusProcessNew one1 = busBean.getOne(queryWrapper1);
+//            if(one1!=null){
+//                one1.setCommitFlag("1");
+////                one1.setCommitText(array.getString("opinionContent"));
+//                busBean.saveOrUpdate(one1);
+//            }
+//        }else{
+//            delegateTask.setVariable("jlspFlag",0);
+//
+//            QueryWrapper queryWrapper1 = new QueryWrapper();
+//            queryWrapper1.eq("TASK_ID",delegateTask.getId());
+//            BusProcessNew one1 = busBean.getOne(queryWrapper1);
+//            if(one1!=null){
+//                one1.setCommitFlag("0");
+////                one1.setCommitText(array.getString("opinionContent"));
+//                busBean.saveOrUpdate(one1);
+//            }
+//        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java

@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.standardLibrary;
+
+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.BusProcessNew;
+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.listener.WkFlowSendEmail;
+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 SLApplicantBefore implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameServiceBean = SpringContextUtil.getBean(IBusProcessNameService.class);
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("USER_ID", delegateTask.getAssignee());
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        queryWrapper1.isNull("TASK_ID");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+//        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+//        one1.setTaskId(delegateTask.getId());
+//        busBean.saveOrUpdate(one1);
+////
+//
+//        WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程");
+    }
+}