feat(标准解读流程): 办理详情

2024-06-26 13:38:34 +08:00
parent f2cc8f37ea
commit 2065f75c74
23 changed files with 425 additions and 17 deletions
@@ -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";

    /**
     * 法规工程师发起
@@ -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<T> 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<T> 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<StandardInterpretFlowVO> 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)
@@ -19,7 +19,7 @@ import java.util.List;
@Data
 public class StandardInterpretDTO implements Serializable {
    /**标准解读流程*/
-    @ApiModelProperty(value = "流程信息")
+    @ApiModelProperty(value = "标准解读流程")
    private ProcessStandardInterpret processStandardInterpret;

    /**标准解读流程_条款中间表*/
@@ -16,7 +16,6 @@ import java.util.Map;
 **/
@Data
 public class StandardInterpretFlowDTO {
-
    /**流程信息*/
    @ApiModelProperty(value = "流程信息")
    private ProcessAll processAll;
@@ -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：否）")
@@ -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;
@@ -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;
 }

@@ -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<ProcessStandardInterpretClause> {

+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<ProcessStandardInterpretClause> queryList(@Param(Constants.WRAPPER)
+                                                   QueryWrapper<ProcessStandardInterpretClause> queryWrapper);
 }

@@ -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<ProcessStandardInterpretClauseSublist> {

+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<ProcessStandardInterpretClauseSublist> queryList(@Param(Constants.WRAPPER)
+                                                QueryWrapper<ProcessStandardInterpretClauseSublist> queryWrapper);
 }

@@ -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<ProcessStandardInterpret> {

+    /**
+     * 单个查询
+     * @param queryWrapper
+     * @return
+     */
+    ProcessStandardInterpret queryOne(@Param(Constants.WRAPPER) QueryWrapper<ProcessStandardInterpret> queryWrapper);
 }

@@ -2,5 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretClauseMapper">

+    <select id="queryList"
+            resultType="com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause">
+        select * from (select psic.id,
+                              IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum,
+                              IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
+                              IF(lds.id is not null, null, lds2.item_content) itemContent,
+                              standard_interpret_id
+                       from laws_chery_dev.process_standard_interpret_clause psic
+                                left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0
+                                left join laws_document_split lds2 on psic.clause_id = lds2.id and lds2.del_flag = 0
+                                where psic.del_flag = 0) t
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

@@ -2,5 +2,57 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretClauseSublistMapper">

+    <select id="queryList"
+            resultType="com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist">
+         select psic2.*,
+                psics.id,
+                standard_interpret_clause_id,
+                clause_id,
+                interpret_person_id,
+                `translation`,
+                is_same_as_prev_version,
+                change_description,
+                regulatory_notes,
+                keywords,
+                applicable_components,
+                responsible_department,
+                responsible_module,
+                related_department,
+                related_module,
+                applications,
+                power_type,
+                domain_area,
+                configuration_requirements,
+                new_cer_implement_date,
+                new_production_implementation,
+                registration_date,
+                enterprise_standard,
+                technical_specification_design_guide,
+                drawing_template,
+                technical_agreement_template,
+                verification_report_template_checklist,
+                dvp_template,
+                dfema,
+                key_technology_decomposition_table,
+                other_documents_templates,
+                p3,
+                p5,
+                remarks,
+                del_flag,
+                create_by,
+                create_time,
+                update_by,
+                update_time
+         from process_standard_interpret_clause_sublist psics
+             left join (select psic.id,
+             IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum,
+             IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
+             IF(lds.id is not null, null, lds2.item_content)            itemContent,
+             standard_interpret_id
+             from laws_chery_dev.process_standard_interpret_clause psic
+             left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0
+             left join laws_document_split lds2 on psic.clause_id = lds2.id and lds2.del_flag = 0) psic2
+         on psics.standard_interpret_clause_id = psic2.id
+    </select>
 </mapper>

@@ -2,5 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.process.standardinterpret.mapper.ProcessStandardInterpretMapper">

