bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
syruan 2024-11-13 13:57:20 +08:00
parent 9886edfc1a 8372096fb9
commit b7eeee7bef
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java
View File

@ -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<BmFileInfo> bmFileInfos;
}

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -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());

7
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml
View File

@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where bai.status = '1'
<if test="keyWord != null and keyWord != ''">
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}, '%'))
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[ AND DATE_FORMAT( bai.plan_start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="status != null and status != ''">
AND bai.`status` = #{status}
</if>
<if test="agreementCode != null and agreementCode != ''">
and bai.agreement_code like concat('%', #{agreementCode}, '%')
</if>