Browse Source

报销开发

anderx 2 years ago
parent
commit
a079bcf710

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

@@ -761,6 +761,12 @@
     <if test=" status != null">
     and b.status = #{status}
     </if>
+    <if test="listStatus ==0">
+     and b.status in(0,1,3)
+    </if>
+    <if test="listStatus ==1">
+      and b.status =2
+    </if>
     <if test=" roleType ==0">
       and b.aid = #{aid}
     </if>
@@ -790,6 +796,12 @@
     <if test=" status != null">
       and b.status = #{status}
     </if>
+    <if test="listStatus ==0">
+      and b.status in(0,1,3)
+    </if>
+    <if test="listStatus ==1">
+      and b.status =2
+    </if>
     <if test=" roleType ==0">
       and b.aid = #{aid}
     </if>

+ 16 - 2
src/main/java/com/goafanti/expenseAccount/bo/ExpenseMainListInput.java

@@ -4,14 +4,28 @@ public class ExpenseMainListInput {
     private Integer pageSize;
     private Integer pageNo;
     /**
-     * @param pageSize 状态 0=草稿,1=审核中,2=完成,3=驳回 ,4=撤销
+     *  状态 0=草稿,1=审核中,2=完成,3=驳回 ,4=撤销
      */
     private Integer status;
+
+
+    /**
+     *  0=进行中,1=已完成
+     */
+    private Integer listStatus;
     /**
-     * @param pageSize 0 自己的主项目 1审核的主项目
+     *  0 自己的主项目 1审核的主项目
      */
     private Integer processStatus;
 
+    public Integer getListStatus() {
+        return listStatus;
+    }
+
+    public void setListStatus(Integer listStatus) {
+        this.listStatus = listStatus;
+    }
+
     public Integer getProcessStatus() {
         return processStatus;
     }

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

@@ -749,6 +749,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 in.setProcessStatus(0);
             }
         }
+        if (in.getListStatus()!=null) params.put("listStatus",in.getListStatus());
         if (in.getProcessStatus()!=null){
             params.put("aid",TokenManager.getAdminId());
             params.put("roleType",in.getProcessStatus());