Compare commits

..

No commits in common. "17f52add1125897ce2c401d4074cfd3a31a9709b" and "6ef5b3693ac4e700c919b01837d29f80fbf194a9" have entirely different histories.

2 changed files with 4 additions and 4 deletions

View File

@ -134,6 +134,8 @@ public class AgreementInfo extends BaseEntity {
private Integer protocol; private Integer protocol;
@ApiModelProperty(value = "结算总费用") @ApiModelProperty(value = "结算总费用")
private String cost; private String cost;
@ApiModelProperty(value = "结算状态")
private String sltStatus;
@ApiModelProperty(value = "费用承担方(01项目,03分包)") @ApiModelProperty(value = "费用承担方(01项目,03分包)")
private String costBearingParty; private String costBearingParty;
private String codeNum; private String codeNum;
@ -141,8 +143,6 @@ public class AgreementInfo extends BaseEntity {
* 是否结算 * 是否结算
*/ */
private Integer isSlt; private Integer isSlt;
@ApiModelProperty(value = "结算状态")
private Integer sltStatus;
/** /**
* 导出选中列表 * 导出选中列表

View File

@ -131,8 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null and projectId != ''"> <if test="projectId != null and projectId != ''">
and bp.lot_id = #{projectId} and bp.lot_id = #{projectId}
</if> </if>
<if test="sltStatus != null"> <if test="isSlt != null">
and bai.is_slt = #{sltStatus} and bai.is_slt = #{isSlt}
</if> </if>
ORDER BY bai.agreement_id desc ORDER BY bai.agreement_id desc
</select> </select>