Quellcode durchsuchen

财务统计报销模块修改

anderx vor 2 Jahren
Ursprung
Commit
a720049551

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

@@ -367,7 +367,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         ExpenseAccount newEa=new ExpenseAccount();
         ExpenseAccount newEa=new ExpenseAccount();
         newEa.setId(useEa.getId());
         newEa.setId(useEa.getId());
         //审核通知 获取发送人
         //审核通知 获取发送人
-        addExamineExpenseAccountLog(in, useEa, newEa);
+        AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
+        addExamineExpenseAccountLog(admin,in, useEa, newEa);
         //完成申请
         //完成申请
         if (newEa.getStatus()==2){
         if (newEa.getStatus()==2){
             //如果是借支则订单新增
             //如果是借支则订单新增
@@ -396,6 +397,19 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }
             }
 
 
         }
         }
+        if (newEa.getStatus()==1){
+            if (newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
+                pushFinanceCount(admin.getDepFinance(),newEa.getCreateTime(),0);
+            }else if (newEa.getProcessStatus()==EAProcessStatus.ZJLSH.getCode()){
+                pushFinanceCount(admin.getDepFinance(),newEa.getCreateTime(),1);
+            }
+        }else if (newEa.getStatus()==3){
+            if (useEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
+                pushFinanceCount(admin.getDepFinance(),newEa.getCreateTime(),2);
+            }else if (newEa.getProcessStatus()>EAProcessStatus.ZJLSH.getCode()){
+                pushFinanceCount(admin.getDepFinance(),newEa.getCreateTime(),3);
+            }
+        }
         pushExpenseFinaceCount(useEa,newEa);
         pushExpenseFinaceCount(useEa,newEa);
             //审核处理审核表
             //审核处理审核表
             pushExpenseAccountExamine(in);
             pushExpenseAccountExamine(in);
@@ -464,11 +478,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         }
     }
     }
 
 
-    private void addExamineExpenseAccountLog(InputExpenseAccount in, ExpenseAccount useEa, ExpenseAccount newEa) {
+    private void addExamineExpenseAccountLog(AdminListBo admin,InputExpenseAccount in, ExpenseAccount useEa, ExpenseAccount newEa) {
         List<Admin> aids=new ArrayList<>();
         List<Admin> aids=new ArrayList<>();
         StringBuffer str=new StringBuffer();
         StringBuffer str=new StringBuffer();
         Integer status=in.getStatus();
         Integer status=in.getStatus();
-        AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
+
         if (status==1){
         if (status==1){
             str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
             str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
             //新的流程是当前流程+1
             //新的流程是当前流程+1
@@ -479,7 +493,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
                 Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
                 aids.add(finaceAdmin);
                 aids.add(finaceAdmin);
                 newEa.setExamineName(finaceAdmin.getName());
                 newEa.setExamineName(finaceAdmin.getName());
-                pushFinanceCount(finaceAdmin.getId(),newEa.getCreateTime(),0);
             }else if (newEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
             }else if (newEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
                 //获取部门负责人
                 //获取部门负责人
                 List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
                 List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);