Browse Source

新增我的与审核切换

anderx 1 year ago
parent
commit
f6301ff290

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

@@ -523,6 +523,9 @@
         and a.process_status> 1
         and a.status in (1,2)
       </if>
+      <if test="roleType ==1">
+        and a.aid =#{auditor}
+      </if>
       <if test="examineStatus ==1">
       and a.process_status= 2
         and a.status=1

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

@@ -48,10 +48,22 @@ public class InputPageListBo {
     private String checkNo;
     private Integer expenseMain;
     private Integer secondaryType;
+    /**
+     * 0查看审核  1查看自己
+     */
+    private Integer roleType;
 
     private Integer pageNo;
     private Integer pageSize;
 
+    public Integer getRoleType() {
+        return roleType;
+    }
+
+    public void setRoleType(Integer roleType) {
+        this.roleType = roleType;
+    }
+
     public Integer getSecondaryType() {
         return secondaryType;
     }

+ 6 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1656,14 +1656,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
              param.put("auditor",TokenManager.getAdminId());
          }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
              //0 设置为财务查看
-             param.put("roleType",0);
+
              param.put("auditor",TokenManager.getAdminId());
              //如果是空设置为
              if (in.getProcessStatus()==null)in.setProcessStatus(2);
          }else {
-            //如果不是特定角色就只看自己的
             in.setProcessStatus(0);
         }
+         if (in.getRoleType()==null){
+             param.put("roleType",0);
+         }else {
+             param.put("roleType",in.getRoleType());
+         }
          if(in.getProcessStatus()==2||in.getProcessStatus()==1){
                 if (in.getAid()!=null){
                     param.put("aid",in.getAid());