|
@@ -56,7 +56,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
//非特批直接发到财务
|
|
//非特批直接发到财务
|
|
|
if (o.getApproval()==0){
|
|
if (o.getApproval()==0){
|
|
|
String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
- Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
|
|
|
|
|
|
|
+ Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
|
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
addFinanceCount(startTime, admin, financeCount);
|
|
addFinanceCount(startTime, admin, financeCount);
|
|
|
}
|
|
}
|
|
@@ -123,7 +123,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
if (o.getApproval()==0){
|
|
if (o.getApproval()==0){
|
|
|
TOrderInvoice use = tOrderInvoiceMapper.selectByPrimaryKey(o.getId());
|
|
TOrderInvoice use = tOrderInvoiceMapper.selectByPrimaryKey(o.getId());
|
|
|
String startTime = DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
String startTime = DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
- Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
|
|
|
|
|
|
|
+ Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
|
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
addFinanceCount(startTime, admin, financeCount);
|
|
addFinanceCount(startTime, admin, financeCount);
|
|
|
}
|
|
}
|
|
@@ -297,7 +297,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
*/
|
|
*/
|
|
|
private void pushInvoiceFinancialCount(TOrderInvoice t2, Integer examine) {
|
|
private void pushInvoiceFinancialCount(TOrderInvoice t2, Integer examine) {
|
|
|
String startTime = DateUtils.formatDate(t2.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
String startTime = DateUtils.formatDate(t2.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
- Admin admin = adminMapper.selectOrderByFinanacial(t2.getOrderNo());
|
|
|
|
|
|
|
+ Admin admin = adminMapper.selectOrderByFinanace(t2.getOrderNo());
|
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
if (examine==2){
|
|
if (examine==2){
|
|
|
//特批通过和特批是财务审核
|
|
//特批通过和特批是财务审核
|
|
@@ -394,7 +394,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
|
|
aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
|
|
|
}
|
|
}
|
|
|
String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
- Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
|
|
|
|
|
|
|
+ Admin admin = adminMapper.selectOrderByFinanace(o.getOrderNo());
|
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
addFinanceCount(startTime,admin,financeCount);
|
|
addFinanceCount(startTime,admin,financeCount);
|
|
|
}
|
|
}
|