diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java new file mode 100644 index 00000000..81483cef --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/common/ProcessAnnualInitCommon.java @@ -0,0 +1,37 @@ +package com.jero.modules.activiti.process.annualinit.common; + +/** + * @author liJiaRao + * @date 2024-09-24 15:10 + */ +public class ProcessAnnualInitCommon { + //起草人发起 + public static String QCRFQ = "qcrfq"; + //法规部门经理审批 + public static String FGBMJLSP = "fgbmjlsp"; + //部门经理审批 + public static String BMJLSP = "bmjlsp"; + //法规部门处理人审批 + public static String FGBMCLRSP = "fgbmclrsp"; + //授权人审批 + public static String SQRSP = "sqrsp"; + //高级经理审批 + public static String GJJLSP = "gjjlsp"; + //总监审批 + public static String ZJSP = "zjsp"; + //起草人 + public static String MAIN_DRAFTING_USER = "mainDraftingUser"; + //法规部门经理 + public static String STANDARD_DEPART_MANAGER = "standardDepartManager"; + //部门经理 + public static String DEPART_MANAGER_LIST = "departManagerList"; + //法规部门处理人 + public static String STANDARD_DEPART_HANDLER = "standardDepartHandler"; + //授权人 + public static String AUTHORIZED_PERSON_LIST = "authorizedPersonList"; + //高级经理 + public static String SENIOR_MANAGER_LIST = "seniorManagerList"; + //总监 + public static String CHIEF_INSPECTOR_LIST = "chiefInspectorList"; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/controller/ProcessAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/controller/ProcessAnnualInitController.java new file mode 100644 index 00000000..154c6f99 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/controller/ProcessAnnualInitController.java @@ -0,0 +1,64 @@ +package com.jero.modules.activiti.process.annualinit.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInit; +import com.jero.modules.activiti.process.annualinit.service.ProcessAnnualInitService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 年度制修订计划流程(ProcessAnnualInit)表控制层 + * + * @author lijiarao + * @since 2024-09-24 14:13:42 + */ +@Slf4j +@Api(tags = "年度制修订计划流程") +@RestController +@RequestMapping("/process/processAnnualInit") +public class ProcessAnnualInitController extends JeroController { + /** + * 服务对象 + */ + @Resource + private ProcessAnnualInitService processAnnualInitService; + + @AutoLog(value = "年度制修订计划流程-发起流程") + @ApiOperation(value = "年度制修订计划流程-发起流程") + @PostMapping(value = "/startProcess") + public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processAnnualInitService.startProcess(processInfoVO); + return Result.OK(); + } + + @AutoLog(value = "年度制修订计划流程-同意") + @ApiOperation(value = "年度制修订计划流程-同意") + @PostMapping("/agree") + public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processAnnualInitService.approveTask(processInfoVO, true); + return Result.OK(); + } + + @AutoLog(value = "年度制修订计划流程-驳回") + @ApiOperation(value = "年度制修订计划流程-驳回") + @PostMapping("/reject") + public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processAnnualInitService.approveTask(processInfoVO, false); + return Result.OK(); + } + + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInit.java new file mode 100644 index 00000000..059fde48 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInit.java @@ -0,0 +1,116 @@ +package com.jero.modules.activiti.process.annualinit.entity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +import lombok.Data; +import io.swagger.annotations.ApiModel; + +/** + * 年度制修订计划流程(ProcessAnnualInit)实体类 + * + * @author lijiarao + * @since 2024-09-24 14:13:42 + */ +@Data +@TableName("process_annual_init") +@ApiModel(value = "ProcessAnnualInit", description = "年度制修订计划流程") +public class ProcessAnnualInit implements Serializable { + private static final long serialVersionUID = -24249950589081692L; + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private String id; + /** + * 部门经理 + */ + @ApiModelProperty(value = "部门经理") + @Excel(name = "部门经理", width = 15) + private String departManager; + /** + * 法规部门处理人id + */ + @ApiModelProperty(value = "法规部门处理人id") + @Excel(name = "法规部门处理人id", width = 15) + private String standardDepartHandler; + /** + * 法规部门经理id + */ + @ApiModelProperty(value = "法规部门经理id") + @Excel(name = "法规部门经理id", width = 15) + private String standardDepartManager; + /** + * 高级经理 + */ + @ApiModelProperty(value = "高级经理") + @Excel(name = "高级经理", width = 15) + private String seniorManager; + /** + * 总监 + */ + @ApiModelProperty(value = "总监") + @Excel(name = "总监", width = 15) + private String chiefInspector; + /** + * 授权人id + */ + @ApiModelProperty(value = "授权人id") + @Excel(name = "授权人id", width = 15) + private String authorizedPerson; + /** + * 附件 + */ + @ApiModelProperty(value = "附件") + @Excel(name = "附件", width = 15) + private String file; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String orgCode; + /** + * 删除状态(0-正常,1-删除) + */ + @ApiModelProperty(value = "删除状态(0-正常,1-删除)") + @TableLogic + private String delFlag; + + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java new file mode 100644 index 00000000..de531b10 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/entity/ProcessAnnualInitLink.java @@ -0,0 +1,150 @@ +package com.jero.modules.activiti.process.annualinit.entity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +import lombok.Data; +import io.swagger.annotations.ApiModel; + +/** + * 年度制修订计划流程关联标准(ProcessAnnualInitLink)实体类 + * + * @author lijiarao + * @since 2024-09-24 14:30:21 + */ +@Data +@TableName("process_annual_init_link") +@ApiModel(value = "ProcessAnnualInitLink", description = "年度制修订计划流程关联标准") +public class ProcessAnnualInitLink implements Serializable { + private static final long serialVersionUID = 647513571439825961L; + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private String id; + /** + * 流程主表id + */ + @ApiModelProperty(value = "流程主表id") + @Excel(name = "流程主表id", width = 15) + private String processId; + /** + * 制修订类别 + */ + @ApiModelProperty(value = "制修订类别") + @Excel(name = "制修订类别", width = 15) + private String revisionType; + /** + * 标准id + */ + @ApiModelProperty(value = "标准id") + @Excel(name = "标准id", width = 15) + private String standardId; + /** + * 标准编号 + */ + @ApiModelProperty(value = "标准编号") + @Excel(name = "标准编号", width = 15) + private String standardNumber; + /** + * 标准名称 + */ + @ApiModelProperty(value = "标准名称") + @Excel(name = "标准名称", width = 15) + private String standardName; + /** + * 起草人 + */ + @ApiModelProperty(value = "起草人") + @Excel(name = "起草人", width = 15) + private String mainDraftingUser; + /** + * 所在部门id + */ + @ApiModelProperty(value = "所在部门id") + @Excel(name = "所在部门id", width = 15) + private String departId; + /** + * 专业模块 + */ + @ApiModelProperty(value = "专业模块") + @Excel(name = "专业模块", width = 15) + private String professionalModule; + /** + * 初稿完成日期 + */ + @ApiModelProperty(value = "初稿完成日期") + @Excel(name = "初稿完成日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date draftCompleteDate; + /** + * 计划归档日期 + */ + @ApiModelProperty(value = "计划归档日期") + @Excel(name = "计划归档日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date planArchivingDate; + /** + * 是否有英文版 + */ + @ApiModelProperty(value = "是否有英文版") + @Excel(name = "是否有英文版", width = 15) + private String haveEnglishVersion; + /** + * 所属技术委员会 + */ + @ApiModelProperty(value = "所属技术委员会") + @Excel(name = "所属技术委员会", width = 15) + private String committee; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String orgCode; + /** + * 删除状态(0-正常,1-删除) + */ + @ApiModelProperty(value = "删除状态(0-正常,1-删除)") + @TableLogic + private Integer delFlag; + + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitLinkMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitLinkMapper.java new file mode 100644 index 00000000..f4a766d6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitLinkMapper.java @@ -0,0 +1,15 @@ +package com.jero.modules.activiti.process.annualinit.mapper; + +import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 年度制修订计划流程关联标准(ProcessAnnualInitLink)表数据库访问层 + * + * @author lijiarao + * @since 2024-09-24 14:30:21 + */ +public interface ProcessAnnualInitLinkMapper extends BaseMapper { + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitMapper.java new file mode 100644 index 00000000..4337a1ec --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/ProcessAnnualInitMapper.java @@ -0,0 +1,15 @@ +package com.jero.modules.activiti.process.annualinit.mapper; + +import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInit; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 年度制修订计划流程(ProcessAnnualInit)表数据库访问层 + * + * @author lijiarao + * @since 2024-09-24 14:13:42 + */ +public interface ProcessAnnualInitMapper extends BaseMapper { + +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitLinkMapper.xml new file mode 100644 index 00000000..6842b580 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitLinkMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, + process_id, + revision_type, + standard_id, + standard_number, + standard_name, + main_drafting_user, + depart_id, + professional_module, + draft_complete_date, + plan_archiving_date, + have_english_version, + committee, + create_by, + create_time, + update_by, + update_time, + org_code, + del_flag + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitMapper.xml new file mode 100644 index 00000000..d3659b7f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/mapper/xml/ProcessAnnualInitMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + id, + depart_manager, + standard_depart_handler, + standard_depart_manager, + senior_manager, + chief_inspector, + authorized_person, + file, + create_by, + create_time, + update_by, + update_time, + org_code, + del_flag + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java new file mode 100644 index 00000000..fcb5ccc6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java @@ -0,0 +1,59 @@ +package com.jero.modules.activiti.process.annualinit.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink; +import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitLinkMapper; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import lombok.extern.slf4j.Slf4j; + +import java.util.List; + +/** + * 年度制修订计划流程关联标准(ProcessAnnualInitLink)表服务实现类 + * + * @author lijiarao + * @since 2024-09-24 14:30:22 + */ +@Slf4j +@Service() +public class ProcessAnnualInitLinkService extends ServiceImpl { + @Resource + private ProcessAnnualInitLinkMapper processAnnualInitLinkMapper; + + public IPage pageList(Page page, ProcessAnnualInitLink processAnnualInitLink, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap()); + return this.page(page, queryWrapper); + } + + public void add(ProcessAnnualInitLink processAnnualInitLink) { + this.save(processAnnualInitLink); + } + + public void editById(ProcessAnnualInitLink processAnnualInitLink) { + this.updateById(processAnnualInitLink); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public ProcessAnnualInitLink queryById(String id) { + ProcessAnnualInitLink processAnnualInitLink = this.getById(id); + return processAnnualInitLink; + } +} + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java new file mode 100644 index 00000000..c60756f5 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java @@ -0,0 +1,128 @@ +package com.jero.modules.activiti.process.annualinit.service; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.annualinit.common.ProcessAnnualInitCommon; +import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInit; +import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitMapper; +import com.jero.modules.activiti.process.common.common.DraftCommon; +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.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; +import com.jero.modules.activiti.service.ProcessAllService; +import com.jero.modules.laws.common.util.CurrentUserUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.task.Task; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import lombok.extern.slf4j.Slf4j; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 年度制修订计划流程(ProcessAnnualInit)表服务实现类 + * + * @author lijiarao + * @since 2024-09-24 14:13:43 + */ +@Slf4j +@Service() +public class ProcessAnnualInitService extends ServiceImpl { + @Resource + private ProcessAnnualInitMapper processAnnualInitMapper; + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private IProcessHandleService processHandleService; + @Resource + private ProcessAllService processAllService; + @Resource + private TaskService taskService; + + public void startProcess(ProcessInfoVO processInfoVO) { + Map userInfoMap = processInfoVO.getUserInfoMap(); + ProcessAnnualInit businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + //this.save(processAnnualInit); + //String processAnnualInitId = processAnnualInit.getId(); + //processInfoVO.setBusinessId(processAnnualInitId); + + + //启动流程 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + //改为手动流程名称 + //basicProcessInfoDTO.setProcessName(standardNumber+"-"+standardName+"未符合项跟踪"); + basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.ANNUAL_INIT)); // 流程定义id + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.ANNUAL_INIT.getValue()); // 流程类型 + userInfoMap.put(ProcessAnnualInitCommon.MAIN_DRAFTING_USER, CurrentUserUtil.getId()); + //processInfoVO.setUserInfoMap(userInfoMap); + processHandleService.startProcess(processInfoVO); + //保存快照 start + processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId()); + //保存快照 end + //start 先保存一份初始草稿 + processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); + processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null)); + //end 保存初始草稿结束 + } + + public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { + BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); + String taskId = basicTaskInfoDTO.getTaskId(); + ProcessDTO processDTO = processHandleService.getProcessDTO(taskId); + String processInstanceId = processDTO.getProcessInstanceId(); + ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); + processInfoVO.setBusinessId(processAll.getProjectId()); + Task task = processDTO.getTask(); + String taskDefinitionKey = task.getTaskDefinitionKey(); + processHandleService.updateApprovalRecord(processInfoVO); + //switch (taskDefinitionKey) { + // //主管级领导审批 + // case ProcessProjectNotMetCommon.ZGJLDSP: + // zgjldspApprove(processInfoVO, processDTO, pass); + // break; + // //法规工程师审批 + // case ProcessProjectNotMetCommon.FGGCSSP: + // fggcsspApprove(processInfoVO, processDTO, pass, processAll); + // break; + // default: + //} + + + } + + private void zgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + String userId = CurrentUserUtil.getId(); + String businessId = processInfoVO.getBusinessId(); + // 完成任务 + Map variables = new HashMap<>(); + //variables.put(ProcessProjectNotMetCommon.PASS, pass); + ////variables.put(ProcessProjectNotMetCommon.MANAGER_LEADER, userId); + //taskService.complete(processDTO.getTaskId(), variables); + //if (!Objects.equals(userId,originUserId)){ + // LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + // updateWrapper.eq(ProcessProjectNotMet::getId,businessId); + // updateWrapper.set(ProcessProjectNotMet::getManagerLeaderId,userId); + // update(updateWrapper); + //} + } +} + + diff --git a/laws-modules/src/main/resources/bpmn/企业标准年度制修订计划流程.bpmn b/laws-modules/src/main/resources/bpmn/企业标准年度制修订计划流程.bpmn new file mode 100644 index 00000000..3a09f540 --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/企业标准年度制修订计划流程.bpmn @@ -0,0 +1,313 @@ + + + + + Flow_0hrnklg + + + Flow_0hrnklg + Flow_1jzk2qn + Flow_1e2ecjo + Flow_1torqxs + Flow_04fjdt8 + Flow_0u3ivmh + Flow_11hc0o0 + Flow_0ndqyc9 + + + Flow_0eu6g3b + Flow_1uaygks + + + Flow_0r76okg + + + Flow_0ndqyc9 + Flow_1q5o6tr + + ${nrOfInstances == nrOfCompletedInstances || !pass} + + + + Flow_1ko64jc + Flow_0rn2xkx + + + Flow_0rn2xkx + Flow_0eu6g3b + Flow_1torqxs + + + Flow_1uaygks + Flow_0ame206 + Flow_1e2ecjo + + + + ${pass} + + + + ${pass} + + + ${!pass} + + + ${!pass} + + + + + + Flow_1q5o6tr + Flow_1ko64jc + Flow_1jzk2qn + + + + ${!pass} + + + Flow_0xhpgf5 + Flow_0j4zrgs + + ${nrOfInstances == nrOfCompletedInstances || !pass} + + + + Flow_0ame206 + Flow_0y6f9vg + + ${nrOfInstances == nrOfCompletedInstances || !pass} + + + + Flow_1uuss1x + Flow_0my3hgz + + ${nrOfInstances == nrOfCompletedInstances || !pass} + + + + Flow_0my3hgz + Flow_0xhpgf5 + Flow_0u3ivmh + + + Flow_0j4zrgs + Flow_0r76okg + Flow_11hc0o0 + + + Flow_0y6f9vg + Flow_1uuss1x + Flow_04fjdt8 + + + ${pass} + + + + + ${pass} + + + + ${pass} + + + ${!pass} + + + ${!pass} + + + ${!pass} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/laws-modules/src/main/resources/bpmn/流程图修改.txt b/laws-modules/src/main/resources/bpmn/流程图修改.txt new file mode 100644 index 00000000..801a8a89 --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/流程图修改.txt @@ -0,0 +1,3 @@ +第二行替换为： +第三行修改为：isExecutable="true" +camunda: 替换为 activiti: