From 596e686df7da2135c8525ca68335248a8db6b761 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Dec 2023 09:51:09 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B8=BA=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/entity/ProcessDraft.java | 10 ++---- .../impl/ProcessHandleServiceImpl.java | 1 + .../activiti/process/fb/vo/ProcessInfoVO.java | 4 +++ .../ProcessProjectAssessController.java | 32 ++++++++++++------- .../service/ProcessProjectAssessService.java | 16 ++++++++++ 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java index 7bcddba0..938b323c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java @@ -116,13 +116,9 @@ public class ProcessDraft implements Serializable { @ApiModelProperty(value = "流程信息-流程说明") private java.lang.String processDescription; - /**基础信息json*/ - @ApiModelProperty(value = "基础信息json") - private String baseInfoJsonStr; - - /**人员信息json*/ - @ApiModelProperty(value = "人员信息json") - private String userInfoJsonStr; + /**草稿信息json字符串*/ + @ApiModelProperty(value = "草稿信息json字符串") + private String infoJsonStr; @TableField(exist = false) private static final long serialVersionUID = 1L; 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 585aefa1..1f6d1440 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 @@ -294,6 +294,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processDraft.setHandleText(basicTaskInfoDTO.getHandleText()); // 流程审批信息-备注 processDraft.setHandleFile(basicTaskInfoDTO.getHandleFile()); // 流程审批信息-附件 processDraft.setUserId(CurrentUserUtil.getId()); // 用户id + processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串 processDraftService.save(processDraft); } 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 e61389a9..bbb2d352 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 @@ -44,4 +44,8 @@ public class ProcessInfoVO implements Serializable { @ApiModelProperty(value = "人员信息") private Map userInfoMap; + /**草稿信息json字符串*/ + @ApiModelProperty(value = "草稿信息json字符串") + private String infoJsonStr; + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java index 6d9c347d..59579ec8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java @@ -63,55 +63,63 @@ public class ProcessProjectAssessController extends JeroController> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){ ProcessInfoVO processInfoVO = processProjectAssessService.queryProcessInfoVO(draftId, processInstanceId, taskId); return Result.OK(processInfoVO); } - @AutoLog(value = "标准征求意见流程-发起流程") - @ApiOperation(value = "标准征求意见流程-发起流程", notes = "标准征求意见流程-发起流程") + @AutoLog(value = "项目合规评估流程-发起流程") + @ApiOperation(value = "项目合规评估流程-发起流程", notes = "项目合规评估流程-发起流程") @PostMapping(value = "/startProcess") public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { processProjectAssessService.startProcess(processInfoVO); return Result.OK(); } - @AutoLog(value = "标准征求意见流程-同意") - @ApiOperation(value="标准征求意见流程-同意", notes="标准征求意见流程-同意") + @AutoLog(value = "项目合规评估流程-同意") + @ApiOperation(value="项目合规评估流程-同意", notes="项目合规评估流程-同意") @PostMapping("/agree") public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { processProjectAssessService.approveTask(processInfoVO, true); return Result.OK(); } - @AutoLog(value = "标准征求意见流程-驳回") - @ApiOperation(value="标准征求意见流程-驳回", notes="标准征求意见流程-驳回") + @AutoLog(value = "项目合规评估流程-驳回") + @ApiOperation(value="项目合规评估流程-驳回", notes="项目合规评估流程-驳回") @PostMapping("/reject") public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { processProjectAssessService.approveTask(processInfoVO, false); return Result.OK(); } - @AutoLog(value = "标准征求意见流程-提交") - @ApiOperation(value="标准征求意见流程-提交", notes="标准征求意见流程-提交") + @AutoLog(value = "项目合规评估流程-提交") + @ApiOperation(value="项目合规评估流程-提交", notes="项目合规评估流程-提交") @PostMapping("/submit") public Result submit(@Validated @RequestBody ProcessInfoVO processInfoVO) { processProjectAssessService.submit(processInfoVO); return Result.OK(); } + @AutoLog(value = "项目合规评估流程-保存为草稿") + @ApiOperation(value = "项目合规评估流程-保存为草稿", notes = "项目合规评估流程-保存为草稿") + @PostMapping(value = "/saveToDraft") + public Result saveToDraft(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processProjectAssessService.saveToDraft(processInfoVO); + return Result.OK(); + } + /** - * 标准征求意见流程-查询条款列表 + * 项目合规评估流程-查询条款列表 * @return */ - @ApiOperation(value = "标准征求意见流程-查询条款列表") + @ApiOperation(value = "项目合规评估流程-查询条款列表") @PostMapping("/processProjectAssessGetList") @ApiOperationSupport(order = 21) public Result> processProjectAssessGetList(@RequestBody List lawsAssessList) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 0e54e70d..89765d02 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -134,4 +134,20 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO) { } + + public void saveToDraft(ProcessInfoVO processInfoVO) { + ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + if (businessInfoDTO!=null){ + ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess(); + if (processProjectAssess!=null){ + processInfoVO.setBusinessId(processProjectAssess.getId()); + } + } + + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_ASSESS.getValue()); // 流程类型 + + processHandleService.saveToDraft(processInfoVO); + } }