+    <select id="queryOne"
+            resultType="com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret">
+         select psi.id,
+                lds.standard_number,
+                lds.standard_name,
+                lds.standard_state,
+                lds.implementation_date,
+                lds.new_auth_impl_date,
+                master_interpret_id,
+                parent_id,
+                standard_id,
+                project_id,
+                decomposition_source,
+                is_distribute,
+                countersign_person_ids,
+                uploader,
+                approve_person_id,
+                psi.del_flag,
+                psi.create_by,
+                psi.create_time,
+                psi.update_by,
+                psi.update_time
+        from process_standard_interpret psi
+            left join laws_domestic_standard lds on psi.standard_id = lds.id and lds.del_flag = 0
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

@@ -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<ProcessStandardInterpretClause> {

+    /**
+     * 查询列表
+     * @param processStandardInterpretClause
+     */
+    List<ProcessStandardInterpretClause> queryList(ProcessStandardInterpretClause processStandardInterpretClause);
 }

@@ -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<ProcessStandardInterpretClauseSublist> {

+    /**
+     * 查询列表
+     * @param processStandardInterpretClauseSublist
+     * @return
+     */
+    List<ProcessStandardInterpretClauseSublist> queryList(
+            ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist);
 }

@@ -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<ProcessStandardInterpret> {
-
+    /**
+     * 单个查询
+     * @param processStandardInterpret
+     * @return
+     */
+    ProcessStandardInterpret queryOne(ProcessStandardInterpret processStandardInterpret);
 }

@@ -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<String, Object> map);

    List<Task> getTaskId(String processInstanceId);
@@ -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<ProcessStandardInterpretClauseMapper, ProcessStandardInterpretClause>
        implements ProcessStandardInterpretClauseService {

+    private final ProcessStandardInterpretClauseMapper processStandardInterpretClauseMapper;
+
+    @Override
+    public List<ProcessStandardInterpretClause> queryList(
+            ProcessStandardInterpretClause processStandardInterpretClause) {
+        QueryWrapper<ProcessStandardInterpretClause> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(processStandardInterpretClause.getStandardInterpretId()),
+                "standard_interpret_id", processStandardInterpretClause.getStandardInterpretId());
+        queryWrapper.orderByAsc("id");
+        return processStandardInterpretClauseMapper.queryList(queryWrapper);
+    }
 }

@@ -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<ProcessStandardInterpretClauseSublistMapper, ProcessStandardInterpretClauseSublist>
        implements ProcessStandardInterpretClauseSublistService {

+    private final ProcessStandardInterpretClauseSublistMapper processStandardInterpretClauseSublistMapper;

+    @Override
+    public List<ProcessStandardInterpretClauseSublist> queryList(
+            ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist) {
+        QueryWrapper<ProcessStandardInterpretClauseSublist> 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);
+    }
 }

@@ -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<ProcessStandardInterpretMapper, ProcessStandardInterpret>
        implements ProcessStandardInterpretService {

+    private final ProcessStandardInterpretMapper processStandardInterpretMapper;
+
+    @Override
+    public ProcessStandardInterpret queryOne(ProcessStandardInterpret processStandardInterpret) {
+        QueryWrapper<ProcessStandardInterpret> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", processStandardInterpret.getProjectId());
+        queryWrapper.eq("psi.del_flag", CommonConstant.DEL_FLAG_0);
+        return processStandardInterpretMapper.queryOne(queryWrapper);
+    }
 }

@@ -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<String, Object> 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<ProcessAll>()
+                    .eq(ProcessAll::getProjectId, projectId)
+                    .orderByDesc(ProcessAll::getCreateTime), false);
+        standardInterpretFlowVO.setProcessAll(processAll);
+
+        // 查询流程审批信息
+        ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getOne(
+                new LambdaQueryWrapper<ProcessApprovalRecord>()
+                    .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<ProcessStandardInterpretClause> processStandardInterpretClauseList = new ArrayList<>();
+        // 标准解读流程_条款中间表_子表
+        List<ProcessStandardInterpretClauseSublist> 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<String, Object> map) {
        // 完成任务
@@ -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<String, Object> map;
+}
@@ -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;