|
|
@@ -355,6 +355,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
|
|
|
if (status==1){
|
|
|
str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
|
|
|
+ newEa.setProcessStatus(in.getProcessStatus());
|
|
|
pushExamineProcess(newEa);
|
|
|
if(useEa.getProcessStatus()== EAProcessStatus.FQ.getCode()){
|
|
|
//获取上级
|
|
|
@@ -434,7 +435,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
private void addLogAndNoticeAndEmail(InputExpenseAccount in, Integer status, String str,String aname, List<Admin> aids) {
|
|
|
Date date= new Date();
|
|
|
- addExpenseAccountLog(in.getId(),status,null,in.getReason());
|
|
|
+ if (status!=1)addExpenseAccountLog(in.getId(),status,null,in.getReason());
|
|
|
Integer noticeStatus=NoticeStatus.EXPENSE_NOTICE.getCode();
|
|
|
if (status==2){
|
|
|
noticeStatus=NoticeStatus.EXPENSE_COMPLETE.getCode();
|
|
|
@@ -508,20 +509,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
param.put("endTime",in.getEndTime()+" 23:59:59");
|
|
|
}
|
|
|
if (in.getStatus()!=null)param.put("status",in.getStatus());
|
|
|
- if (in.getProcessStatus()!=null){
|
|
|
- Integer processStatus=in.getProcessStatus();
|
|
|
- //默认自己 设置上级,判断管理员与总裁等顶级审核
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- processStatus=3;
|
|
|
- List<String> list = departmentService.selectMyDeps();
|
|
|
- param.put("deps",list);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
- processStatus=2;
|
|
|
- }else if (checkShiroCED()){
|
|
|
- processStatus=4;
|
|
|
- }
|
|
|
- param.put("processStatus",processStatus);
|
|
|
- }else {
|
|
|
+ if (in.getProcessStatus()==null){
|
|
|
param.put("processStatus",0);
|
|
|
}
|
|
|
if (in.getContractNo()!=null)param.put("contractNo",in.getContractNo());
|