diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index ce38e5a9..344b937a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; @@ -16,6 +17,8 @@ import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.service.ProcessAllService; @@ -25,6 +28,7 @@ import com.jero.modules.activiti.vo.ResolveTaskParam; import com.jero.modules.laws.common.util.CurrentUserUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -53,6 +57,8 @@ public class WorkCenterController { private ProcessApprovalRecordService processApprovalRecordService; @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; @ApiOperation(value = "查询待办流程列表") @GetMapping("/getTodoList") @@ -241,4 +247,28 @@ public class WorkCenterController { return Result.OK(processApprovalRecord); } + /** + * 草稿办理 + * @param draftId + */ + @AutoLog(value = "草稿办理") + @ApiOperation(value="草稿办理", notes="草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId)); + } + + /** + * 快照跳转 + * @param snapshotId + */ + @AutoLog(value = "快照跳转") + @ApiOperation(value="快照跳转", notes="快照跳转") + @GetMapping("/snapshotHandle") + @Translation + public Result snapshotHandle(@RequestParam("snapshotId") @ApiParam("快照Id") String snapshotId) { + return Result.OK(actFlowCommonService.getExistSnapshot(snapshotId)); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java deleted file mode 100644 index b23f222a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.jero.modules.activiti.process.common.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.modules.activiti.process.common.service.ActFlowCommonService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * @author: Mzaxd - * @Date: 2023/11/21 14:27 - */ - -@Slf4j -@RestController -@Api(tags = "企标通用流程接口") -@RequestMapping("/process/common") -public class ESProcessCommonController { - - @Resource - private ActFlowCommonService actFlowCommonService; - - /** - * 根据企标编号获取企标计划的标准类型字段 - * - * @param standardNo - */ - @AutoLog(value = "根据企标编号获取企标计划的标准类型字段") - @ApiOperation(value="根据企标编号获取企标计划的标准类型字段", notes="根据企标编号获取企标计划的标准类型字段") - @GetMapping("/getStandType") - @Translation - @Deprecated - public Result getStandType(@RequestParam("standardNo") @ApiParam("企标编号") String standardNo) { - return Result.OK(actFlowCommonService.getStandTypeByStandNo(standardNo)); - } - - - /** - * 草稿办理 - * @param draftId - */ - @AutoLog(value = "草稿办理") - @ApiOperation(value="草稿办理", notes="草稿办理") - @GetMapping("/draftHandle") - @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { - return Result.OK(actFlowCommonService.getExistDraft(draftId)); - } - - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessSnapshot.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessSnapshot.java new file mode 100644 index 00000000..ad6b122e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessSnapshot.java @@ -0,0 +1,127 @@ +package com.jero.modules.activiti.process.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 草稿表 + * @TableName process_snapshot + */ +@TableName(value ="process_snapshot") +@Data +public class ProcessSnapshot implements Serializable { + /** + * 主键ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键ID") + private String id; + + /** + * 创建人ID + */ + @ApiModelProperty(value = "创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 修改人ID + */ + @ApiModelProperty(value = "修改人ID") + private String updateBy; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + /** + * 部门code + */ + @ApiModelProperty(value = "部门code") + private String orgCode; + + /** + * 流程类型 + */ + @ApiModelProperty(value = "流程类型") + private String prcName; + + /** + * 流程实例id + */ + @ApiModelProperty(value = "流程实例id") + private String processInstanceId; + + /** + * 项目类型 + */ + @Dict(dicCode = "prc_type") + @ApiModelProperty(value = "项目类型") + private Integer prcType; + + /** + * 项目id + */ + @ApiModelProperty(value = "项目id") + private String projectId; + + /** + * 节点id + */ + @TableField(exist = false) + @ApiModelProperty(value = "节点id") + private String nodeId; + + /**任务id*/ + @ApiModelProperty(value = "任务id") + private java.lang.String taskId; + + /**流程审批信息-备注*/ + @ApiModelProperty(value = "流程审批信息-备注") + private java.lang.String handleText; + + /**流程审批信息-附件*/ + @ApiModelProperty(value = "流程审批信息-附件") + private java.lang.String handleFile; + + /**用户id*/ + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + @ApiModelProperty(value = "用户id") + private java.lang.String userId; + + /**流程信息-截止日期*/ + @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; + + /** + * 草稿信息json字符串 + */ + @ApiModelProperty(value = "草稿信息json字符串") + private String infoJsonStr; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/ProcessSnapshotMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/ProcessSnapshotMapper.java new file mode 100644 index 00000000..284fc3c0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/ProcessSnapshotMapper.java @@ -0,0 +1,18 @@ +package com.jero.modules.activiti.process.common.mapper; + +import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author ThinkBook +* @description 针对表【process_snapshot(草稿表)】的数据库操作Mapper +* @createDate 2024-07-10 16:27:54 +* @Entity com.jero.modules.activiti.process.common.entity.ProcessSnapshot +*/ +public interface ProcessSnapshotMapper extends BaseMapper { + +} + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/xml/ProcessSnapshotMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/xml/ProcessSnapshotMapper.xml new file mode 100644 index 00000000..4e166689 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/mapper/xml/ProcessSnapshotMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id,create_by,create_time, + update_by,update_time,org_code, + prc_name,process_instance_id,task_id, + prc_type,handle_text,handle_file, + user_id,process_due_date,process_description, + info_json_str + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 4518df99..187b50c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -13,6 +13,7 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; import com.jero.modules.activiti.process.common.entity.StandTypeVO; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; @@ -70,6 +71,9 @@ public class ActFlowCommonService { @Resource private ProcessDraftService processDraftService; + @Resource + private ProcessSnapshotService processSnapshotService; + @Resource private ILawsEnterpriseStandardService esService; @@ -442,4 +446,10 @@ public class ActFlowCommonService { } return null; } + + public ProcessSnapshot getExistSnapshot(String snapshotId) { + LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); + draftWrapper.eq(ProcessSnapshot::getId, snapshotId); + return processSnapshotService.getOne(draftWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessSnapshotService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessSnapshotService.java new file mode 100644 index 00000000..bee85a70 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ProcessSnapshotService.java @@ -0,0 +1,13 @@ +package com.jero.modules.activiti.process.common.service; + +import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ThinkBook +* @description 针对表【process_snapshot(草稿表)】的数据库操作Service +* @createDate 2024-07-10 16:27:54 +*/ +public interface ProcessSnapshotService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessSnapshotServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessSnapshotServiceImpl.java new file mode 100644 index 00000000..3fbfaac1 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/impl/ProcessSnapshotServiceImpl.java @@ -0,0 +1,22 @@ +package com.jero.modules.activiti.process.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; +import com.jero.modules.activiti.process.common.service.ProcessSnapshotService; +import com.jero.modules.activiti.process.common.mapper.ProcessSnapshotMapper; +import org.springframework.stereotype.Service; + +/** +* @author ThinkBook +* @description 针对表【process_snapshot(草稿表)】的数据库操作Service实现 +* @createDate 2024-07-10 16:27:54 +*/ +@Service +public class ProcessSnapshotServiceImpl extends ServiceImpl + implements ProcessSnapshotService{ + +} + + + +