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 ff75c0af..4cfe2321 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 @@ -122,6 +122,12 @@ public class BmAgreementInfo extends BaseEntity @ApiModelProperty(value = "关键词") private String keyWord; + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + @ApiModelProperty(value = "附件列表") private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index e0bd3477..fb892c2a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -114,6 +114,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { tmTaskAgreement.setCreateBy(SecurityUtils.getUsername()); tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement); tmTaskRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId()); + tmTaskRequestVo.getLeaseApplyInfo().setCode(taskCode); int count = leaseApplyInfoMapper.insertLeaseApplyInfo(tmTaskRequestVo.getLeaseApplyInfo()); if (count > 0) { return insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId()); 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 ac7afa70..0c8b8087 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 @@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where bai.status = '1' and (bai.contract_code like concat('%', #{keyWord}, '%') or + bai.agreement_code like concat('%', #{keyWord}, '%') or auth_person like concat('%', #{keyWord}, '%') or phone like concat('%', #{keyWord}, '%')) + + + + + AND bai.`status` = #{status} + and bai.agreement_code like concat('%', #{agreementCode}, '%')