diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 06a70387..042e634d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -160,6 +160,8 @@ public interface LawsUserInfoService { public ResponseMessage updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO); + @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch") + public ResponseMessage updateBatch(@RequestBody List sarStandUnqualified); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java index 4fc004ca..6234c5f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java @@ -3,6 +3,8 @@ package com.ydw.bat.wkflow.listener.NonConformanceRectification; 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.dto.SarStandUnqualified; 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; @@ -25,6 +27,7 @@ public class DockingApprovalAfter implements TaskListener { 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 queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -88,7 +91,16 @@ public class DockingApprovalAfter implements TaskListener { if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(count>=responUserList.size()){ - + //入库 联动1？ + List sarStandUnqualifieds=new ArrayList<>(); + for (Object j:object.getJSONObject("info").getJSONArray("fileDataList")) { + JSONObject object1=JSONObject.parseObject(j.toString()); + SarStandUnqualified sarStandUnqualified=new SarStandUnqualified(); + sarStandUnqualified.setId(object1.getString("id")); + sarStandUnqualified.setCloseState(2); + sarStandUnqualifieds.add(sarStandUnqualified); + } + lawsUserInfoService.updateBatch(sarStandUnqualifieds); } }else{ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 2bf32c4f..249f7dea 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -131,7 +131,7 @@ public class PCAdlApproveAfter implements TaskListener { //遍历条目 for (PCAchildren pcAchildren : pcAdataList.getChildren()) { - if (null != pcAchildren.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) { + if (null != pcAchildren.getNoCompliance() && !"".equals(pcAchildren.getNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAchildren.getStandId()); @@ -152,7 +152,7 @@ public class PCAdlApproveAfter implements TaskListener { standUnqualifieds.add(sarStandUnqualified); } - if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) { + if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAchildren.getZcNoCompliance())) { SarStandUnqualified sarStandUnqualified = new SarStandUnqualified(); //少一个standId 不合格原因 在研在产！ sarStandUnqualified.setStandId(pcAchildren.getStandId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java new file mode 100644 index 00000000..b1ffc875 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java @@ -0,0 +1,140 @@ +package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; + +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.SarPublicIdea; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import com.ydw.bat.wkflow.util.http.ResponseMessage; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.*; + +//新征求意见流程!!!!! +public class StartSurveyAfter implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + QueryWrapper 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 nextUserList = new ArrayList(); + //整备数据 + //责任部门对接人集合==》 + if (object.getString("zrUserIdList").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("zrUserIdList").split(",")))); + }else { + nextUserList.add(object.getString("zrUserIdList")); + } + delegateTask.setVariable("zrUserIdList",nextUserList); + + //为新生成的公开征求意见建立id + String uniques= String.valueOf(UUID.randomUUID()); + object.put("uniques",uniques); + delegateTask.setVariable("uniqueMark",uniques); + //截止时间 流程描述 创建人 + 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"); + delegateTask.setVariable("cid",standName); + String prcName = standName+"-标准征求意见流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("3"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setUserId(delegateTask.getAssignee()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + + busBean.save(busProcessNew); + + if(nextUserList != null && !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); + } + }else{ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("责任对接人选择责任人"); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class)); + busBean.save(busProcessNewNext); + } + Date time=new Date(); + String dateTime=object.getString("endTime"); + dateTime = dateTime.replace("Z", " UTC"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z"); + SimpleDateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + time= format.parse(dateTime); + String result = defaultFormat.format(time); + System.out.println(result); + } catch (Exception e) { + e.printStackTrace(); + } + //发起公开征求意见 + SarPublicIdea sarPublicIdea = SarPublicIdea.builder() + .id(UUID.randomUUID().toString()) + .category("标准") + .cid(object.getString("cid")) + .cname(object.getString("cname")) + .startTime(new Date()) + .endTime(time) + .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()){ + throw new ActivitiException("发起公开征求意见失败"); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyBefore.java new file mode 100644 index 00000000..e7f89ad9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyBefore.java @@ -0,0 +1,27 @@ +package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; + +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 StartSurveyBefore 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 list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java index 7dddb2ac..ef4148f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java @@ -46,7 +46,7 @@ public class SRPManagerApproveAfter implements TaskListener{ if("1".equalsIgnoreCase(approvalOpinion)){ delegateTask.setVariable("jlFlag",1); - delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId")); + delegateTask.setVariable("applyUserId",delegateTask.getVariable("createUser",String.class)); BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -54,7 +54,7 @@ public class SRPManagerApproveAfter implements TaskListener{ busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class)); busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订"); busBean.save(busProcessNew);