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

未结算报表添加筛选状态

This commit is contained in:
hongchao 2025-11-20 09:09:42 +08:00
parent 28590dd4d0
commit ce15fd7cce
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -1717,6 +1717,7 @@ public class SltAgreementInfoController extends BaseController {
// 查询每个协议的各项费用明细 // 查询每个协议的各项费用明细
SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info); SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info);
vo.setIsFinish(info.getIsFinish());
if (vo != null && !ObjectUtil.isEmpty(vo)) { if (vo != null && !ObjectUtil.isEmpty(vo)) {
vo.setAgreementId(info.getAgreementId()); vo.setAgreementId(info.getAgreementId());
vo.setAgreementCode(info.getAgreementCode()); vo.setAgreementCode(info.getAgreementCode());
@ -1793,6 +1794,7 @@ public class SltAgreementInfoController extends BaseController {
// 查询每个协议的各项费用明细 // 查询每个协议的各项费用明细
SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info); SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info);
vo.setIsFinish(info.getIsFinish());
if (vo != null) { if (vo != null) {
vo.setAgreementId(info.getAgreementId()); vo.setAgreementId(info.getAgreementId());
vo.setAgreementCode(info.getAgreementCode()); vo.setAgreementCode(info.getAgreementCode());

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
View File

@ -282,4 +282,7 @@ public class SltAgreementInfo extends BaseEntity {
@ApiModelProperty(value = "签字类型") @ApiModelProperty(value = "签字类型")
private String signType; private String signType;
/** 工程是否竣工 */
@ApiModelProperty(value = "工程是否竣工")
private Integer isFinish;
} }

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java
View File

@ -161,4 +161,9 @@ public class SltInfoVo {
/** 签字类型 */ /** 签字类型 */
@ApiModelProperty(value = "签字类型") @ApiModelProperty(value = "签字类型")
private long signType; private long signType;
/** 工程是否竣工 */
@ApiModelProperty(value = "工程是否竣工")
@Excel(name = "工程是否竣工",readConverterExp = "0=未竣工,1=已竣工")
private Integer isFinish;
} }

12
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -929,7 +929,11 @@
WHEN saa.status = '2' THEN '2' WHEN saa.status = '2' THEN '2'
WHEN saa.status = '3' THEN '3' WHEN saa.status = '3' THEN '3'
ELSE '0' ELSE '0'
END as sltStatus END as sltStatus,
CASE
WHEN bp.actual_end_date is not null THEN '1'
ELSE '0'
END as isFinish
FROM bm_agreement_info bai FROM bm_agreement_info bai
INNER JOIN bm_unit bui ON bui.unit_id = bai.unit_id AND bui.type_id != '1731' INNER JOIN bm_unit bui ON bui.unit_id = bai.unit_id AND bui.type_id != '1731'
LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
@ -957,6 +961,12 @@
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
AND bp.pro_name LIKE CONCAT('%', #{projectName}, '%') AND bp.pro_name LIKE CONCAT('%', #{projectName}, '%')
</if> </if>
<if test="isFinish != null and isFinish == 1">
AND bp.actual_end_date is not null
</if>
<if test="isFinish != null and isFinish == 0">
AND bp.actual_end_date is null
</if>
ORDER BY bai.create_time DESC ORDER BY bai.create_time DESC
</select> </select>