Browse Source

财务经理先做于财务同等权限

anderx 2 years ago
parent
commit
d143136150

+ 2 - 22
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -860,7 +860,7 @@
       left join department dep2 on b.pay_dep =dep2.id left join t_order_new o on b.order_no =o.order_no
       left join admin ad on b.aid=ad.id
       left join department adDep on ad.department_id=adDep.id
-    <if test="roleType == 1">
+    <if test="roleType > 0">
       inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
       where auditor= #{aid} group by eaid) eae on b.id=eae.eaid
     </if>
@@ -889,7 +889,7 @@
         and b.status =2
       </if>
     </if>
-    <if test="roleType == 1">
+    <if test="roleType > 0">
       <if test="listStatus ==0">
         and b.process_status =eae.type
       </if>
@@ -897,26 +897,6 @@
         and b.process_status &gt; eae.type
       </if>
     </if>
-    <if test="roleType == 3">
-      <if test="listStatus ==0">
-        and b.process_status =3
-      </if>
-      <if test="listStatus ==1">
-        and b.process_status &gt; 3
-      </if>
-      and adDep.finance_id = #{aid}
-    </if>
-    <if test="roleType == 5">
-      <if test="listStatus ==0">
-        and b.process_status =5 and b.status=1
-      </if>
-      <if test="listStatus ==1">
-        and b.process_status =5 and b.status=2
-      </if>
-    </if>
-    <if test="roleType == 5">
-      and adDep.finance_id  in (select id from admin where superior_id = #{aid})
-    </if>
     <if test="startTime !=null and endTime !=null ">
       and b.create_time between #{startTime} and #{endTime}
     </if>

+ 13 - 23
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -498,20 +498,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             //添加后续流程
             addExpenseAccountExamineFollow(in);
             List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
-            if(newEa.getProcessStatus()==4){
+            if(newEa.getProcessStatus()==8){
                 //完成后的流程
                 status =2;
-//                Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
-//                //同事添加通知财务管理员与公司副总
-//                List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.FINANCE_ADMIN);
-//                aids.addAll(admins);
-//                List<Admin> viceCEO = adminMapper.selectAdminByRoleType(AFTConstants.VICE_CEO);
-//                aids.addAll(viceCEO);
-//                aids.add(finaceAdmin);
-//                str.setLength(0);
-//                str=str.append("报销编号[").append(in.getCheckNo()).append("]审核已通过,请注意查看。");
-//                addNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
-//                aids.clear();
                 aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
                 newEa.setStatus(status);
                 newEa.setExamineName("");
@@ -527,8 +516,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 }
                 newEa.setExamineName(aname.substring(0,aname.length()-1));
             }
-
-
         }else {
             aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
             newEa.setStatus(3);
@@ -831,17 +818,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         //1-3s是不同人的审核
         if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
-             if (TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
-                in.setProcessStatus(3);
-            }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
-                in.setProcessStatus(1);
-            }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
+             if (TokenManager.hasRole(AFTConstants.FINANCE)){
+                 in.setProcessStatus(3);
+             }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
                 in.setProcessStatus(4);
-            }else if(false){
-                //先不做财务查看权限
+            }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+                 in.setProcessStatus(1);
+             }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
+                 in.setProcessStatus(2);
+            }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
                 in.setProcessStatus(5);
-            }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
-                //财务管理员和超级管理员查看全部
+            }else if(TokenManager.hasRole(AFTConstants.VICE_CEO)){
+                //先不做财务查看权限
+                in.setProcessStatus(7);
+            }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
                 in.setProcessStatus(6);
             }
         }else {