Browse Source

报销详情修改

anderx 2 years ago
parent
commit
e89286d00e
1 changed files with 16 additions and 12 deletions
  1. 16 12
      src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

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

@@ -471,31 +471,35 @@
   </select>
   <sql id="selectExpenseAccountSql">
     where 1=1 and a.status &lt; 4
-    <if test="processStatus ==2">
-      and a.process_status>=0
+    <if test="processStatus ==1">
+      and a.process_status>0
       <if test="examineStatus ==1">
-        and a.status=1
+        and a.process_status =eae.`type`
       </if>
       <if test="examineStatus ==2">
-        and a.status=2
+        and a.process_status >eae.`type`
       </if>
     </if>
-    <if test=" aid !=null">
-      and a.aid= #{aid}
-    </if>
-    <if test="processStatus ==1">
-      and a.process_status>0
+    <if test="processStatus ==2">
       <if test="examineStatus ==0">
-        and a.process_status =eae.`type`
+        and a.process_status> 1
+        and a.status in (1,2)
       </if>
       <if test="examineStatus ==1">
-        and a.process_status >eae.`type`
+      and a.process_status> 1
+        and a.status=1
+      </if>
+      <if test="examineStatus ==2">
+        and a.process_status> 2
+        and a.status in (1,2)
       </if>
     </if>
     <if test="processStatus ==5">
       and f.finance_id in (select id from admin where superior_id = #{auditor})
     </if>
-
+    <if test=" aid !=null">
+      and a.aid= #{aid}
+    </if>
     <if test="status != null">
       and a.status= #{status}
     </if>