大中型实收款和结算页面添加部门搜索

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

@@ -169,6 +169,9 @@
             <if test="majorStat!=null and majorStat.financial!=null ">
                 and m.financial = #{majorStat.financial}
             </if>
+            <if test="majorStat!=null and majorStat.evaluateDepartmentName!=null and majorStat.evaluateDepartmentName!='' ">
+                and d.name = #{majorStat.evaluateDepartmentName}
+            </if>
         </where>
 
     </sql>

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

@@ -473,6 +473,9 @@
                 AND (select IF
                 ( fc.claim_datetime > mp.save_file_date, fc.claim_datetime, mp.save_file_date )) <= #{settleVO.endDate}
             </if>
+            <if test="settleVO!=null and settleVO.evaluateDepartmentName!=null and settleVO.evaluateDepartmentName!=''">
+                and d.name = #{settleVO.evaluateDepartmentName}
+            </if>
         </where>
         order by fc.claim_datetime ASC
     </sql>

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

@@ -159,6 +159,8 @@ public class RealFundMajorStatVO {
 
     private String payEndDate;
 
+    private String evaluateDepartmentName;
+
 
 
 

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

@@ -99,7 +99,4 @@ public class SettleMajorProductionVO {
     private String members;
 
 
-
-
-
 }