|
@@ -121,7 +121,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
eae.setAuditorname(examineName);
|
|
eae.setAuditorname(examineName);
|
|
|
ea.setExamineName(examineName);
|
|
ea.setExamineName(examineName);
|
|
|
if (eae.getAuditor().equals(aid))eae.setStatus(1);
|
|
if (eae.getAuditor().equals(aid))eae.setStatus(1);
|
|
|
-
|
|
|
|
|
else eae.setStatus(0);
|
|
else eae.setStatus(0);
|
|
|
list.add(eae);
|
|
list.add(eae);
|
|
|
}else if (i==2){
|
|
}else if (i==2){
|
|
@@ -147,7 +146,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
list.add(eae);
|
|
list.add(eae);
|
|
|
}
|
|
}
|
|
|
}else if (i==4){
|
|
}else if (i==4){
|
|
|
- List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.All_CED_AND_CHAIRMAN);
|
|
|
|
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
|
|
|
for (Admin e : admins) {
|
|
for (Admin e : admins) {
|
|
|
ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
|
|
ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
|
|
|
eae.setAuditor(e.getId());
|
|
eae.setAuditor(e.getId());
|
|
@@ -197,15 +196,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String aid=TokenManager.getAdminId();
|
|
String aid=TokenManager.getAdminId();
|
|
|
addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
|
|
addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
- if(in.getStatus()==1){
|
|
|
|
|
- in.setProcessStatus(1);
|
|
|
|
|
- }
|
|
|
|
|
if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
|
|
|
+ in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000L);
|
|
date.setTime(date.getTime()+1000L);
|
|
|
addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
|
|
addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
|
|
|
- in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
|
|
}
|
|
}
|
|
|
createExamineByProcess(in);
|
|
createExamineByProcess(in);
|
|
|
}
|
|
}
|
|
@@ -412,7 +408,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
ExpenseAccount updateSon=new ExpenseAccount();
|
|
ExpenseAccount updateSon=new ExpenseAccount();
|
|
|
updateSon.setId(e.getId());
|
|
updateSon.setId(e.getId());
|
|
|
updateSon.setStatus(2);
|
|
updateSon.setStatus(2);
|
|
|
- expenseAccountMapper.updateByPrimaryKey(e);
|
|
|
|
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(updateSon);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -773,8 +769,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
|
|
if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
|
|
|
if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
|
|
if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
|
|
|
if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
|
|
|
+ outExpenseAccount.setProcessStatus(1);
|
|
|
addExpenseAccountExamine(in.getId(),update);
|
|
addExpenseAccountExamine(in.getId(),update);
|
|
|
- update.setProcessStatus(1);
|
|
|
|
|
if (outExpenseAccount.getStatus()==0){
|
|
if (outExpenseAccount.getStatus()==0){
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
|
|
|
}else if (outExpenseAccount.getStatus()==3){
|
|
}else if (outExpenseAccount.getStatus()==3){
|
|
@@ -784,7 +780,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
|
}
|
|
}
|
|
|
update.setStatus(in.getStatus());
|
|
update.setStatus(in.getStatus());
|
|
|
|
|
+ update.setProcessStatus(outExpenseAccount.getProcessStatus());
|
|
|
update.setId(in.getId());
|
|
update.setId(in.getId());
|
|
|
|
|
+ update.setExamineName(outExpenseAccount.getExamineName());
|
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -797,7 +795,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//1-3s是不同人的审核
|
|
//1-3s是不同人的审核
|
|
|
if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
|
|
if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- in.setProcessStatus(4);
|
|
|
|
|
|
|
+ in.setProcessStatus(3);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
in.setProcessStatus(2);
|
|
in.setProcessStatus(2);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
@@ -852,7 +850,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}else{
|
|
}else{
|
|
|
params.put("roleType",0);
|
|
params.put("roleType",0);
|
|
|
}
|
|
}
|
|
|
- return findPage("ExpenseDetailsList","ExpenseDetailsCount",params,in.getPageNo(),in.getPageSize());
|
|
|
|
|
|
|
+ return findPagePlus("ExpenseDetailsList","ExpenseDetailsCount","ExpenseDetailsTotalAmount",params,in.getPageNo(),in.getPageSize());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -943,6 +941,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
@Override
|
|
|
public Object updateType(InputExpenseAccount in) {
|
|
public Object updateType(InputExpenseAccount in) {
|
|
|
expenseAccountDetailsMapper.deleteByeaid(in.getId());
|
|
expenseAccountDetailsMapper.deleteByeaid(in.getId());
|
|
|
|
|
+ if (in.getType()!=2)in.setSecondaryType(0);
|
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(in);
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(in);
|
|
|
}
|
|
}
|
|
|
|
|
|