Ver código fonte

修改报销查看列表审核状态搜索BUG

anderx 2 anos atrás
pai
commit
9a3dbb5644

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

@@ -373,6 +373,12 @@
     where 1=1
       <if test="processStatus ==2">
         and a.process_status>0
+        <if test="examineStatus ==0">
+          and a.status=1
+        </if>
+        <if test="examineStatus ==1">
+          and a.status=2
+        </if>
       </if>
     <if test=" aid !=null">
     and a.aid= #{aid}
@@ -428,6 +434,12 @@
     where 1=1
     <if test="processStatus ==2">
       and a.process_status>0
+      <if test="examineStatus ==0">
+        and a.status=1
+      </if>
+      <if test="examineStatus ==1">
+        and a.status=2
+      </if>
     </if>
     <if test=" aid !=null">
       and a.aid= #{aid}
@@ -479,6 +491,12 @@
     where 1=1
     <if test="processStatus ==2">
       and a.process_status>0
+      <if test="examineStatus ==0">
+        and a.status=1
+      </if>
+      <if test="examineStatus ==1">
+        and a.status=2
+      </if>
     </if>
     <if test=" aid !=null">
       and a.aid= #{aid}

+ 3 - 0
src/main/java/com/goafanti/expenseAccount/bo/InputPageListBo.java

@@ -3,8 +3,11 @@ package com.goafanti.expenseAccount.bo;
 public class InputPageListBo {
     private String startTime;
     private String endTime;
+//    状态 0=草稿,1=审核中,2=完成,3=驳回
     private Integer status;
+//    审核状态 0审核中  1已审核
     private Integer examineStatus;
+//    查询人员 0自己 1审核 2查看
     private Integer processStatus;
 
     //同编号搜索、按客户名称搜索 、按部门/公司搜索 、按报销类型搜索、按报销公司部门/公司、按支付部门/公司搜索、按审核状态(财务审核中-不同人员针对的审核状态不一样、已完成)、报销时间(按报销的时间段进行搜索)