修改问题

qianhe-ydsj/src/main/java/com/qianhe/domain/SjZdbfZsdwkhpjZb.java

@@ -166,8 +166,20 @@ public class SjZdbfZsdwkhpjZb extends BaseEntity
 //    @Excel(name = "预留5")
 //    @Excel(name = "预留5")
     private String yl5;
     private String yl5;
 
 
+    /**
+     * 得分查询条件
+     */
 
 
     private BigDecimal df;
     private BigDecimal df;
 
 
+    /**
+     * 扣分比例查询条件
+     */
+    private BigDecimal kfbl;
+
+    /**
+     * 否决项
+     */
+    private BigDecimal fjx;
 
 
 }
 }

qianhe-ydsj/src/main/resources/mapper/SjZdbfZsdwkhpjZbMapper.xml

@@ -136,6 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
             <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
             <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
             <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
             <if test="df != null "> and zdf &lt;= #{df}</if>
             <if test="df != null "> and zdf &lt;= #{df}</if>
+            <if test="kfbl != null "> and zkfbl >= #{kfbl}</if>
+            <if test="fjx != null and fjx.toString()='1'.toString() "> and sffjxs >= #{fjx}</if>
+            <if test="fjx != null and fjx.toString()='0'.toString() "> and sffjxs = #{fjx}</if>
             <!-- 数据范围过滤 -->
             <!-- 数据范围过滤 -->
             ${params.dataScope}
             ${params.dataScope}
         </where>
         </where>