Przeglądaj źródła

管理员审核信息列表接口修改

anderx 9 miesięcy temu
rodzic
commit
3e5d1d6534

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

@@ -1005,7 +1005,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
             }else {
                 //小于为固定单审核,大于可能被配置多人审核
-                if (useEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
+                if (useEa.getProcessStatus().equals(EAProcessStatus.BMFZRSH.getCode())||
+                        useEa.getProcessStatus().equals(EAProcessStatus.CWSH.getCode())
+                ){
                     boolean flag=false;
                     List<ExpenseAccountExamine> list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), useEa.getProcessStatus());
                     for (ExpenseAccountExamine e : list) {
@@ -1104,7 +1106,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private void examineByprocess( ExpenseAccount newEa,AdminListBo admin,OrganizationListOut dep,List<ExpenseConfigDetails> list) {
         List<ExpenseAccountExamine> examineList;
         //小于财务复审的,走单审核
-        if (newEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
+        if (newEa.getProcessStatus().equals(EAProcessStatus.BMFZRSH.getCode())||
+                newEa.getProcessStatus().equals(EAProcessStatus.CWSH.getCode())){
             examineList = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
             boolean flag=false;
             String aid="";
@@ -1140,7 +1143,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             date2.setTime(date2.getTime()+ 1000L);
             String tip=null;
             String aid=null;
-            if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.CWFS.getCode())){
+            if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.SJSH.getCode())){
+                //财务复审财务复审
+                if (admin.getExpenseSuperExamine()==0){
+                    flag2=true;
+                    tip=EAProcessStatus.SJSH.getDesc();
+                }else {
+                    boolean expenseExamine = pushExpenseExamine(list, newEa,  EAProcessStatus.SJSH.getCode());
+                    if (expenseExamine){
+                        flag3=true;
+                    }
+                }
+            }else if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.CWFS.getCode())){
                 //财务复审财务复审
                 if (dep.getExpenseRetrialFinanceExamine()==0){
                     flag2=true;