From 2065f75c74b44a5748631864268a9e0b65a0767c Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 26 Jun 2024 13:38:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E5=8A=9E=E7=90=86=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/StandardInterpretCommon.java | 12 ++- .../StandardInterpretFlowController.java | 24 +++++- .../dto/StandardInterpretDTO.java | 2 +- .../dto/StandardInterpretFlowDTO.java | 1 - .../entity/ProcessStandardInterpret.java | 30 ++++++++ .../ProcessStandardInterpretClause.java | 13 ++++ ...ProcessStandardInterpretClauseSublist.java | 22 +++++- .../ProcessStandardInterpretClauseMapper.java | 14 ++++ ...sStandardInterpretClauseSublistMapper.java | 14 ++++ .../ProcessStandardInterpretMapper.java | 11 +++ .../ProcessStandardInterpretClauseMapper.xml | 13 ++++ ...ssStandardInterpretClauseSublistMapper.xml | 52 +++++++++++++ .../xml/ProcessStandardInterpretMapper.xml | 26 +++++++ ...ProcessStandardInterpretClauseService.java | 7 ++ ...StandardInterpretClauseSublistService.java | 9 +++ .../ProcessStandardInterpretService.java | 7 +- .../service/StandardInterpretFlowService.java | 9 +++ ...essStandardInterpretClauseServiceImpl.java | 18 +++++ ...dardInterpretClauseSublistServiceImpl.java | 30 +++++++- .../ProcessStandardInterpretServiceImpl.java | 16 ++++ .../StandardInterpretFlowServiceImpl.java | 74 ++++++++++++++++++- .../vo/StandardInterpretFlowVO.java | 35 +++++++++ .../documenttool/entity/SplitFileInfo.java | 3 - 23 files changed, 425 insertions(+), 17 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java index c13e803d..194f827c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java @@ -13,9 +13,17 @@ public class StandardInterpretCommon { } /** - * 标准解读流程key + * 标准解读流程key（主流程） */ - public static final String KEY = "standard_interpret"; + public static final String KEY_1 = "standard_interpret"; + /** + * 标准解读流程key（子解读人流程） + */ + public static final String KEY_2 = "standard_interpret_sublist"; + /** + * 标准解读流程key（主解读人重新分发子流程） + */ + public static final String KEY_3 = "standard_interpret_again_sublist"; /** * 法规工程师发起 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java index 3a8cbb01..283b58bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java @@ -3,20 +3,22 @@ package com.jero.modules.activiti.process.standardinterpret.controller; 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.constant.CommonConstant; import com.jero.common.util.MessageUtils; import com.jero.common.util.SnowflakeUtils; import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretFlowDTO; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; +import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.task.Task; import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; -import java.text.ParseException; import java.util.List; import java.util.Map; @@ -52,7 +54,7 @@ public class StandardInterpretFlowController { * @param standardInterpretFlowDTO 标准解读流程对象 * @return 结果对象 */ - @AutoLog(value = "标准解读流程-流程发起") + @AutoLog(value = "标准解读流程-流程发起", operateType = CommonConstant.OPERATE_TYPE_2) @ApiOperation(value="标准解读流程-流程发起", notes="标准解读流程-流程发起") @PostMapping(value = "/flowStart") public Result flowStart(@RequestBody StandardInterpretFlowDTO standardInterpretFlowDTO) { @@ -65,7 +67,7 @@ public class StandardInterpretFlowController { * @param standardInterpretFlowDTO 标准解读流程对象 * @return 结果对象 */ - @AutoLog(value = "企标稽查整改-流程审批") + @AutoLog(value = "企标稽查整改-流程审批", operateType = CommonConstant.OPERATE_TYPE_3) @ApiOperation(value="企标稽查整改-流程审批", notes="企标稽查整改-流程审批") @PostMapping(value = "/flowApproval") public Result flowApproval(@RequestBody StandardInterpretFlowDTO standardInterpretFlowDTO) { @@ -73,6 +75,20 @@ public class StandardInterpretFlowController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + /** + * 标准解读流程-办理详情 + * @param projectId 项目id + * @return 结果对象 + */ + @AutoLog(value = "企标稽查计划流程-办理详情", operateType = CommonConstant.OPERATE_TYPE_1) + @ApiOperation(value="企标稽查计划流程-办理详情", notes="企标稽查计划流程-办理详情") + @GetMapping(value = "/queryDetail") + @Translation + public Result queryDetail(@ApiParam("项目id") String projectId, + @ApiParam("任务id") String taskId) { + return Result.OK(standardInterpretFlowService.queryDetail(projectId, taskId)); + } + /** * 标准解读流程-生成项目id * @return 项目id @@ -86,7 +102,7 @@ public class StandardInterpretFlowController { } /** - * 标准解读流程-生成项目id + * 标准解读流程-getTaskId * @return 项目id */ @AutoLog(value = "标准解读流程-getTaskId", operateType = CommonConstant.OPERATE_TYPE_1) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretDTO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretDTO.java index 3c489a18..106cb46c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretDTO.java @@ -19,7 +19,7 @@ import java.util.List; @Data public class StandardInterpretDTO implements Serializable { /**标准解读流程*/ - @ApiModelProperty(value = "流程信息") + @ApiModelProperty(value = "标准解读流程") private ProcessStandardInterpret processStandardInterpret; /**标准解读流程_条款中间表*/ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretFlowDTO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretFlowDTO.java index 3a1e8795..93ef8123 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretFlowDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/dto/StandardInterpretFlowDTO.java @@ -16,7 +16,6 @@ import java.util.Map; **/ @Data public class StandardInterpretFlowDTO { - /**流程信息*/ @ApiModelProperty(value = "流程信息") private ProcessAll processAll; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java index 79184cca..820705f7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java @@ -1,10 +1,14 @@ package com.jero.modules.activiti.process.standardinterpret.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; /** * 标准解读流程(ProcessStandardInterpret)表实体类 @@ -24,11 +28,37 @@ public class ProcessStandardInterpret extends BaseEntity { /**标准id*/ @ApiModelProperty(value = "标准id") private String standardId; + /**标准编号*/ + @ApiModelProperty(value = "标准编号") + @TableField(exist = false) + private String standardNumber; + /**标准名称*/ + @ApiModelProperty(value = "标准名称") + @TableField(exist = false) + private String standardName; + /**标准名称*/ + @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") + @TableField(exist = false) + private java.lang.String standardState; + /**实施日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + @TableField(exist = false) + private java.util.Date implementationDate; + /**在产车实施日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "新认证车实施日期") + @TableField(exist = false) + private java.lang.String newAuthImplDate; /**项目id*/ @ApiModelProperty(value = "项目id") private String projectId; /**分解单来源（字典）*/ @ApiModelProperty(value = "分解单来源（字典）") + @Dict(dicCode = "") private String decompositionSource; /**是否下发（字典：1：是，2：否）*/ @ApiModelProperty(value = "是否下发（字典：1：是，2：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java index bceff496..a2eccf1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.standardinterpret.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,6 +22,18 @@ public class ProcessStandardInterpretClause extends BaseEntity { /**条款id/标准id*/ @ApiModelProperty(value = "条款id/标准id") private String clauseId; + /**条款号/标准编号*/ + @ApiModelProperty(value = "条款号/标准编号") + @TableField(exist = false) + private String itemNum; + /**条款标题/标准名称*/ + @ApiModelProperty(value = "条款标题/标准名称") + @TableField(exist = false) + private String itemTitle; + /**条款内容*/ + @ApiModelProperty(value = "条款内容") + @TableField(exist = false) + private String itemContent; /**各涉及部门解读人*/ @ApiModelProperty(value = "各涉及部门解读人") private String interpretPersonIds; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 81d9cf28..2bd33396 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.standardinterpret.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.jero.modules.laws.documenttool.entity.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,9 +17,21 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**标准解读流程_条款中间表id*/ @ApiModelProperty(value = "标准解读流程_条款中间表id") private String standardInterpretClauseId; - /**条款id*/ - @ApiModelProperty(value = "条款id") + /**条款id/标准id*/ + @ApiModelProperty(value = "条款id/标准id") private String clauseId; + /**条款号/标准编号*/ + @ApiModelProperty(value = "条款号/标准编号") + @TableField(exist = false) + private String itemNum; + /**条款标题/标准名称*/ + @ApiModelProperty(value = "条款标题/标准名称") + @TableField(exist = false) + private String itemTitle; + /**条款内容*/ + @ApiModelProperty(value = "条款内容") + @TableField(exist = false) + private String itemContent; /**解读人*/ @ApiModelProperty(value = "解读人") private String interpretPersonId; @@ -109,5 +122,10 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { /**备注*/ @ApiModelProperty(value = "备注") private String remarks; + + /**标准解读流程id 搜索用*/ + @ApiModelProperty(value = "标准解读流程id 搜索用") + @TableField(exist = false) + private String standardInterpretId; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseMapper.java index 4bba399c..8abfa8ca 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseMapper.java @@ -1,7 +1,13 @@ package com.jero.modules.activiti.process.standardinterpret.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 标准解读流程_条款中间表(ProcessStandardInterpretClause)表数据库访问层 @@ -9,7 +15,15 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar * @author makejava * @since 2024-06-24 14:46:05 */ +@Mapper public interface ProcessStandardInterpretClauseMapper extends BaseMapper { + /** + * 查询列表 + * @param queryWrapper + * @return + */ + List queryList(@Param(Constants.WRAPPER) + QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseSublistMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseSublistMapper.java index b8dbc419..4aa7ed6d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseSublistMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretClauseSublistMapper.java @@ -1,7 +1,13 @@ package com.jero.modules.activiti.process.standardinterpret.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 标准解读流程_条款中间表_子表(ProcessStandardInterpretClauseSublist)表数据库访问层 @@ -9,7 +15,15 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar * @author makejava * @since 2024-06-24 14:47:59 */ +@Mapper public interface ProcessStandardInterpretClauseSublistMapper extends BaseMapper { + /** + * 查询列表 + * @param queryWrapper + * @return + */ + List queryList(@Param(Constants.WRAPPER) + QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java index 2752703c..6e0c9f5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/ProcessStandardInterpretMapper.java @@ -1,7 +1,11 @@ package com.jero.modules.activiti.process.standardinterpret.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 标准解读流程(ProcessStandardInterpret)表数据库访问层 @@ -9,7 +13,14 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar * @author makejava * @since 2024-06-24 14:41:17 */ +@Mapper public interface ProcessStandardInterpretMapper extends BaseMapper { + /** + * 单个查询 + * @param queryWrapper + * @return + */ + ProcessStandardInterpret queryOne(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml index 2c7b9753..a78a3c05 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml @@ -2,5 +2,18 @@ + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml index fb4a7c12..95cae1e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml @@ -2,5 +2,57 @@ + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml index b88df108..5bc6a053 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretMapper.xml @@ -2,5 +2,31 @@ + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseService.java index 3f399238..ee5d9707 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseService.java @@ -3,6 +3,8 @@ package com.jero.modules.activiti.process.standardinterpret.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; +import java.util.List; + /** * 标准解读流程_条款中间表(ProcessStandardInterpretClause)表服务接口 * @@ -11,5 +13,10 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar */ public interface ProcessStandardInterpretClauseService extends IService { + /** + * 查询列表 + * @param processStandardInterpretClause + */ + List queryList(ProcessStandardInterpretClause processStandardInterpretClause); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseSublistService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseSublistService.java index b836d34d..b49c13ab 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseSublistService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretClauseSublistService.java @@ -3,6 +3,8 @@ package com.jero.modules.activiti.process.standardinterpret.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; +import java.util.List; + /** * 标准解读流程_条款中间表_子表(ProcessStandardInterpretClauseSublist)表服务接口 * @@ -11,5 +13,12 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar */ public interface ProcessStandardInterpretClauseSublistService extends IService { + /** + * 查询列表 + * @param processStandardInterpretClauseSublist + * @return + */ + List queryList( + ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretService.java index e8e6a548..25d1dd2b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/ProcessStandardInterpretService.java @@ -10,6 +10,11 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar * @since 2024-06-24 14:41:19 */ public interface ProcessStandardInterpretService extends IService { - + /** + * 单个查询 + * @param processStandardInterpret + * @return + */ + ProcessStandardInterpret queryOne(ProcessStandardInterpret processStandardInterpret); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java index d0c5d385..1c1fd800 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.standardinterpret.service; import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretFlowDTO; +import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.task.Task; @@ -33,6 +34,14 @@ public interface StandardInterpretFlowService { */ void flowListener(DelegateTask delegateTask); + /** + * 查询详情 + * @param projectId + * @param taskId + * @return + */ + StandardInterpretFlowVO queryDetail(String projectId, String taskId); + void demo(Map map); List getTaskId(String processInstanceId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java index 2f12f4dd..25834f1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseServiceImpl.java @@ -1,12 +1,18 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause; import com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretClauseMapper; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretClauseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 标准解读流程_条款中间表(ProcessStandardInterpretClause)表服务实现类 @@ -17,9 +23,21 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor +@Transactional(rollbackFor = {Exception.class, JeroBootException.class}) public class ProcessStandardInterpretClauseServiceImpl extends ServiceImpl implements ProcessStandardInterpretClauseService { + private final ProcessStandardInterpretClauseMapper processStandardInterpretClauseMapper; + + @Override + public List queryList( + ProcessStandardInterpretClause processStandardInterpretClause) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClause.getStandardInterpretId()), + "standard_interpret_id", processStandardInterpretClause.getStandardInterpretId()); + queryWrapper.orderByAsc("id"); + return processStandardInterpretClauseMapper.queryList(queryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java index 6dc51058..3c83fd76 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretClauseSublistServiceImpl.java @@ -1,10 +1,18 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretClauseSublistMapper; +import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist; +import com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretClauseSublistMapper; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretClauseSublistService; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 标准解读流程_条款中间表_子表(ProcessStandardInterpretClauseSublist)表服务实现类 @@ -13,10 +21,30 @@ import org.springframework.stereotype.Service; * @since 2024-06-24 14:48:00 */ @Service +@RequiredArgsConstructor +@Transactional(rollbackFor = {Exception.class, JeroBootException.class}) public class ProcessStandardInterpretClauseSublistServiceImpl extends ServiceImpl implements ProcessStandardInterpretClauseSublistService { + private final ProcessStandardInterpretClauseSublistMapper processStandardInterpretClauseSublistMapper; + @Override + public List queryList( + ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClauseSublist.getStandardInterpretClauseId()), + "standard_interpret_clause_id", + processStandardInterpretClauseSublist.getStandardInterpretClauseId()); + queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClauseSublist.getStandardInterpretId()), + "standard_interpret_id", + processStandardInterpretClauseSublist.getStandardInterpretId()); + queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClauseSublist.getInterpretPersonId()), + "interpret_person_id", + processStandardInterpretClauseSublist.getInterpretPersonId()); + queryWrapper.eq("psics.del_flag", CommonConstant.DEL_FLAG_0); + queryWrapper.orderByAsc("psics.id"); + return processStandardInterpretClauseSublistMapper.queryList(queryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretServiceImpl.java index 9c14ffa0..bc3345bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/ProcessStandardInterpretServiceImpl.java @@ -1,10 +1,15 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretMapper; import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 标准解读流程(ProcessStandardInterpret)表服务实现类 @@ -13,9 +18,20 @@ import org.springframework.stereotype.Service; * @since 2024-06-24 14:41:19 */ @Service +@RequiredArgsConstructor +@Transactional(rollbackFor = {Exception.class, JeroBootException.class}) public class ProcessStandardInterpretServiceImpl extends ServiceImpl implements ProcessStandardInterpretService { + private final ProcessStandardInterpretMapper processStandardInterpretMapper; + + @Override + public ProcessStandardInterpret queryOne(ProcessStandardInterpret processStandardInterpret) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("project_id", processStandardInterpret.getProjectId()); + queryWrapper.eq("psi.del_flag", CommonConstant.DEL_FLAG_0); + return processStandardInterpretMapper.queryOne(queryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 4454375b..f0eb0c94 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -27,6 +27,7 @@ import com.jero.modules.activiti.process.standardinterpret.service.ProcessStanda import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretClauseSublistService; import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; +import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; @@ -78,7 +79,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe Map map = standardInterpretFlowDTO.getMap(); // 根据流程key启动流程,设置流程变量,更新流程总表信息,更新流程审批信息，返回任务信息 - Task task = startProcessInstanceByKey(StandardInterpretCommon.KEY, map, processAll, processApprovalRecord); + Task task = startProcessInstanceByKey(StandardInterpretCommon.KEY_1, map, processAll, processApprovalRecord); // 处理业务信息 handleBusinessData(standardInterpretFlowDTO); @@ -134,11 +135,80 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe log.info("发起 标准解读流程（子解读人流程）"); }else if (StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(taskDefinitionKey)){ // 标准主解读汇总 合并条款 - + } log.info("标准解读流程-流程监听器 结束"); } + @Override + public StandardInterpretFlowVO queryDetail(String projectId, String taskId) { + StandardInterpretFlowVO standardInterpretFlowVO = new StandardInterpretFlowVO(); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // 查询流程信息 + ProcessAll processAll = processAllService.getOne( + new LambdaQueryWrapper() + .eq(ProcessAll::getProjectId, projectId) + .orderByDesc(ProcessAll::getCreateTime), false); + standardInterpretFlowVO.setProcessAll(processAll); + + // 查询流程审批信息 + ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getOne( + new LambdaQueryWrapper() + .eq(ProcessApprovalRecord::getUserId, loginUser.getId()) + .eq(ProcessApprovalRecord::getTaskId, taskId), false); + standardInterpretFlowVO.setProcessApprovalRecord(processApprovalRecord); + + // 查询业务信息 + standardInterpretFlowVO.setData(queryBusinessData(processAll, processApprovalRecord)); + return standardInterpretFlowVO; + } + + private StandardInterpretDTO queryBusinessData(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord) { + StandardInterpretDTO standardInterpretDTO = new StandardInterpretDTO(); + // 标准解读流程 + ProcessStandardInterpret processStandardInterpret = new ProcessStandardInterpret(); + // 标准解读流程_条款中间表 + List processStandardInterpretClauseList = new ArrayList<>(); + // 标准解读流程_条款中间表_子表 + List processStandardInterpretClauseSublistList = new ArrayList<>(); + // 项目id + String projectId = processAll.getProjectId(); + // 当前任务节点 + String node = processApprovalRecord.getNodeId(); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // 通过 projectId 查询 标准解读流程 + processStandardInterpret.setProjectId(projectId); + processStandardInterpret = processStandardInterpretService.queryOne(processStandardInterpret); + + // 通过 标准解读流程id 查询 标准解读流程_条款中间表 + if (!Objects.isNull(processStandardInterpret)){ + ProcessStandardInterpretClause processStandardInterpretClause = + new ProcessStandardInterpretClause(); + processStandardInterpretClause.setStandardInterpretId(processStandardInterpret.getId()); + processStandardInterpretClauseList = + processStandardInterpretClauseService.queryList(processStandardInterpretClause); + } + + // 通过 标准解读流程id 查询 标准解读流程_条款中间表_子表 + if (!Objects.isNull(processStandardInterpret)) { + ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = + new ProcessStandardInterpretClauseSublist(); + processStandardInterpretClauseSublist.setStandardInterpretId(processStandardInterpret.getId()); + if (StandardInterpretCommon.INTERPRETING_PEOPLE_FILLOUT.equals(node)){ + processStandardInterpretClauseSublist.setInterpretPersonId(loginUser.getId()); + } + processStandardInterpretClauseSublistList = + processStandardInterpretClauseSublistService.queryList(processStandardInterpretClauseSublist); + } + + standardInterpretDTO.setProcessStandardInterpret(processStandardInterpret); + standardInterpretDTO.setProcessStandardInterpretClauseList(processStandardInterpretClauseList); + standardInterpretDTO.setProcessStandardInterpretClauseSublistList(processStandardInterpretClauseSublistList); + return standardInterpretDTO; + } + @Override public void demo(Map map) { // 完成任务 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java new file mode 100644 index 00000000..56e364bf --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/StandardInterpretFlowVO.java @@ -0,0 +1,35 @@ +package com.jero.modules.activiti.process.standardinterpret.vo; + +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; +import com.jero.modules.activiti.process.standardinterpret.dto.StandardInterpretDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +/** + * @ClassName: StandardInterpretVO + * @Description: + * @Author: yjz + * @Date: 2024-06-26 09:33 + * @Version: 1.0 + **/ +@Data +public class StandardInterpretFlowVO { + /**流程信息*/ + @ApiModelProperty(value = "流程信息") + private ProcessAll processAll; + + /**流程审批信息*/ + @ApiModelProperty(value = "流程审批信息") + private ProcessApprovalRecord processApprovalRecord; + + /**业务信息*/ + @ApiModelProperty(value = "业务信息") + private StandardInterpretDTO data; + + /**map（参数）*/ + @ApiModelProperty(value = "map（参数）") + private Map map; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java index 9391d39b..001d1f85 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java @@ -58,9 +58,6 @@ public class SplitFileInfo { @ApiModelProperty(value = "更新日期") private Date updateTime; - /** - * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) - */ @ApiModelProperty(value = "标准类别") @TableField(exist = false) private String standardClass;