ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 项目合规评估流程-保存为草稿

Browse Source
This commit is contained in:
lijiarao
2023-12-14 09:51:09 +08:00
parent 4753509c70
commit 596e686df7
5 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java
+3 -7
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+1
View File
@@ -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);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java
+4
View File
@@ -44,4 +44,8 @@ public class ProcessInfoVO<T> implements Serializable {
@ApiModelProperty(value = "人员信息")
private Map<String, Object> userInfoMap;
/**草稿信息json字符串*/
@ApiModelProperty(value = "草稿信息json字符串")
private String infoJsonStr;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java
+20 -12
View File
@@ -63,55 +63,63 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
@DictPoint
@GetMapping("/queryProcessInfoVO")
@AutoLog(value = "标准征求意见流程-查询流程信息")
@AutoLog(value = "项目合规评估流程-查询流程信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "draftId", value = "草稿id"),
@ApiImplicitParam(name = "taskId", value = "任务id"),
@ApiImplicitParam(name = "processInstanceId", value = "流程实例id")
})
@ApiOperation("标准征求意见流程-查询流程信息")
@ApiOperation("项目合规评估流程-查询流程信息")
public Result<ProcessInfoVO<ProcessProjectAssessVO>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){
ProcessInfoVO<ProcessProjectAssessVO> 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<T> startProcess(@Validated @RequestBody ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
processProjectAssessService.startProcess(processInfoVO);
return Result.OK();
}
@AutoLog(value = "标准征求意见流程-同意")
@ApiOperation(value="标准征求意见流程-同意", notes="标准征求意见流程-同意")
@AutoLog(value = "项目合规评估流程-同意")
@ApiOperation(value="项目合规评估流程-同意", notes="项目合规评估流程-同意")
@PostMapping("/agree")
public Result<T> agree(@Validated @RequestBody ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
processProjectAssessService.approveTask(processInfoVO, true);
return Result.OK();
}
@AutoLog(value = "标准征求意见流程-驳回")
@ApiOperation(value="标准征求意见流程-驳回", notes="标准征求意见流程-驳回")
@AutoLog(value = "项目合规评估流程-驳回")
@ApiOperation(value="项目合规评估流程-驳回", notes="项目合规评估流程-驳回")
@PostMapping("/reject")
public Result<T> reject(@Validated @RequestBody ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
processProjectAssessService.approveTask(processInfoVO, false);
return Result.OK();
}
@AutoLog(value = "标准征求意见流程-提交")
@ApiOperation(value="标准征求意见流程-提交", notes="标准征求意见流程-提交")
@AutoLog(value = "项目合规评估流程-提交")
@ApiOperation(value="项目合规评估流程-提交", notes="项目合规评估流程-提交")
@PostMapping("/submit")
public Result<T> submit(@Validated @RequestBody ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
processProjectAssessService.submit(processInfoVO);
return Result.OK();
}
@AutoLog(value = "项目合规评估流程-保存为草稿")
@ApiOperation(value = "项目合规评估流程-保存为草稿", notes = "项目合规评估流程-保存为草稿")
@PostMapping(value = "/saveToDraft")
public Result<T> saveToDraft(@Validated @RequestBody ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
processProjectAssessService.saveToDraft(processInfoVO);
return Result.OK();
}
/**
* 标准征求意见流程-查询条款列表
* 项目合规评估流程-查询条款列表
* @return
*/
@ApiOperation(value = "标准征求意见流程-查询条款列表")
@ApiOperation(value = "项目合规评估流程-查询条款列表")
@PostMapping("/processProjectAssessGetList")
@ApiOperationSupport(order = 21)
public Result<List<ProcessProjectAssessTerm>> processProjectAssessGetList(@RequestBody List<LawsAssess> lawsAssessList) {
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+16
View File
@@ -134,4 +134,20 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
public void submit(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
}
public void saveToDraft(ProcessInfoVO<ProcessProjectAssessVO> 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);
}
}