1.大中型归档查询新增条件

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -222,6 +222,12 @@
         <if test="done!=null and done.endDate!=null and done.endDate!=''">
             and mp.save_file_date &lt;= #{done.endDate}
         </if>
+        <if test="done!=null and done.hasCommission == true">
+            and pf.real_amount > 0
+        </if>
+        <if test="done!=null and done.hasCommission == false">
+            and (pf.real_amount IS NULL OR pf.real_amount = 0)
+        </if>
         order by mp.save_file_date desc
     </select>
 

domain/src/main/java/com/dayou/vo/MajorProductionSaveDoneVO.java

@@ -77,4 +77,9 @@ public class MajorProductionSaveDoneVO {
     private String startDate;
 
     private String endDate;
+
+    /**
+     * 是否提成
+     */
+    private Boolean hasCommission;
 }