|
|
@@ -2,6 +2,7 @@ package com.goafanti.expenseAccount.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.AdminNoticeBo;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
@@ -93,6 +94,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private UserMapper userMapper;
|
|
|
@Resource
|
|
|
private TOrderMidMapper tOrderMidMapper;
|
|
|
+ @Resource
|
|
|
+ private AdminPublicReviewerMapper adminPublicReviewerMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -148,23 +151,39 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//新增一级
|
|
|
String examineId=null;
|
|
|
String examineName=null;
|
|
|
- //正常用上级,没有的情况下就是自己
|
|
|
- if (a.getSuperId()!=null){
|
|
|
- examineId=a.getSuperId();
|
|
|
- examineName=a.getSuperName();
|
|
|
+ List<AdminPublicReviewerBo> exList = adminPublicReviewerMapper.selectByAid(aid);
|
|
|
+ if(a.getExpenseSuperExamine()==1) {
|
|
|
+ eae.setStatus(0);
|
|
|
+ } else {
|
|
|
+ eae.setStatus(1);
|
|
|
+ }
|
|
|
+ if (!exList.isEmpty()){
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (AdminPublicReviewerBo e : exList) {
|
|
|
+ ExpenseAccountExamine eaet=new ExpenseAccountExamine(id,i);
|
|
|
+ examineId=e.getReviewerId();
|
|
|
+ examineName=e.getReviewerName();
|
|
|
+ eaet.setAuditor(examineId);
|
|
|
+ eaet.setAuditorname(examineName);
|
|
|
+ if (eaet.getAuditor().equals(aid))eaet.setStatus(1);
|
|
|
+ else eaet.setStatus(0);
|
|
|
+ list.add(eaet);
|
|
|
+ sb.append(examineName).append(",");
|
|
|
+ }
|
|
|
+ ea.setExamineName(sb.substring(0,sb.length()-1));
|
|
|
}else {
|
|
|
examineId=a.getId();
|
|
|
examineName=a.getName();
|
|
|
+ eae.setAuditor(examineId);
|
|
|
+ eae.setAuditorname(examineName);
|
|
|
+ ea.setExamineName(examineName);
|
|
|
}
|
|
|
- eae.setAuditor(examineId);
|
|
|
- eae.setAuditorname(examineName);
|
|
|
- ea.setExamineName(examineName);
|
|
|
- }
|
|
|
- if(a.getExpenseSuperExamine()==1) {
|
|
|
- eae.setStatus(0);
|
|
|
- } else {
|
|
|
- eae.setStatus(1);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
}else if (i==2){
|
|
|
if (StringUtils.isBlank(dep.getManagerName())){
|
|
|
throw new BusinessException("报销申请部门[管理员]不存在。");
|