Browse Source

新增我的与审核切换

anderx 1 year ago
parent
commit
c043bd0c46

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

@@ -1002,6 +1002,9 @@
       </foreach>
     </if>
     <if test="roleType ==1">
+      and a.aid = #{current}
+    </if>
+    <if test="roleType ==1">
       and dep.expense_finance_id = #{current}
     </if>
     <if test="roleType ==2">

+ 12 - 0
src/main/java/com/goafanti/expenseAccount/bo/InputDetailsListBo.java

@@ -4,6 +4,10 @@ public class InputDetailsListBo {
     private Integer pageSize;
     private Integer pageNo;
     /**
+     * 0 明细查看表 1我的明细表
+     */
+    private Integer myType;
+    /**
      * 状态 0=草稿,1=审核中,2=完成,3=驳回 ,4=撤销
      */
     private Integer status;
@@ -49,6 +53,14 @@ public class InputDetailsListBo {
      */
     private String checkNo;
 
+    public Integer getMyType() {
+        return myType;
+    }
+
+    public void setMyType(Integer myType) {
+        this.myType = myType;
+    }
+
     public Integer getPageSize() {
         return pageSize;
     }

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

@@ -1536,12 +1536,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getStartTime()!=null)params.put("startTime",in.getStartTime());
         if (in.getEndTime()!=null)params.put("endTime",in.getEndTime());
         if (in.getCheckNo()!=null)params.put("checkNo",in.getCheckNo());
+        params.put("current",TokenManager.getAdminId());
+        if (in.getMyType()!=null){
+            params.put("myType",in.getMyType());
+        }else {
+            params.put("myType",0);
+        }
         //0=自己 1=财务 2=财务经理 3=超管
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
             params.put("roleType",3);
         }else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
             params.put("roleType",2);
-            params.put("current",TokenManager.getAdminId());
+
         }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
             params.put("roleType",1);
             params.put("current",TokenManager.getAdminId());