Browse Source

主要列表接口修改

anderx 2 years ago
parent
commit
50c12d8f4f

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

@@ -390,6 +390,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         ExpenseAccount useEa = expenseAccountMapper.selectByPrimaryKey(in.getId());
         ExpenseAccount newEa=new ExpenseAccount();
         newEa.setId(useEa.getId());
+        in.setCheckNo(useEa.getCheckNo());
         //审核通知 获取发送人
         AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
         addExamineExpenseAccountLog(admin,in, useEa, newEa);
@@ -503,7 +504,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         Integer status=in.getStatus();
 
         if (status==1){
-            str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
+            str=str.append("您有报销需要审核,").append("报销编号[").append(in.getCheckNo()).append("]").append(",请查看并审核。");
             //新的流程是当前流程+1
             newEa.setProcessStatus(useEa.getProcessStatus()+1);
             newEa.setAid(useEa.getAid());
@@ -535,7 +536,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 aids.addAll(viceCEO);
                 aids.add(finaceAdmin);
                 str.setLength(0);
-                str=str.append("报销编号[").append(in.getId()).append("]审核已通过,请注意查看。");
+                str=str.append("报销编号[").append(in.getCheckNo()).append("]审核已通过,请注意查看。");
                 addNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
                 aids.clear();
                 aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
@@ -548,7 +549,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             newEa.setStatus(3);
             newEa.setProcessStatus(0);
             str.setLength(0);
-            str=str.append("您的报销审核已驳回,报销编号[").append(in.getId()).append("],请注意查看。");
+            str=str.append("您的报销审核已驳回,报销编号[").append(in.getCheckNo()).append("],请注意查看。");
         }
         if (newEa.getStatus()==null)newEa.setStatus(1);
         addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
@@ -706,7 +707,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Object selectByCheckNo(String checkNo) {
         OutExpenseAccount useEa = expenseAccountMapper.selectByCheckNo(checkNo);
         if (useEa.getProcessStatus()<3){
-            throw  new BusinessException("");
+            throw  new BusinessException("报销单财务未审核,不可以根据编号查看打印。");
         }
         return useEa;
     }
@@ -1010,7 +1011,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
              if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
                  //财务经理查看权限
                  in.setProcessStatus(5);
-             }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+             }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+                     TokenManager.hasRole(AFTConstants.VICE_CEO)
+             ){
                  //财务管理员和超级管理员查看全部
                  in.setProcessStatus(6);
              }