|
|
@@ -1,7 +1,6 @@
|
|
|
package com.goafanti.expenseAccount.service.impl;
|
|
|
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
-import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.AdminNoticeBo;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
@@ -29,8 +28,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Autowired
|
|
|
private AdminMapper adminMapper;
|
|
|
@Autowired
|
|
|
- private DepartmentService departmentService;
|
|
|
- @Autowired
|
|
|
private ExpenseAccountMapper expenseAccountMapper;
|
|
|
@Autowired
|
|
|
private PublicReleaseMapper publicReleaseMapper;
|
|
|
@@ -74,7 +71,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
expenseAccountMapper.insertSelective(in);
|
|
|
addExpenseAccountExamine(in.getId());
|
|
|
- addExpenseAccountLog(in.getId(),0,in.getProcessStatus(),TokenManager.getAdminId(),"创建报销");
|
|
|
return in.getId();
|
|
|
}
|
|
|
|
|
|
@@ -218,18 +214,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setReleaseStart(DateUtils.StringToDate(in.getStartTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
in.setReleaseEnd(DateUtils.StringToDate(in.getEndTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
- if(in.getStatus()==1){
|
|
|
- in.setProcessStatus(1);
|
|
|
- }
|
|
|
+
|
|
|
//计算总金额
|
|
|
if (in.getTotalAmount()==null){
|
|
|
in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
|
|
|
}
|
|
|
+ in.setProcessStatus(0);
|
|
|
if (useEA.getStatus()==0){
|
|
|
addExpenseAccountLogAndNoticEmail(in,0,"发起报销审核");
|
|
|
}else if (useEA.getStatus()==3){
|
|
|
addExpenseAccountLogAndNoticEmail(in,4,"修改并发起审核");
|
|
|
}
|
|
|
+ if(in.getStatus()==1){
|
|
|
+ in.setProcessStatus(1);
|
|
|
+ }
|
|
|
if (in.getOrderNo()==null){
|
|
|
in.setTargetType(0);
|
|
|
}else {
|