compliance_management / ruoyi-flowable-plus · 提交

转到一个项目

作者 张晓杰
提交 af20eac2d8cc263d7e71a2d5f8678ce595fba57b 1 个父辈 f737d49f

合规审查

内嵌 并排对比
正在显示 7 个修改的文件 包含 187 行增加 和 11 行删除
@@ -7,9 +7,11 @@ import java.util.Map; @@ -7,9 +7,11 @@ import java.util.Map;
7 import java.util.concurrent.TimeUnit; 7 import java.util.concurrent.TimeUnit;
8 8
9 import com.baomidou.mybatisplus.annotation.TableName; 9 import com.baomidou.mybatisplus.annotation.TableName;
  10 +import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
10 import com.ruoyi.compliancemanagement.domain.TblContract; 11 import com.ruoyi.compliancemanagement.domain.TblContract;
11 import com.ruoyi.compliancemanagement.domain.bo.TblBusinessWorkflowBo; 12 import com.ruoyi.compliancemanagement.domain.bo.TblBusinessWorkflowBo;
12 import com.ruoyi.compliancemanagement.domain.bo.TblContractBo; 13 import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
  14 +import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
13 import com.ruoyi.compliancemanagement.service.ITblBusinessWorkflowService; 15 import com.ruoyi.compliancemanagement.service.ITblBusinessWorkflowService;
14 import com.ruoyi.workflow.service.IWfProcessService; 16 import com.ruoyi.workflow.service.IWfProcessService;
15 import lombok.RequiredArgsConstructor; 17 import lombok.RequiredArgsConstructor;
@@ -56,7 +58,7 @@ public class TblComplianceReviewController extends BaseController { @@ -56,7 +58,7 @@ public class TblComplianceReviewController extends BaseController {
56 */ 58 */
57 @SaCheckPermission("compliancemanagement:complianceReview:list") 59 @SaCheckPermission("compliancemanagement:complianceReview:list")
58 @GetMapping("/list") 60 @GetMapping("/list")
59 - public TableDataInfo<TblComplianceReviewVo> list(TblComplianceReviewBo bo, PageQuery pageQuery) { 61 + public TableDataInfo<TblComplianceReviewModel> list(TblComplianceReviewBo bo, PageQuery pageQuery) {
60 return iTblComplianceReviewService.queryPageList(bo, pageQuery); 62 return iTblComplianceReviewService.queryPageList(bo, pageQuery);
61 } 63 }
62 64
@@ -100,7 +102,7 @@ public class TblComplianceReviewController extends BaseController { @@ -100,7 +102,7 @@ public class TblComplianceReviewController extends BaseController {
100 @PostMapping() 102 @PostMapping()
101 public R<Void> addAndStart( 103 public R<Void> addAndStart(
102 @Validated(AddGroup.class) @RequestBody TblComplianceReviewBo bo) { 104 @Validated(AddGroup.class) @RequestBody TblComplianceReviewBo bo) {
103 - String procDefId = "Process_1721285503125:1:c39932d2-4808-11ef-bb1d-421c839c76ba"; 105 + String procDefId = "Process_1721285503125:1:020637e9-489a-11ef-a90d-421c839c76ba";
104 iTblComplianceReviewService.insertByBo(bo); 106 iTblComplianceReviewService.insertByBo(bo);
105 Long id = bo.getId(); 107 Long id = bo.getId();
106 if (id > 0 || id != null){ 108 if (id > 0 || id != null){
@@ -139,7 +141,7 @@ public class TblComplianceReviewController extends BaseController { @@ -139,7 +141,7 @@ public class TblComplianceReviewController extends BaseController {
139 tblBusinessWorkflowBo.setProcInsId(processInstance.getProcessInstanceId()); 141 tblBusinessWorkflowBo.setProcInsId(processInstance.getProcessInstanceId());
140 tblBusinessWorkflowBo.setProcDefId(procDefId); 142 tblBusinessWorkflowBo.setProcDefId(procDefId);
141 tblBusinessWorkflowBo.setDeployId(processInstance.getDeploymentId()); 143 tblBusinessWorkflowBo.setDeployId(processInstance.getDeploymentId());
142 - TableName table = TblContract.class.getAnnotation(TableName.class); 144 + TableName table = TblComplianceReview.class.getAnnotation(TableName.class);
143 tblBusinessWorkflowBo.setTableName(table.value()); 145 tblBusinessWorkflowBo.setTableName(table.value());
144 iTblBusinessWorkflowService.insertByBo(tblBusinessWorkflowBo); 146 iTblBusinessWorkflowService.insertByBo(tblBusinessWorkflowBo);
145 } 147 }
@@ -111,7 +111,7 @@ public class TblContractController extends BaseController { @@ -111,7 +111,7 @@ public class TblContractController extends BaseController {
111 public R<Void> addAndStart( 111 public R<Void> addAndStart(
112 @Validated(AddGroup.class) @RequestBody TblContractBo bo) { 112 @Validated(AddGroup.class) @RequestBody TblContractBo bo) {
113 // Matter matter = new Matter(); 113 // Matter matter = new Matter();
114 - String procDefId = "Process_18tcmzu:1:040fd586-433c-11ef-b955-421c839c76ba"; 114 + String procDefId = "Process_1721195856340:1:7aca8265-489a-11ef-a778-421c839c76ba";
115 iTblContractService.insertByBo(bo); 115 iTblContractService.insertByBo(bo);
116 Long id = bo.getId(); 116 Long id = bo.getId();
117 //Long id = sLeaveService.create(studentLeave,matterKey); 117 //Long id = sLeaveService.create(studentLeave,matterKey);
1 package com.ruoyi.compliancemanagement.mapper; 1 package com.ruoyi.compliancemanagement.mapper;
2 2
  3 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.ruoyi.compliancemanagement.domain.TblComplianceReview; 4 import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
  5 +import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
  6 +import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
4 import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo; 7 import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo;
5 import com.ruoyi.common.core.mapper.BaseMapperPlus; 8 import com.ruoyi.common.core.mapper.BaseMapperPlus;
  9 +import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
  10 +import com.ruoyi.compliancemanagement.model.TblContractModel;
  11 +import org.apache.ibatis.annotations.Param;
6 12
7 /** 13 /**
8 * 合规审查Mapper接口 14 * 合规审查Mapper接口
@@ -11,5 +17,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; @@ -11,5 +17,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
11 * @date 2024-07-22 17 * @date 2024-07-22
12 */ 18 */
13 public interface TblComplianceReviewMapper extends BaseMapperPlus<TblComplianceReviewMapper, TblComplianceReview, TblComplianceReviewVo> { 19 public interface TblComplianceReviewMapper extends BaseMapperPlus<TblComplianceReviewMapper, TblComplianceReview, TblComplianceReviewVo> {
14 - 20 + Page<TblComplianceReviewModel> selectList(Page<TblComplianceReviewModel> page, @Param("qc") TblComplianceReviewBo complianceReviewBo);
15 } 21 }
  1 +package com.ruoyi.compliancemanagement.model;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.*;
  4 +import lombok.Data;
  5 +import lombok.EqualsAndHashCode;
  6 +import java.io.Serializable;
  7 +import java.util.Date;
  8 +import java.math.BigDecimal;
  9 +
  10 +import java.util.Date;
  11 +import com.fasterxml.jackson.annotation.JsonFormat;
  12 +import com.ruoyi.common.core.domain.BaseEntity;
  13 +import org.springframework.format.annotation.DateTimeFormat;
  14 +
  15 +/**
  16 + * 合规审查对象 tbl_compliance_review
  17 + *
  18 + * @author ruoyi
  19 + * @date 2024-07-22
  20 + */
  21 +@Data
  22 +//@EqualsAndHashCode(callSuper = true)
  23 +//@TableName("tbl_compliance_review")
  24 +public class TblComplianceReviewModel extends BaseEntity {
  25 +
  26 + private static final long serialVersionUID=1L;
  27 +
  28 + /**
  29 + *
  30 + */
  31 + @TableId(value = "id")
  32 + private Long id;
  33 + /**
  34 + * 合同编号
  35 + */
  36 + private String contractno;
  37 + /**
  38 + * 合同名称
  39 + */
  40 + private String contractName;
  41 + /**
  42 + * 合同类型
  43 + */
  44 + private String contractType;
  45 + /**
  46 + * 生效日期
  47 + */
  48 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  49 + @DateTimeFormat(pattern="yyyy-MM-dd")
  50 + private Date effectiveDate;
  51 + /**
  52 + * 到期日期
  53 + */
  54 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  55 + @DateTimeFormat(pattern="yyyy-MM-dd")
  56 + private Date expirationDate;
  57 + /**
  58 + * 甲方
  59 + */
  60 + private String partyA;
  61 + /**
  62 + * 甲方链接地址
  63 + */
  64 + private String partyAAddress;
  65 + /**
  66 + * 乙方
  67 + */
  68 + private String partyB;
  69 + /**
  70 + * 乙方链接地址
  71 + */
  72 + private String partyBAddress;
  73 + /**
  74 + * 签订日期
  75 + */
  76 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  77 + @DateTimeFormat(pattern="yyyy-MM-dd")
  78 + private Date signingDate;
  79 + /**
  80 + * 标的物信息
  81 + */
  82 + private String subjectInformation;
  83 + /**
  84 + * 附件
  85 + */
  86 + private String attachments;
  87 + /**
  88 + * 合同状态：0已完成；1进行中；2已终止；3已解除
  89 + */
  90 + private String status;
  91 +
  92 + private String procInsId;
  93 + private String procDefId;
  94 + private String deployId;
  95 +
  96 +}
1 package com.ruoyi.compliancemanagement.service; 1 package com.ruoyi.compliancemanagement.service;
2 2
3 import com.ruoyi.compliancemanagement.domain.TblComplianceReview; 3 import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
  4 +import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
4 import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo; 5 import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo;
5 import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo; 6 import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
6 import com.ruoyi.common.core.page.TableDataInfo; 7 import com.ruoyi.common.core.page.TableDataInfo;
7 import com.ruoyi.common.core.domain.PageQuery; 8 import com.ruoyi.common.core.domain.PageQuery;
  9 +import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
  10 +import com.ruoyi.compliancemanagement.model.TblContractModel;
8 11
9 import java.util.Collection; 12 import java.util.Collection;
10 import java.util.List; 13 import java.util.List;
@@ -25,7 +28,8 @@ public interface ITblComplianceReviewService { @@ -25,7 +28,8 @@ public interface ITblComplianceReviewService {
25 /** 28 /**
26 * 查询合规审查列表 29 * 查询合规审查列表
27 */ 30 */
28 - TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery); 31 +// TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery);
  32 + TableDataInfo<TblComplianceReviewModel> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery);
29 33
30 /** 34 /**
31 * 查询合规审查列表 35 * 查询合规审查列表
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery; @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
9 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 9 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  10 +import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
10 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
11 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
12 import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo; 13 import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
@@ -42,13 +43,18 @@ public class TblComplianceReviewServiceImpl implements ITblComplianceReviewServi @@ -42,13 +43,18 @@ public class TblComplianceReviewServiceImpl implements ITblComplianceReviewServi
42 /** 43 /**
43 * 查询合规审查列表 44 * 查询合规审查列表
44 */ 45 */
  46 +// @Override
  47 +// public TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) {
  48 +// LambdaQueryWrapper<TblComplianceReview> lqw = buildQueryWrapper(bo);
  49 +// Page<TblComplianceReviewVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
  50 +// return TableDataInfo.build(result);
  51 +// }
45 @Override 52 @Override
46 - public TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) { 53 + public TableDataInfo<TblComplianceReviewModel> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) {
47 LambdaQueryWrapper<TblComplianceReview> lqw = buildQueryWrapper(bo); 54 LambdaQueryWrapper<TblComplianceReview> lqw = buildQueryWrapper(bo);
48 - Page<TblComplianceReviewVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); 55 + Page<TblComplianceReviewModel> result = baseMapper.selectList(pageQuery.build(), bo);
49 return TableDataInfo.build(result); 56 return TableDataInfo.build(result);
50 } 57 }
51 -  
52 /** 58 /**
53 * 查询合规审查列表 59 * 查询合规审查列表
54 */ 60 */
@@ -24,6 +24,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -24,6 +24,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
24 <result property="updateBy" column="update_by"/> 24 <result property="updateBy" column="update_by"/>
25 <result property="updateTime" column="update_time"/> 25 <result property="updateTime" column="update_time"/>
26 </resultMap> 26 </resultMap>
27 -  
28 - 27 + <resultMap type="com.ruoyi.compliancemanagement.model.TblComplianceReviewModel" id="TblComplianceReviewModelResult">
  28 + <result property="id" column="id"/>
  29 + <result property="contractno" column="contractno"/>
  30 + <result property="contractName" column="contract_name"/>
  31 + <result property="contractType" column="contract_type"/>
  32 + <result property="effectiveDate" column="effective_date"/>
  33 + <result property="expirationDate" column="expiration_date"/>
  34 + <result property="partyA" column="party_a"/>
  35 + <result property="partyAAddress" column="party_a_address"/>
  36 + <result property="partyB" column="party_b"/>
  37 + <result property="partyBAddress" column="party_b_address"/>
  38 + <result property="signingDate" column="signing_date"/>
  39 + <result property="subjectInformation" column="subject_information"/>
  40 + <result property="attachments" column="attachments"/>
  41 + <result property="status" column="status"/>
  42 + <result property="createBy" column="create_by"/>
  43 + <result property="createTime" column="create_time"/>
  44 + <result property="updateBy" column="update_by"/>
  45 + <result property="updateTime" column="update_time"/>
  46 + <result property="procInsId" column="proc_ins_id"/>
  47 + <result property="procDefId" column="proc_def_id"/>
  48 + <result property="deployId" column="deploy_id"/>
  49 + </resultMap>
  50 + <select id="selectList" resultMap="TblComplianceReviewModelResult">
  51 + SELECT
  52 + a.id,
  53 + a.contractno,
  54 + a.contract_name,
  55 + a.contract_type,
  56 + a.effective_date,
  57 + a.expiration_date,
  58 + a.party_a,
  59 + a.party_a_address,
  60 + a.party_b,
  61 + a.party_b_address,
  62 + a.signing_date,
  63 + a.subject_information,
  64 + a.attachments,
  65 + a.STATUS,
  66 + a.create_by,
  67 + a.create_time,
  68 + a.update_by,
  69 + a.update_time,
  70 + b.proc_ins_id,
  71 + b.proc_def_id,
  72 + b.deploy_id
  73 + FROM
  74 + tbl_compliance_review a
  75 + LEFT JOIN tbl_business_workflow b ON a.id = b.business_id
  76 + where 1=1
  77 + <if test="qc.contractno!=null and qc.contractno !=''">
  78 + and a.contractno like concat('%',#{qc.contractno},'%')
  79 + </if>
  80 + <if test="qc.contractName!=null and qc.contractName !=''">
  81 + and a.contract_name like concat('%',#{qc.contractName},'%')
  82 + </if>
  83 + <if test="qc.partyA!=null and qc.partyA !=''">
  84 + and a.party_a like concat('%',#{qc.partyA},'%')
  85 + </if>
  86 + <if test="qc.partyB!=null and qc.partyB !=''">
  87 + and a.party_b like concat('%',#{qc.partyB},'%')
  88 + </if>
  89 + order by a.create_time desc
  90 + </select>
29 </mapper> 91 </mapper>