diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java index 512f024e..1c763f7c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java @@ -106,5 +106,6 @@ public class BmAgreementInfo extends BaseEntity @Excel(name = "是否结算", readConverterExp = "0=,结=算中,1=已结算") private Long isSlt; - + @ApiModelProperty(value = "关键词") + private String keyWord; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml index c155daec..ecf6b6e7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml @@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" auth_person like concat('%', #{keyWord}, '%') or phone like concat('%', #{keyWord}, '%')) - and bai.agreement_code like concat('%', #{agreementCode}, '%') @@ -51,12 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_id = #{projectId} - - AND bai.agreement_id in - - #{agreementId} - - ORDER BY bai.agreement_id DESC