Merge branch 'lc20240816'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java

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

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml

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