diff --git a/db/20230905标准法规库.sql b/db/20230905标准法规库.sql index fbe37fa6..2545bb6a 100644 --- a/db/20230905标准法规库.sql +++ b/db/20230905标准法规库.sql @@ -436,8 +436,8 @@ CREATE TABLE `process_fb_consultation_user_link` alter table process_fb_consultation_user_link comment '标准征求意见流程-用户关联表'; -DROP TABLE IF EXISTS `process_fb_standard_consultation_list`; -CREATE TABLE `process_fb_standard_consultation_list` +DROP TABLE IF EXISTS `process_fb_consultation_list`; +CREATE TABLE `process_fb_consultation_list` ( `id` varchar(36) NOT NULL PRIMARY KEY COMMENT '主键ID', @@ -452,7 +452,7 @@ CREATE TABLE `process_fb_standard_consultation_list` `basis_description` varchar(500) COMMENT '依据描述', `basis_file` varchar(2000) COMMENT '依据材料' ) COMMENT = '标准征求意见流程-征求意见列表表'; -alter table process_fb_standard_consultation_list +alter table process_fb_consultation_list comment '标准征求意见流程-征求意见列表表'; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 3c71b1a9..027e8972 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.enums; import com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl; +import com.sun.tools.doclets.formats.html.resources.standard; import lombok.AllArgsConstructor; import lombok.Getter; @@ -13,6 +14,8 @@ import lombok.Getter; public enum ProcessTypeEnum { + FB_ENTRY_CHANGE("标准法规入库/变更流程",1, "com.jero.modules.activiti.process.fb.service.impl.ProcessHandleServiceImpl"), + FB_STANDARD_CONSULTATION("标准征求意见流程",2, "com.jero.modules.activiti.process.fb.service.impl.ProcessFbStandardConsultationServiceImpl"), ES_INIT_CHANGE("企标立项/变更计划",7, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"), ES_ANNUAL_REPORT("年度制修订计划审批流程(各部门主动上报)",8, "com.jero.modules.activiti.process.esAbolish.service.impl.ProcessEsAbolishServiceImpl"), ES_ANNUAL_INIT("年度制修订计划审批流程(标准化发起)",9, "com.jero.modules.activiti.process.esAnnualReport.service.impl.ProcessEsAnnualReportServiceImpl"), @@ -23,7 +26,6 @@ public enum ProcessTypeEnum { ES_ABOLISH("企标废止流程",13, "com.jero.modules.activiti.process.esAbolish.service.impl.ProcessEsAbolishServiceImpl"), ES_ARCHIVE("企标封存流程",14, "com.jero.modules.activiti.process.esArchive.service.impl.ProcessEsArchiveServiceImpl"), ES_ENABLE("已封存企标启用流程",15, "com.jero.modules.activiti.process.esEnable.service.impl.ProcessEsEnableServiceImpl"), - FB_ENTRY_CHANGE("标准法规入库/变更流程",16, "com.jero.modules.activiti.process.fb.service.impl.ProcessHandleServiceImpl"), ; private String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java index afe0b13e..148ac245 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java @@ -1,25 +1,12 @@ package com.jero.modules.activiti.process.fb.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; -import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicProcessInfoDTO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicProcessInfoDTO.java new file mode 100644 index 00000000..8693006f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicProcessInfoDTO.java @@ -0,0 +1,43 @@ +package com.jero.modules.activiti.process.fb.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * @Author: liao + * @Date: 2023/11/7 13:51 + * @Description: 基本流程信息 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="基本流程信息", description="基本流程信息") +public class BasicProcessInfoDTO { + /**流程定义id*/ + @ApiModelProperty(value = "流程定义id") + private java.lang.String processDefinitionId; + /**流程类型*/ + @ApiModelProperty(value="流程类型") + private Integer processType; + + /**流程实例id*/ + @ApiModelProperty(value = "流程实例id") + private java.lang.String processInstanceId; + /**流程信息-流程名称*/ + @ApiModelProperty(value = "流程信息-流程名称") + private java.lang.String processName; + /**流程信息-截止日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "流程信息-截止日期") + private java.util.Date processDueDate; + /**流程信息-流程说明*/ + @ApiModelProperty(value = "流程信息-流程说明") + private java.lang.String processDescription; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicTaskInfoDTO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicTaskInfoDTO.java new file mode 100644 index 00000000..fdcb6044 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/BasicTaskInfoDTO.java @@ -0,0 +1,42 @@ +package com.jero.modules.activiti.process.fb.dto; + +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Author: liao + * @Date: 2023/11/7 13:52 + * @Description: 基本任务信息 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="基本任务信息", description="基本任务信息") +public class BasicTaskInfoDTO { + /**任务id*/ + @ApiModelProperty(value = "任务id") + private java.lang.String taskId; + /**流程审批信息-备注*/ + @ApiModelProperty(value = "流程审批信息-备注") + private java.lang.String handleText; + /**流程审批信息-附件*/ + @ApiModelProperty(value = "流程审批信息-附件") + private java.lang.String handleFile; + + /** + * 审批意见(0同意,1不同意) + */ + @Dict(dicCode = "commit_flag") + @ApiModelProperty(value = "审批意见(1通过，2驳回)") + private Integer commitFlag; + /** + * 完成注记(0未完成,1完成) + */ + @Dict(dicCode = "prc_node_status") + @ApiModelProperty(value = "完成注记(1进行中,2已完成)") + private Integer finishFlag; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/ProcessDTO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/ProcessDTO.java index 8bfd603a..683ccfbd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/ProcessDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/dto/ProcessDTO.java @@ -1,7 +1,6 @@ package com.jero.modules.activiti.process.fb.dto; import lombok.Data; -import org.springframework.stereotype.Component; /** * @Author: liao diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultationList.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java similarity index 81% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultationList.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java index 36ab72ab..7733e88e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultationList.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java @@ -1,22 +1,16 @@ package com.jero.modules.activiti.process.fb.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** @@ -30,7 +24,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="process_fb_standard_consultation_list对象", description="标准征求意见流程-征求意见列表表") -public class ProcessFbStandardConsultationList implements Serializable { +public class ProcessFbConsultationList implements Serializable { private static final long serialVersionUID = 1L; /**主键ID*/ @@ -66,8 +60,8 @@ public class ProcessFbStandardConsultationList implements Serializable { @ApiModelProperty(value = "修改理由") private java.lang.String modificationReason; /**模块负责人意见（0不采纳，1采纳）*/ - @Excel(name = "模块负责人意见（0不采纳，1采纳）", width = 15) - @ApiModelProperty(value = "模块负责人意见（0不采纳，1采纳）") + @Excel(name = "模块负责人意见（1采纳，2部分采纳，3不采纳）", width = 15) + @ApiModelProperty(value = "模块负责人意见（1采纳，2部分采纳，3不采纳）") private java.lang.String isAdopt; /**依据描述*/ @Excel(name = "依据描述", width = 15) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java new file mode 100644 index 00000000..9ee07bbb --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbConsultationListMapper.java @@ -0,0 +1,14 @@ +package com.jero.modules.activiti.process.fb.mapper; + +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标准征求意见流程-征求意见列表表 + * @Author: jero-boot + * @Date: 2023-11-07 + * @Version: V1.0 + */ +public interface ProcessFbConsultationListMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationListMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationListMapper.java deleted file mode 100644 index 9eb52659..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationListMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultationList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface ProcessFbStandardConsultationListMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationListMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml similarity index 89% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationListMapper.xml rename to laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml index 3f9e15db..065f3829 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbStandardConsultationListMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationListMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java new file mode 100644 index 00000000..29d1eb2f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbConsultationListService.java @@ -0,0 +1,14 @@ +package com.jero.modules.activiti.process.fb.service; + +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 标准征求意见流程-征求意见列表表 + * @Author: jero-boot + * @Date: 2023-11-07 + * @Version: V1.0 + */ +public interface IProcessFbConsultationListService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationListService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationListService.java deleted file mode 100644 index ce1ebf27..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationListService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.modules.activiti.process.fb.service; - -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultationList; -import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -public interface IProcessFbStandardConsultationListService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java new file mode 100644 index 00000000..dad85cc2 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbConsultationListServiceImpl.java @@ -0,0 +1,22 @@ +package com.jero.modules.activiti.process.fb.service.impl; + +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; +import com.jero.modules.activiti.process.fb.mapper.ProcessFbConsultationListMapper; +import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationListService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jero.common.exception.JeroBootException; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + + +/** + * @Description: 标准征求意见流程-征求意见列表表 + * @Author: jero-boot + * @Date: 2023-11-07 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class ProcessFbConsultationListServiceImpl extends ServiceImpl implements IProcessFbConsultationListService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index a1ea99d2..f4d95316 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.fb.service.impl; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; +import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; @@ -98,9 +99,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 - processInfoVO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id - processInfoVO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称 - processInfoVO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id + basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称 + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型 processHandleService.startProcess(processInfoVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationListServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationListServiceImpl.java deleted file mode 100644 index e46c0f2d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationListServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.activiti.process.fb.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultationList; -import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardConsultationListMapper; -import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationListService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - - -/** - * @Description: 标准征求意见流程-征求意见列表表 - * @Author: jero-boot - * @Date: 2023-11-07 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class ProcessFbStandardConsultationListServiceImpl extends ServiceImpl implements IProcessFbStandardConsultationListService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 75a283c7..3ee67157 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -6,6 +6,8 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; +import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.dto.ProcessDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; @@ -61,14 +63,17 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { **/ @Override public void startProcess(ProcessInfoVO processInfoVO) { - String processDefinitionId = processInfoVO.getProcessDefinitionId(); // 流程定义id + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程信息 Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map + BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); // 流程审批信息 + + String processDefinitionId = basicProcessInfoDTO.getProcessDefinitionId(); // 流程定义id // 根据流程定义id和变量map启动流程 ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinitionId, userInfoMap); String processInstanceId = processInstance.getId(); // 流程实例id // 根据流程实例id更新流程总表 - processInfoVO.setProcessInstanceId(processInstanceId); + basicProcessInfoDTO.setProcessInstanceId(processInstanceId); updateProcessAll(processInfoVO); // 保存选人信息 @@ -82,8 +87,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { String taskId = task.getId(); // 更新审批记录 - processInfoVO.setTaskId(taskId); - processInfoVO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回) + basicTaskInfoDTO.setTaskId(taskId); + basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回) updateApprovalRecord(processInfoVO); // 完成任务 @@ -98,7 +103,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { @Override public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { // 判断是否是自己的任务 - String taskId = processInfoVO.getTaskId(); + BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); + String taskId = basicTaskInfoDTO.getTaskId(); isMyTask(taskId); ProcessDTO processDTO = getProcessDTO(taskId); String processInstanceId = processDTO.getProcessInstanceId(); @@ -111,10 +117,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { } if (pass) { // 通过 runtimeService.setVariableLocal(processInstanceId, "pass", true); - processInfoVO.setCommitFlag(CommitFlagEnum.PASS.getValue()); + basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); } else { // 驳回 runtimeService.setVariableLocal(processInstanceId, "pass", false); - processInfoVO.setCommitFlag(CommitFlagEnum.REJECT.getValue()); + basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.REJECT.getValue()); } // 更新审批记录表 updateApprovalRecord(processInfoVO); @@ -181,12 +187,13 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { **/ @Override public void updateProcessAll(ProcessInfoVO processInfoVO) { - ProcessAll process = processAllService.getByProcessInstanceId(processInfoVO.getProcessInstanceId()); + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + ProcessAll process = processAllService.getByProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); process.setCreateUserId(CurrentUserUtil.getId()); // 流程创建人 - process.setPrcName(processInfoVO.getProcessName()); // 流程名称 - process.setMes(processInfoVO.getProcessDescription()); // 流程说明 - process.setDueTime(processInfoVO.getProcessDueDate()); // 流程截止时间 - process.setPrcType(processInfoVO.getProcessType()); // 流程类型 + process.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 + process.setMes(basicProcessInfoDTO.getProcessDescription()); // 流程说明 + process.setDueTime(basicProcessInfoDTO.getProcessDueDate()); // 流程截止时间 + process.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 process.setProjectId(processInfoVO.getBusinessId()); // 业务id processAllService.updateById(process); } @@ -198,10 +205,11 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { **/ @Override public void updateApprovalRecord(ProcessInfoVO processInfoVO) { - ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(processInfoVO.getTaskId()); - approvalRecord.setCommitFlag(processInfoVO.getCommitFlag()); // 审批意见(1通过，2驳回) - approvalRecord.setCommitText(processInfoVO.getHandleText()); // 审批内容 - approvalRecord.setCommitFile(processInfoVO.getHandleFile()); // 审批附件 + BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); + ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(basicTaskInfoDTO.getTaskId()); + approvalRecord.setCommitFlag(basicTaskInfoDTO.getCommitFlag()); // 审批意见(1通过，2驳回) + approvalRecord.setCommitText(basicTaskInfoDTO.getHandleText()); // 审批内容 + approvalRecord.setCommitFile(basicTaskInfoDTO.getHandleFile()); // 审批附件 approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); // 完成注记(1进行中,2已完成) approvalRecord.setEndTime(new Date()); // 完成时间 processApprovalRecordService.updateById(approvalRecord); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java index a57bebc3..a3247d46 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java @@ -1,8 +1,9 @@ package com.jero.modules.activiti.process.fb.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; +import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,51 +23,13 @@ import java.util.Map; @EqualsAndHashCode(callSuper = false) @ApiModel(value="流程信息通用类", description="流程信息通用类") public class ProcessInfoVO { + /**流程信息*/ + @ApiModelProperty(value = "流程信息") + private BasicProcessInfoDTO basicProcessInfoDTO; - /**流程定义id*/ - @ApiModelProperty(value = "流程定义id") - private java.lang.String processDefinitionId; - /**流程实例id*/ - @ApiModelProperty(value = "流程实例id") - private java.lang.String processInstanceId; - /**流程类型*/ - @ApiModelProperty(value="流程类型") - private Integer processType; - - /**任务id*/ - @ApiModelProperty(value = "任务id") - private java.lang.String taskId; - /** - * 审批意见(0同意,1不同意) - */ - @Dict(dicCode = "commit_flag") - @ApiModelProperty(value = "审批意见(1通过，2驳回)") - private Integer commitFlag; - /** - * 完成注记(0未完成,1完成) - */ - @Dict(dicCode = "prc_node_status") - @ApiModelProperty(value = "完成注记(1进行中,2已完成)") - private Integer finishFlag; - - /**流程信息-流程名称*/ - @ApiModelProperty(value = "流程信息-流程名称") - private java.lang.String processName; - /**流程信息-截止日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "流程信息-截止日期") - private java.util.Date processDueDate; - /**流程信息-流程说明*/ - @ApiModelProperty(value = "流程信息-流程说明") - private java.lang.String processDescription; - - /**流程审批信息-备注*/ - @ApiModelProperty(value = "流程审批信息-备注") - private java.lang.String handleText; - /**流程审批信息-附件*/ - @ApiModelProperty(value = "流程审批信息-附件") - private java.lang.String handleFile; + /**流程审批信息*/ + @ApiModelProperty(value = "流程审批信息") + private BasicTaskInfoDTO basicTaskInfoDTO; /**业务id*/ @ApiModelProperty(value = "业务id") diff --git a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn new file mode 100644 index 00000000..3ff094cd --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn @@ -0,0 +1,309 @@ + + + + + Flow_1d5objw + + + Flow_1d5objw + Flow_0azsibi + + + + Flow_0azsibi + Flow_1aeqdsv + Flow_19vxot3 + + ${nrOfInstances== nrOfCompletedInstances} + + + Flow_1gv6jmb + + + Flow_1gv6jmb + Flow_0hpm8eq + + + + Flow_0hpm8eq + Flow_05oz1ja + Flow_1ezcutn + + + + Flow_05oz1ja + Flow_09jjte7 + + ${nrOfInstances== nrOfCompletedInstances} + + + + ${!passFirst} + + + Flow_0oc8671 + Flow_18olfei + + + + Flow_1ezcutn + Flow_0f48izh + Flow_0oc8671 + + ${nrOfInstances== nrOfCompletedInstances} + + + Flow_13krhma + + + Flow_13krhma + Flow_0e4x3wm + + + + Flow_0e4x3wm + Flow_0vnqotz + + ${nrOfInstances== nrOfCompletedInstances} + + + + + Flow_0vnqotz + Flow_05e6l5d + + + + Flow_05e6l5d + + + + + ${passFirst} + + + + Flow_18olfei + Flow_1t037bu + Flow_0f48izh + + + + Flow_1t037bu + Flow_0qai32h + + + ${passSecond} + + + ${!passSecond} + + + Flow_09jjte7 + Flow_0qai32h + + + + + + Flow_19vxot3 + Flow_1125yee + + + + Flow_1125yee + Flow_0sb0q1z + Flow_1aeqdsv + + + + Flow_0sb0q1z + + + ${passThird} + + + ${!passThird} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +