add 年度制修订计划流程 基础代码
This commit is contained in:
lijiarao
+18
-18
@@ -6,32 +6,32 @@ package com.jero.modules.activiti.process.annualinit.common;
|
||||
*/
|
||||
public class ProcessAnnualInitCommon {
|
||||
//起草人发起
|
||||
public static String QCRFQ = "qcrfq";
|
||||
//法规部门经理审批
|
||||
public static String FGBMJLSP = "fgbmjlsp";
|
||||
public static final String QCRFQ = "qcrfq";
|
||||
//部门经理审批
|
||||
public static String BMJLSP = "bmjlsp";
|
||||
public static final String BMJLSP = "bmjlsp";
|
||||
//法规部门处理人审批
|
||||
public static String FGBMCLRSP = "fgbmclrsp";
|
||||
//授权人审批
|
||||
public static String SQRSP = "sqrsp";
|
||||
public static final String FGBMCLRSP = "fgbmclrsp";
|
||||
//法规部门经理审批
|
||||
public static final String FGBMJLSP = "fgbmjlsp";
|
||||
//高级经理审批
|
||||
public static String GJJLSP = "gjjlsp";
|
||||
public static final String GJJLSP = "gjjlsp";
|
||||
//总监审批
|
||||
public static String ZJSP = "zjsp";
|
||||
public static final String ZJSP = "zjsp";
|
||||
//授权人审批
|
||||
public static final String SQRSP = "sqrsp";
|
||||
//起草人
|
||||
public static String MAIN_DRAFTING_USER = "mainDraftingUser";
|
||||
//法规部门经理
|
||||
public static String STANDARD_DEPART_MANAGER = "standardDepartManager";
|
||||
public static final String MAIN_DRAFTING_USER = "mainDraftingUser";
|
||||
//部门经理
|
||||
public static String DEPART_MANAGER_LIST = "departManagerList";
|
||||
public static final String DEPART_MANAGER_LIST = "departManagerList";
|
||||
//法规部门处理人
|
||||
public static String STANDARD_DEPART_HANDLER = "standardDepartHandler";
|
||||
//授权人
|
||||
public static String AUTHORIZED_PERSON_LIST = "authorizedPersonList";
|
||||
public static final String STANDARD_DEPART_HANDLER = "standardDepartHandler";
|
||||
//法规部门经理
|
||||
public static final String STANDARD_DEPART_MANAGER = "standardDepartManager";
|
||||
//高级经理
|
||||
public static String SENIOR_MANAGER_LIST = "seniorManagerList";
|
||||
public static final String SENIOR_MANAGER_LIST = "seniorManagerList";
|
||||
//总监
|
||||
public static String CHIEF_INSPECTOR_LIST = "chiefInspectorList";
|
||||
public static final String CHIEF_INSPECTOR_LIST = "chiefInspectorList";
|
||||
//授权人
|
||||
public static final String AUTHORIZED_PERSON_LIST = "authorizedPersonList";
|
||||
|
||||
}
|
||||
|
||||
+4
-3
@@ -5,6 +5,7 @@ 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.annualinit.vo.ProcessAnnualInitVO;
|
||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -38,7 +39,7 @@ public class ProcessAnnualInitController extends JeroController<ProcessAnnualIni
|
||||
@AutoLog(value = "年度制修订计划流程-发起流程")
|
||||
@ApiOperation(value = "年度制修订计划流程-发起流程")
|
||||
@PostMapping(value = "/startProcess")
|
||||
public Result<T> startProcess(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInit> processInfoVO) {
|
||||
public Result<T> startProcess(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
||||
processAnnualInitService.startProcess(processInfoVO);
|
||||
return Result.OK();
|
||||
}
|
||||
@@ -46,7 +47,7 @@ public class ProcessAnnualInitController extends JeroController<ProcessAnnualIni
|
||||
@AutoLog(value = "年度制修订计划流程-同意")
|
||||
@ApiOperation(value = "年度制修订计划流程-同意")
|
||||
@PostMapping("/agree")
|
||||
public Result<T> agree(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInit> processInfoVO) {
|
||||
public Result<T> agree(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
||||
processAnnualInitService.approveTask(processInfoVO, true);
|
||||
return Result.OK();
|
||||
}
|
||||
@@ -54,7 +55,7 @@ public class ProcessAnnualInitController extends JeroController<ProcessAnnualIni
|
||||
@AutoLog(value = "年度制修订计划流程-驳回")
|
||||
@ApiOperation(value = "年度制修订计划流程-驳回")
|
||||
@PostMapping("/reject")
|
||||
public Result<T> reject(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInit> processInfoVO) {
|
||||
public Result<T> reject(@Validated @RequestBody ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
||||
processAnnualInitService.approveTask(processInfoVO, false);
|
||||
return Result.OK();
|
||||
}
|
||||
|
||||
+185
@@ -0,0 +1,185 @@
|
||||
package com.jero.modules.activiti.process.annualinit.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.aspect.annotation.DictPoint;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink;
|
||||
import com.jero.modules.activiti.process.annualinit.service.ProcessAnnualInitLinkService;
|
||||
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
||||
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 年度制修订计划流程关联标准(ProcessAnnualInitLink)表控制层
|
||||
*
|
||||
* @author lijiarao
|
||||
* @since 2024-09-25 14:52:55
|
||||
*/
|
||||
@Slf4j
|
||||
@Api(tags = "年度制修订计划流程关联标准")
|
||||
@RestController
|
||||
@RequestMapping("processAnnualInitLink")
|
||||
public class ProcessAnnualInitLinkController extends JeroController<ProcessAnnualInitLink, ProcessAnnualInitLinkService> {
|
||||
/**
|
||||
* 服务对象
|
||||
*/
|
||||
@Resource
|
||||
private ProcessAnnualInitLinkService processAnnualInitLinkService;
|
||||
@Resource
|
||||
private ILawsEnterpriseStandardService enterpriseStandardService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<IPage<ProcessAnnualInitLink>> queryPageList(ProcessAnnualInitLink processAnnualInitLink,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
Page<ProcessAnnualInitLink> page = new Page<>(pageNo, pageSize);
|
||||
IPage<ProcessAnnualInitLink> pageList = processAnnualInitLinkService.pageList(page, processAnnualInitLink, req);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-列表查询", notes = "年度制修订计划流程关联标准-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<ProcessAnnualInitLink>> queryList(ProcessAnnualInitLink processAnnualInitLink,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<ProcessAnnualInitLink> queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap());
|
||||
List<ProcessAnnualInitLink> list = processAnnualInitLinkService.list(queryWrapper);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@AutoLog(value = "年度制修订计划流程关联标准-添加")
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-添加", notes = "年度制修订计划流程关联标准-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@Validated @RequestBody ProcessAnnualInitLink processAnnualInitLink) {
|
||||
processAnnualInitLinkService.add(processAnnualInitLink);
|
||||
return Result.OK(ResultCommon.OK);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@AutoLog(value = "年度制修订计划流程关联标准-编辑")
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-编辑", notes = "年度制修订计划流程关联标准-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<String> edit(@Validated @RequestBody ProcessAnnualInitLink processAnnualInitLink) {
|
||||
processAnnualInitLinkService.editById(processAnnualInitLink);
|
||||
return Result.OK(ResultCommon.EDIT_OK);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@AutoLog(value = "年度制修订计划流程关联标准-通过id删除")
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-通过id删除", notes = "年度制修订计划流程关联标准-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if (StringUtils.isBlank(id)) {
|
||||
return Result.error("请选择数据");
|
||||
}
|
||||
processAnnualInitLinkService.deleteById(id);
|
||||
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@AutoLog(value = "年度制修订计划流程关联标准-批量删除")
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-批量删除", notes = "年度制修订计划流程关联标准-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if (StringUtils.isBlank(ids)) {
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
List<String> idList = Arrays.asList(map.getIds().split(","));
|
||||
this.processAnnualInitLinkService.deleteByIds(idList);
|
||||
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@AutoLog(value = "年度制修订计划流程关联标准-通过id查询")
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-通过id查询", notes = "年度制修订计划流程关联标准-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ProcessAnnualInitLink> queryById(@RequestParam(name = "id") String id) {
|
||||
ProcessAnnualInitLink processAnnualInitLink = processAnnualInitLinkService.queryById(id);
|
||||
if (processAnnualInitLink == null) {
|
||||
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
|
||||
}
|
||||
return Result.OK(processAnnualInitLink);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-导出excel")
|
||||
@GetMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest req, ProcessAnnualInitLink processAnnualInitLink) {
|
||||
Page<ProcessAnnualInitLink> page = new Page<>(-1, -1);
|
||||
IPage<ProcessAnnualInitLink> pageList = processAnnualInitLinkService.pageList(page, processAnnualInitLink, req);
|
||||
// 获取数据
|
||||
List<ProcessAnnualInitLink> records = pageList.getRecords();
|
||||
return super.exportListXls(records, ProcessAnnualInitLink.class, "年度制修订计划流程关联标准");
|
||||
}
|
||||
|
||||
/**
|
||||
* 下载导入模板
|
||||
*/
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-下载导入模板")
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
public ModelAndView exportTemplate(HttpServletRequest req, ProcessAnnualInitLink processAnnualInitLink) {
|
||||
List<ProcessAnnualInitLink> records = new ArrayList<>();
|
||||
return super.exportListXls(records, ProcessAnnualInitLink.class, "年度制修订计划流程关联标准");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
@DictPoint
|
||||
@ApiOperation(value = "年度制修订计划流程关联标准-通过excel导入数据")
|
||||
@PostMapping(value = "/importExcel")
|
||||
public Result<List<ProcessAnnualInitLink>> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
List<ProcessAnnualInitLink> excelData = super.getExcelData(request, ProcessAnnualInitLink.class);
|
||||
for (ProcessAnnualInitLink excelDatum : excelData) {
|
||||
String standardNumber = excelDatum.getStandardNumber();
|
||||
LawsEnterpriseStandard lawsEnterpriseStandard = enterpriseStandardService.queryByStandardNumber(standardNumber);
|
||||
excelDatum.setStandardId(lawsEnterpriseStandard.getId());
|
||||
}
|
||||
return Result.OK(excelData);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+8
-6
@@ -6,6 +6,7 @@ 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 com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
@@ -37,19 +38,18 @@ public class ProcessAnnualInitLink implements Serializable {
|
||||
* 流程主表id
|
||||
*/
|
||||
@ApiModelProperty(value = "流程主表id")
|
||||
@Excel(name = "流程主表id", width = 15)
|
||||
private String processId;
|
||||
/**
|
||||
* 制修订类别
|
||||
*/
|
||||
@ApiModelProperty(value = "制修订类别")
|
||||
@Excel(name = "制修订类别", width = 15)
|
||||
@Excel(name = "制修订类别", width = 15, dicCode = "esp_revision_type")
|
||||
@Dict(dicCode = "esp_revision_type")
|
||||
private String revisionType;
|
||||
/**
|
||||
* 标准id
|
||||
*/
|
||||
@ApiModelProperty(value = "标准id")
|
||||
@Excel(name = "标准id", width = 15)
|
||||
private String standardId;
|
||||
/**
|
||||
* 标准编号
|
||||
@@ -73,13 +73,14 @@ public class ProcessAnnualInitLink implements Serializable {
|
||||
* 所在部门id
|
||||
*/
|
||||
@ApiModelProperty(value = "所在部门id")
|
||||
@Excel(name = "所在部门id", width = 15)
|
||||
@Excel(name = "所在部门", width = 15)
|
||||
private String departId;
|
||||
/**
|
||||
* 专业模块
|
||||
*/
|
||||
@ApiModelProperty(value = "专业模块")
|
||||
@Excel(name = "专业模块", width = 15)
|
||||
@Excel(name = "专业模块", width = 15, dicCode = "professional_module")
|
||||
@Dict(dicCode = "professional_module")
|
||||
private String professionalModule;
|
||||
/**
|
||||
* 初稿完成日期
|
||||
@@ -101,7 +102,8 @@ public class ProcessAnnualInitLink implements Serializable {
|
||||
* 是否有英文版
|
||||
*/
|
||||
@ApiModelProperty(value = "是否有英文版")
|
||||
@Excel(name = "是否有英文版", width = 15)
|
||||
@Excel(name = "是否有英文版", width = 15, dicCode = "yn")
|
||||
@Dict(dicCode = "yn")
|
||||
private String haveEnglishVersion;
|
||||
/**
|
||||
* 所属技术委员会
|
||||
|
||||
+173
-47
@@ -1,13 +1,17 @@
|
||||
package com.jero.modules.activiti.process.annualinit.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.modules.activiti.common.ActivitiCommon;
|
||||
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.entity.ProcessAnnualInitLink;
|
||||
import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitMapper;
|
||||
import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitVO;
|
||||
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;
|
||||
@@ -17,23 +21,13 @@ 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 lombok.extern.slf4j.Slf4j;
|
||||
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;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 年度制修订计划流程(ProcessAnnualInit)表服务实现类
|
||||
@@ -54,34 +48,41 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
|
||||
private ProcessAllService processAllService;
|
||||
@Resource
|
||||
private TaskService taskService;
|
||||
@Resource
|
||||
private ProcessAnnualInitLinkService annualInitLinkService;
|
||||
|
||||
public void startProcess(ProcessInfoVO<ProcessAnnualInit> processInfoVO) {
|
||||
public void startProcess(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
||||
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
||||
ProcessAnnualInit businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||
//this.save(processAnnualInit);
|
||||
//String processAnnualInitId = processAnnualInit.getId();
|
||||
//processInfoVO.setBusinessId(processAnnualInitId);
|
||||
|
||||
ProcessAnnualInitVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||
ProcessAnnualInit annualInit = businessInfoDTO.getAnnualInit();
|
||||
this.saveOrUpdate(annualInit);
|
||||
String annualInitId = annualInit.getId();
|
||||
List<ProcessAnnualInitLink> annualInitLinkList = businessInfoDTO.getAnnualInitLinkList();
|
||||
for (ProcessAnnualInitLink link : annualInitLinkList) {
|
||||
link.setProcessId(annualInitId);
|
||||
}
|
||||
annualInitLinkService.saveOrUpdateBatch(annualInitLinkList);
|
||||
processInfoVO.setBusinessId(annualInitId);
|
||||
|
||||
//启动流程
|
||||
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);
|
||||
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));
|
||||
processHandleService.saveToDraft(processInfoVO, CurrentUserUtil.getId());
|
||||
//end 保存初始草稿结束
|
||||
//保存快照 start
|
||||
processHandleService.saveToSnapshot(processInfoVO, CurrentUserUtil.getId());
|
||||
//保存快照 end
|
||||
}
|
||||
|
||||
public void approveTask(ProcessInfoVO<ProcessAnnualInit> processInfoVO, boolean pass) {
|
||||
public void approveTask(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, boolean pass) {
|
||||
BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
|
||||
String taskId = basicTaskInfoDTO.getTaskId();
|
||||
ProcessDTO processDTO = processHandleService.getProcessDTO(taskId);
|
||||
@@ -91,37 +92,162 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
|
||||
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:
|
||||
//}
|
||||
|
||||
|
||||
switch (taskDefinitionKey) {
|
||||
//部门经理审批
|
||||
case ProcessAnnualInitCommon.BMJLSP:
|
||||
bmjlspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
//法规部门处理人审批
|
||||
case ProcessAnnualInitCommon.FGBMCLRSP:
|
||||
fgbmclrspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
//法规部门经理审批
|
||||
case ProcessAnnualInitCommon.FGBMJLSP:
|
||||
fgbmjlspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
//高级经理审批
|
||||
case ProcessAnnualInitCommon.GJJLSP:
|
||||
gjjlspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
//总监审批
|
||||
case ProcessAnnualInitCommon.ZJSP:
|
||||
zjspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
//授权人审批
|
||||
case ProcessAnnualInitCommon.SQRSP:
|
||||
sqrspApprove(processInfoVO, processDTO, pass);
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
|
||||
private void zgjldspApprove(ProcessInfoVO<ProcessAnnualInit> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
private void bmjlspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
|
||||
// 完成任务
|
||||
Map<String, Object> 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<ProcessProjectNotMet> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
// updateWrapper.eq(ProcessProjectNotMet::getId,businessId);
|
||||
// updateWrapper.set(ProcessProjectNotMet::getManagerLeaderId,userId);
|
||||
// update(updateWrapper);
|
||||
//}
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
variables.put(ProcessAnnualInitCommon.STANDARD_DEPART_HANDLER, annualInit.getStandardDepartHandler());
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
String departManager = annualInit.getDepartManager();
|
||||
String userIdList = departManager.replaceAll(originUserId, userId);
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getDepartManager, userIdList);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
private void fgbmclrspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
// 完成任务
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
variables.put(ProcessAnnualInitCommon.STANDARD_DEPART_MANAGER, annualInit.getStandardDepartManager());
|
||||
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getStandardDepartHandler, userId);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
private void fgbmjlspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
|
||||
// 完成任务
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
variables.put(ProcessAnnualInitCommon.SENIOR_MANAGER_LIST, Arrays.asList(annualInit.getSeniorManager().split(",")));
|
||||
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getStandardDepartManager, userId);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
private void gjjlspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
|
||||
// 完成任务
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
variables.put(ProcessAnnualInitCommon.CHIEF_INSPECTOR_LIST, Arrays.asList(annualInit.getChiefInspector().split(",")));
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
String departManager = annualInit.getSeniorManager();
|
||||
String userIdList = departManager.replaceAll(originUserId, userId);
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getSeniorManager, userIdList);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
private void zjspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
|
||||
// 完成任务
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
variables.put(ProcessAnnualInitCommon.AUTHORIZED_PERSON_LIST, Arrays.asList(annualInit.getSeniorManager().split(",")));
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
String departManager = annualInit.getChiefInspector();
|
||||
String userIdList = departManager.replaceAll(originUserId, userId);
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getChiefInspector, userIdList);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
private void sqrspApprove(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
|
||||
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||
String originUserId = processApprovalRecord.getOriginUserId();
|
||||
String userId = CurrentUserUtil.getId();
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessAnnualInit annualInit = this.getById(businessId);
|
||||
|
||||
// 完成任务
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put(ActivitiCommon.PASS, pass);
|
||||
taskService.complete(processDTO.getTaskId(), variables);
|
||||
if (!Objects.equals(userId, originUserId)) {
|
||||
String departManager = annualInit.getAuthorizedPerson();
|
||||
String userIdList = departManager.replaceAll(originUserId, userId);
|
||||
LambdaUpdateWrapper<ProcessAnnualInit> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(ProcessAnnualInit::getId, businessId);
|
||||
updateWrapper.set(ProcessAnnualInit::getAuthorizedPerson, userIdList);
|
||||
update(updateWrapper);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.jero.modules.activiti.process.annualinit.vo;
|
||||
|
||||
import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInit;
|
||||
import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author liJiaRao
|
||||
* @date 2024-09-25 13:51
|
||||
*/
|
||||
@Data
|
||||
public class ProcessAnnualInitVO {
|
||||
|
||||
@ApiModelProperty(value = "流程主表信息")
|
||||
private ProcessAnnualInit annualInit;
|
||||
@ApiModelProperty(value = "关联标准信息")
|
||||
private List<ProcessAnnualInitLink> annualInitLinkList;
|
||||
}
|
||||
Reference in New Issue
Block a user