Browse Source

报销列表新增整个报销统计金额

anderx 2 years ago
parent
commit
43eff4107c

+ 1 - 1
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -27,7 +27,7 @@ public interface ExpenseAccountMapper {
 
     List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid,@Param("depId")String depId, @Param("type")Integer type);
 
-    List<OutMyEAStatistics> selectStatistics(@Param("aid") String aid, @Param("depId") String depId,
+    List<OutMyEAStatistics> selectStatistics(@Param("name") String name, @Param("depId") String depId,
                                              @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<ExpenseAccount> selectByDebitId(Integer debitId);

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -525,8 +525,8 @@
     from expense_account a
     left join expense_account a2 on a.debit_id =a2.id left join admin ad on a.aid=ad.id
     where 1=1
-    <if test="aid != null">
-      and a.aid like concat('%',#{aid},'%')
+    <if test="name != null">
+      and a.aname like concat('%',#{name},'%')
     </if>
     <if test="depId != null">
       and ad.department_id = #{depId}

+ 4 - 4
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -578,11 +578,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         if (in.getStatus()!=null)param.put("status",in.getStatus());
         if (in.getProcessStatus()==null){
+            param.put("processStatus",0);
+        }else {
             if(!PurviewUtils.superPurview()){
-                param.put("processStatus",0);
+                param.put("processStatus",in.getProcessStatus());
             }
-        }else {
-            param.put("processStatus",in.getProcessStatus());
         }
         if (in.getExamineStatus()!=null){
             param.put("examineStatus",in.getExamineStatus());
@@ -687,7 +687,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
     @Override
-    @CacheEvict(value = "expenseAccountStatistics#300", key = "'page:'+#name+',depId'+#depId+',startTime'+#startTime+',endTime'+#endTime")
+    @CacheEvict(value = "expenseAccountStatistics#300", allEntries = true)
     public void statisticsEvict(String name, String depId, String startTime, String endTime) {
         LoggerUtils.debug(getClass(), "报销统计清楚缓存。");
     }