作者 张晓杰

合规审查

... ... @@ -7,9 +7,11 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
import com.ruoyi.compliancemanagement.domain.TblContract;
import com.ruoyi.compliancemanagement.domain.bo.TblBusinessWorkflowBo;
import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
import com.ruoyi.compliancemanagement.service.ITblBusinessWorkflowService;
import com.ruoyi.workflow.service.IWfProcessService;
import lombok.RequiredArgsConstructor;
... ... @@ -56,7 +58,7 @@ public class TblComplianceReviewController extends BaseController {
*/
@SaCheckPermission("compliancemanagement:complianceReview:list")
@GetMapping("/list")
public TableDataInfo<TblComplianceReviewVo> list(TblComplianceReviewBo bo, PageQuery pageQuery) {
public TableDataInfo<TblComplianceReviewModel> list(TblComplianceReviewBo bo, PageQuery pageQuery) {
return iTblComplianceReviewService.queryPageList(bo, pageQuery);
}
... ... @@ -100,7 +102,7 @@ public class TblComplianceReviewController extends BaseController {
@PostMapping()
public R<Void> addAndStart(
@Validated(AddGroup.class) @RequestBody TblComplianceReviewBo bo) {
String procDefId = "Process_1721285503125:1:c39932d2-4808-11ef-bb1d-421c839c76ba";
String procDefId = "Process_1721285503125:1:020637e9-489a-11ef-a90d-421c839c76ba";
iTblComplianceReviewService.insertByBo(bo);
Long id = bo.getId();
if (id > 0 || id != null){
... ... @@ -139,7 +141,7 @@ public class TblComplianceReviewController extends BaseController {
tblBusinessWorkflowBo.setProcInsId(processInstance.getProcessInstanceId());
tblBusinessWorkflowBo.setProcDefId(procDefId);
tblBusinessWorkflowBo.setDeployId(processInstance.getDeploymentId());
TableName table = TblContract.class.getAnnotation(TableName.class);
TableName table = TblComplianceReview.class.getAnnotation(TableName.class);
tblBusinessWorkflowBo.setTableName(table.value());
iTblBusinessWorkflowService.insertByBo(tblBusinessWorkflowBo);
}
... ...
... ... @@ -111,7 +111,7 @@ public class TblContractController extends BaseController {
public R<Void> addAndStart(
@Validated(AddGroup.class) @RequestBody TblContractBo bo) {
// Matter matter = new Matter();
String procDefId = "Process_18tcmzu:1:040fd586-433c-11ef-b955-421c839c76ba";
String procDefId = "Process_1721195856340:1:7aca8265-489a-11ef-a778-421c839c76ba";
iTblContractService.insertByBo(bo);
Long id = bo.getId();
//Long id = sLeaveService.create(studentLeave,matterKey);
... ...
package com.ruoyi.compliancemanagement.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
import com.ruoyi.compliancemanagement.model.TblContractModel;
import org.apache.ibatis.annotations.Param;
/**
* 合规审查Mapper接口
... ... @@ -11,5 +17,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @date 2024-07-22
*/
public interface TblComplianceReviewMapper extends BaseMapperPlus<TblComplianceReviewMapper, TblComplianceReview, TblComplianceReviewVo> {
Page<TblComplianceReviewModel> selectList(Page<TblComplianceReviewModel> page, @Param("qc") TblComplianceReviewBo complianceReviewBo);
}
... ...
package com.ruoyi.compliancemanagement.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 合规审查对象 tbl_compliance_review
*
* @author ruoyi
* @date 2024-07-22
*/
@Data
//@EqualsAndHashCode(callSuper = true)
//@TableName("tbl_compliance_review")
public class TblComplianceReviewModel extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 合同编号
*/
private String contractno;
/**
* 合同名称
*/
private String contractName;
/**
* 合同类型
*/
private String contractType;
/**
* 生效日期
*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date effectiveDate;
/**
* 到期日期
*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date expirationDate;
/**
* 甲方
*/
private String partyA;
/**
* 甲方链接地址
*/
private String partyAAddress;
/**
* 乙方
*/
private String partyB;
/**
* 乙方链接地址
*/
private String partyBAddress;
/**
* 签订日期
*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date signingDate;
/**
* 标的物信息
*/
private String subjectInformation;
/**
* 附件
*/
private String attachments;
/**
* 合同状态:0已完成;1进行中;2已终止;3已解除
*/
private String status;
private String procInsId;
private String procDefId;
private String deployId;
}
... ...
package com.ruoyi.compliancemanagement.service;
import com.ruoyi.compliancemanagement.domain.TblComplianceReview;
import com.ruoyi.compliancemanagement.domain.bo.TblContractBo;
import com.ruoyi.compliancemanagement.domain.vo.TblComplianceReviewVo;
import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
import com.ruoyi.compliancemanagement.model.TblContractModel;
import java.util.Collection;
import java.util.List;
... ... @@ -25,7 +28,8 @@ public interface ITblComplianceReviewService {
/**
* 查询合规审查列表
*/
TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery);
// TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery);
TableDataInfo<TblComplianceReviewModel> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery);
/**
* 查询合规审查列表
... ...
... ... @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.compliancemanagement.model.TblComplianceReviewModel;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.compliancemanagement.domain.bo.TblComplianceReviewBo;
... ... @@ -42,13 +43,18 @@ public class TblComplianceReviewServiceImpl implements ITblComplianceReviewServi
/**
* 查询合规审查列表
*/
// @Override
// public TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) {
// LambdaQueryWrapper<TblComplianceReview> lqw = buildQueryWrapper(bo);
// Page<TblComplianceReviewVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// return TableDataInfo.build(result);
// }
@Override
public TableDataInfo<TblComplianceReviewVo> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) {
public TableDataInfo<TblComplianceReviewModel> queryPageList(TblComplianceReviewBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TblComplianceReview> lqw = buildQueryWrapper(bo);
Page<TblComplianceReviewVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Page<TblComplianceReviewModel> result = baseMapper.selectList(pageQuery.build(), bo);
return TableDataInfo.build(result);
}
/**
* 查询合规审查列表
*/
... ...
... ... @@ -24,6 +24,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<resultMap type="com.ruoyi.compliancemanagement.model.TblComplianceReviewModel" id="TblComplianceReviewModelResult">
<result property="id" column="id"/>
<result property="contractno" column="contractno"/>
<result property="contractName" column="contract_name"/>
<result property="contractType" column="contract_type"/>
<result property="effectiveDate" column="effective_date"/>
<result property="expirationDate" column="expiration_date"/>
<result property="partyA" column="party_a"/>
<result property="partyAAddress" column="party_a_address"/>
<result property="partyB" column="party_b"/>
<result property="partyBAddress" column="party_b_address"/>
<result property="signingDate" column="signing_date"/>
<result property="subjectInformation" column="subject_information"/>
<result property="attachments" column="attachments"/>
<result property="status" column="status"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="procInsId" column="proc_ins_id"/>
<result property="procDefId" column="proc_def_id"/>
<result property="deployId" column="deploy_id"/>
</resultMap>
<select id="selectList" resultMap="TblComplianceReviewModelResult">
SELECT
a.id,
a.contractno,
a.contract_name,
a.contract_type,
a.effective_date,
a.expiration_date,
a.party_a,
a.party_a_address,
a.party_b,
a.party_b_address,
a.signing_date,
a.subject_information,
a.attachments,
a.STATUS,
a.create_by,
a.create_time,
a.update_by,
a.update_time,
b.proc_ins_id,
b.proc_def_id,
b.deploy_id
FROM
tbl_compliance_review a
LEFT JOIN tbl_business_workflow b ON a.id = b.business_id
where 1=1
<if test="qc.contractno!=null and qc.contractno !=''">
and a.contractno like concat('%',#{qc.contractno},'%')
</if>
<if test="qc.contractName!=null and qc.contractName !=''">
and a.contract_name like concat('%',#{qc.contractName},'%')
</if>
<if test="qc.partyA!=null and qc.partyA !=''">
and a.party_a like concat('%',#{qc.partyA},'%')
</if>
<if test="qc.partyB!=null and qc.partyB !=''">
and a.party_b like concat('%',#{qc.partyB},'%')
</if>
order by a.create_time desc
</select>
</mapper>
... ...