Browse Source

修改财务总监同时监管财务专员查看BUG

anderx 1 year ago
parent
commit
88819cd901

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountLogMapper.xml

@@ -123,7 +123,7 @@
 
     <select id="selectByEaid" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountLog">
     select a.id,a.eaid ,a.status ,a.remarks ,a.auditor ,b.name auditorName,a.process_status processStatus,
-           date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.create_time createTime
+           date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,a.create_time createTime,a.show_status showStatus
     from expense_account_log a left join admin b on a.auditor =b.id
     where a.eaid= #{eaid}
     order by a.create_time,process_status

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

@@ -936,7 +936,7 @@
     select mea.check_no checkNo ,ead.`type`,ead.type_other typeOther,
            ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
     a.id sonId,a.type sonType ,a.type_other sonTypeOther ,
-    dep2.name payDepName ,a.aname ,ad2.name financeName,a.status ,mea.process_status processStatus ,mea.id mainId,mea.target_type targetType,
+    dep2.name payDepName ,a.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,mea.target_type targetType,
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id

+ 3 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -298,7 +298,9 @@ public class ExpenseAccountController extends CertifyApiController {
     public Result statistics(String name,String depId,String startTime,String endTime) {
         Result res = new Result();
         String lander = null;
-        if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+        if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
+            lander=null;
+        }else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
             lander = TokenManager.getAdminId();
         }
         res.setData(expenseAccountService.statistics(name, depId, startTime, endTime, lander));

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

@@ -1196,19 +1196,19 @@ 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)){
-                 in.setProcessStatus(1);
-             }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
-                 in.setProcessStatus(2);
+            if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
+                in.setProcessStatus(6);
             }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
                 in.setProcessStatus(5);
             }else if(TokenManager.hasRole(AFTConstants.VICE_CEO)){
                 //先不做财务查看权限
                 in.setProcessStatus(7);
-            }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
-                in.setProcessStatus(6);
+            }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.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
+                in.setProcessStatus(3);
             }
         }else {
                 in.setProcessStatus(0);
@@ -1253,7 +1253,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getEndTime()!=null)params.put("endTime",in.getEndTime());
         if (in.getCheckNo()!=null)params.put("checkNo",in.getCheckNo());
         //0=自己 1=财务 2=财务经理 3=超管
-        if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+        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);