|
|
@@ -191,9 +191,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(in.getAid());
|
|
|
if(in.getProcessStatus()== EAProcessStatus.SJSH.getCode()){
|
|
|
//获取上级
|
|
|
- Admin superAdmin = adminMapper.selectByPrimaryKey(admin.getId());
|
|
|
+ Admin superAdmin = adminMapper.selectByPrimaryKey(admin.getSuperiorId());
|
|
|
aids.add(superAdmin);
|
|
|
- in.setUserNames(superAdmin.getName());
|
|
|
+ in.setExamineName(superAdmin.getName());
|
|
|
}else if (in.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
|
|
|
//获取财务负责人
|
|
|
Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
|
|
|
@@ -496,6 +496,19 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
|
public Object selectById(Integer id) {
|
|
|
OutExpenseAccount useEa = expenseAccountMapper.selectByid(id);
|
|
|
+ List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndType(id, useEa.getProcessStatus());
|
|
|
+ boolean flag=false;
|
|
|
+ for (ExpenseAccountExamine e : list) {
|
|
|
+ if (e.getAuditor().equals(TokenManager.getAdminId())){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (flag){
|
|
|
+ useEa.setExamine(1);
|
|
|
+ }else {
|
|
|
+ useEa.setExamine(0);
|
|
|
+ }
|
|
|
if (useEa.getDebitId()!=null){
|
|
|
ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(useEa.getDebitId());
|
|
|
if (debit!=null&&debit.getTotalAmount()!=null){
|
|
|
@@ -531,6 +544,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}else {
|
|
|
param.put("processStatus",in.getProcessStatus());
|
|
|
}
|
|
|
+ if (in.getExamineStatus()!=null){
|
|
|
+ param.put("examineStatus",in.getExamineStatus());
|
|
|
+ }else {
|
|
|
+ param.put("examineStatus",0);
|
|
|
+ }
|
|
|
if (in.getContractNo()!=null)param.put("contractNo",in.getContractNo());
|
|
|
if (in.getDepId()!=null)param.put("depId",in.getDepId());
|
|
|
if (in.getUsername()!=null)param.put("username",in.getUsername());
|