|
|
@@ -13,6 +13,7 @@ import java.util.UUID;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.model.*;
|
|
|
+import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -73,6 +74,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Autowired
|
|
|
private TOrderExamineMapper tOrderExamineMapper;
|
|
|
@Autowired
|
|
|
+ private FinanceCountMapper financeCountMapper;
|
|
|
+ @Autowired
|
|
|
private AsyncUtils asyncUtils;
|
|
|
|
|
|
|
|
|
@@ -223,7 +226,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
orderNewService.updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
|
|
|
Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
|
|
|
- orderNewService.updateFinanceCount(admin.getId(),t.getCreateTime());
|
|
|
+ financeCountOrderUnauditedSubtraction(t,1);
|
|
|
return c;
|
|
|
}
|
|
|
public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,TOrderNewBo o,String adminId,Integer approval){
|
|
|
@@ -506,6 +509,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
tl.setOrderNo(t.getOrderNo());
|
|
|
if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
tl.setProcess(OrderLogProcess.CWSH.getCode());
|
|
|
+ //财务审核当天
|
|
|
+ financeCountOrderUnauditedSubtraction(use,0);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
|
|
|
tl.setProcess(OrderLogProcess.XMZJSH.getCode());
|
|
|
}
|
|
|
@@ -527,11 +532,21 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
- Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
|
|
|
- orderNewService.updateFinanceCount(admin.getId(),use.getCreateTime());
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param use
|
|
|
+ * @param type 0 未审核减一 1未审核与派单数都减一
|
|
|
+ */
|
|
|
+ private void financeCountOrderUnauditedSubtraction(TOrderNew use,Integer type) {
|
|
|
+ Admin admin = adminMapper.selectFinanceAdminByOrderDep(use.getOrderDep());
|
|
|
+ String startTime= DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
+ financeCountMapper.updateOrderUnauditedSubtraction(admin.getId(),startTime,type);
|
|
|
+ }
|
|
|
+
|
|
|
private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
StringBuffer str= new StringBuffer();
|