From a7ee2d5b247a23e64951cd0b3c64d049c19cc35a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 15:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=88=96=E8=80=85=E7=BB=93=E6=9D=9F=20=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9B=B4=E6=94=B9=20=E6=8B=86=E5=88=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_slrs/dao/SarFileSplitInfoEO.java | 333 ++++++++++++++++++ .../ResponUserSignAfter.java | 48 ++- .../standardRead/DeptApplayAfter.java | 7 + .../listener/standardRead/ResolveAfter.java | 9 + 4 files changed, 381 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarFileSplitInfoEO.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarFileSplitInfoEO.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarFileSplitInfoEO.java new file mode 100644 index 00000000..b9c9b121 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarFileSplitInfoEO.java @@ -0,0 +1,333 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_INFO SarFileSplitInfoEOEntity
+ * 作者：code generator
+ * 日期： 2020-01-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarFileSplitInfoEO { + + + private String standType; + private String sarType; + private String fileName; + private String id; + private String standId; + private String fileType; + private String fileTypeShow; + private String attId; + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private String standName; + private String standNumSplit; + private String standNameSplit; + private String[] idList; + private int startNumber; + private int stopNumber; + private String result; + private String splitStatus; + private String collectId; + //用于拆分结果导入 by zj + private String menuId; + private String infoId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • sarType -> sar_type
    • + *
  • fileName -> file_name
    • + *
  • id -> id
    • + *
  • standId -> stand_id
    • + *
  • fileType -> file_type
    • + *
  • attId -> att_id
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • creationUser -> creation_user
    • + *
  • modifyTime -> modify_time
    • + *
  • modifyUser -> modify_user
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "sarType": return "sar_type"; + case "fileName": return "file_name"; + case "id": return "id"; + case "standId": return "stand_id"; + case "fileType": return "file_type"; + case "attId": return "att_id"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "creationUser": return "creation_user"; + case "modifyTime": return "modify_time"; + case "modifyUser": return "modify_user"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • sar_type -> sarType
    • + *
  • file_name -> fileName
    • + *
  • id -> id
    • + *
  • stand_id -> standId
    • + *
  • file_type -> fileType
    • + *
  • att_id -> attId
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • creation_user -> creationUser
    • + *
  • modify_time -> modifyTime
    • + *
  • modify_user -> modifyUser
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "sar_type": return "sarType"; + case "file_name": return "fileName"; + case "id": return "id"; + case "stand_id": return "standId"; + case "file_type": return "fileType"; + case "att_id": return "attId"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "creation_user": return "creationUser"; + case "modify_time": return "modifyTime"; + case "modify_user": return "modifyUser"; + default: return null; + } + } + + /** **/ + public String getSarType() { + return this.sarType; + } + + /** **/ + public void setSarType(String sarType) { + this.sarType = sarType; + } + + /** **/ + public String getFileName() { + return this.fileName; + } + + /** **/ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getStandId() { + return this.standId; + } + + /** **/ + public void setStandId(String standId) { + this.standId = standId; + } + + /** **/ + public String getFileType() { + return this.fileType; + } + + /** **/ + public void setFileType(String fileType) { + this.fileType = fileType; + } + + /** **/ + public String getAttId() { + return this.attId; + } + + /** **/ + public void setAttId(String attId) { + this.attId = attId; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public String getModifyUser() { + return this.modifyUser; + } + + /** **/ + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + private String showNumber; + + public String getShowNumber() { + return showNumber; + } + + public void setShowNumber(String showNumber) { + this.showNumber = showNumber; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public String getStandNumSplit() { + return standNumSplit; + } + + public void setStandNumSplit(String standNumSplit) { + this.standNumSplit = standNumSplit; + } + + public String getStandNameSplit() { + return standNameSplit; + } + + public void setStandNameSplit(String standNameSplit) { + this.standNameSplit = standNameSplit; + } + + public int getStartNumber() { + return startNumber; + } + + public void setStartNumber(int startNumber) { + this.startNumber = startNumber; + } + + public int getStopNumber() { + return stopNumber; + } + + public void setStopNumber(int stopNumber) { + this.stopNumber = stopNumber; + } + + public String getFileTypeShow() { + return fileTypeShow; + } + + public void setFileTypeShow(String fileTypeShow) { + this.fileTypeShow = fileTypeShow; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getSplitStatus() { + return splitStatus; + } + + public void setSplitStatus(String splitStatus) { + this.splitStatus = splitStatus; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java index 17f9d861..c04b9b8e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java @@ -33,7 +33,6 @@ public class ResponUserSignAfter implements TaskListener { List nextUserList = new ArrayList(); List userList=delegateTask.getVariable("userList",List.class); - String startUser=delegateTask.getVariable("startUser",String.class); if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if("1".equals(object.getString("actionFlag"))){ @@ -82,6 +81,11 @@ public class ResponUserSignAfter implements TaskListener { busBean.update(busProcessNew,updataWapper); Integer count=delegateTask.getVariable("task2OKCount",Integer.class); + Integer gonum=0; + if (null!=delegateTask.getVariable("task2Count",Integer.class)){ + gonum=delegateTask.getVariable("task2Count",Integer.class)+1; + delegateTask.setVariable("task2Count",gonum); + } List responUserList=delegateTask.getVariable("responUserList",List.class); @@ -93,29 +97,41 @@ public class ResponUserSignAfter implements TaskListener { count++; delegateTask.setVariable("task2OKCount",count); } - if(count>=responUserList.size()){ - if(delegateTask.getVariable("actionFlag",Integer.class)==0){ - 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); - busBean.save(busProcessNewNext); + if (gonum==responUserList.size()) { + if (count >= responUserList.size()) { + if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { + 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); + 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.setUserId(delegateTask.getVariable("startUser", String.class)); + busBean.save(busProcessNewNext); } }else { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见"); - busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class)); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 43b29c29..efc95a86 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -10,6 +10,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.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_slrs.dao.SarFileSplitInfoEO; import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard; import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems; import com.ydw.bat.wkflow.util.SpringContextUtil; @@ -82,6 +83,12 @@ public class DeptApplayAfter implements TaskListener{ standard.setInterpretationTime(delegateTask.getCreateTime()); standards.add(standard); }); + //标准状态修改 + SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); + sarFileSplitInfoEO.setSplitStatus("4"); + sarFileSplitInfoEO.setId(delegateTask.getVariable("statusId",String.class)); + lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO); + lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); } else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index f962768e..6a754cb2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSON; 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.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.SarFileSplitInfoEO; import com.ydw.bat.wkflow.listener.standardRead.vo.JSONArrayVo; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; @@ -28,6 +30,7 @@ public class ResolveAfter 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()); @@ -47,6 +50,12 @@ public class ResolveAfter implements TaskListener{ // 配置多实例 delegateTask.setVariable("zrUserList", nextUserList); + SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); + sarFileSplitInfoEO.setSplitStatus("3"); + sarFileSplitInfoEO.setId(object.getString("statusId")); + delegateTask.setVariable("statusId",object.getString("statusId")); + lawsUserInfoService.updateSarFileSplitInfo(sarFileSplitInfoEO); + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId");