Browse Source

阿米巴开发

anderx 3 years ago
parent
commit
4d0a951731

+ 19 - 0
src/main/java/com/goafanti/ambSystem/bo/InputAmb.java

@@ -82,6 +82,14 @@ public class InputAmb extends AmbSystem {
     @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
     private String financeId;
 
+
+    /**
+     * 会计id
+     */
+    @Param(name="会计负责人")
+    @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR+"}")
+    private String accountant;
+
     /**
      * 祖级名称
      */
@@ -90,6 +98,17 @@ public class InputAmb extends AmbSystem {
     private Integer pageNo;
     private Integer pageSize;
 
+
+    @Override
+    public String getAccountant() {
+        return accountant;
+    }
+
+    @Override
+    public void setAccountant(String accountant) {
+        this.accountant = accountant;
+    }
+
     public Integer getPageNo() {
         return pageNo;
     }

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

@@ -234,9 +234,12 @@
     left join admin c on a.finance_id =c.id
     left join admin d on a.accountant =d.id
     where a.status=0
-    <if test="lvl !=null">
+    <if test="lvl &lt; 5">
       and a.lvl= #{lvl}
     </if>
+    <if test="lvl &gt; 4">
+      and a.lvl in(5,6)
+    </if>
     <if test="leader !=null">
       and a.leader= #{leader}
     </if>
@@ -258,9 +261,12 @@
     left join admin b on a.leader =b.id
     left join admin c on a.finance_id =c.id
     where a.status=0
-    <if test="lvl !=null">
+    <if test="lvl &lt; 5">
       and a.lvl= #{lvl}
     </if>
+    <if test="lvl &gt; 4">
+      and a.lvl in(5,6)
+    </if>
     <if test="leader !=null">
       and a.leader= #{leader}
     </if>