|
|
@@ -71,6 +71,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Autowired
|
|
|
private DepartmentService departmentService;
|
|
|
@Autowired
|
|
|
+ private TOrderExamineMapper tOrderExamineMapper;
|
|
|
+ @Autowired
|
|
|
private AsyncUtils asyncUtils;
|
|
|
|
|
|
|
|
|
@@ -208,10 +210,13 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
throw new BusinessException(new Error( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误"));
|
|
|
}
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
- orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
|
|
|
}
|
|
|
return c;
|
|
|
}
|
|
|
+ public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,TOrderNewBo o,String adminId,Integer approval){
|
|
|
+ orderNewService.pushGeneralSendNoticeAndEmail(alist, type,o, adminId,approval);
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public Integer addReceiptsFlow(TOrderBillNew billNew, String contractNo) {
|
|
|
@@ -482,7 +487,30 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
if (new1.getBackStatus()==3) {
|
|
|
t.setBackStatus(0);
|
|
|
}
|
|
|
+ //判断是否走入下一个流程
|
|
|
+ boolean flag=judgeOrderExamine(orderNo);
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
+ tl.setAid(TokenManager.getAdminId());
|
|
|
+ tl.setOrderNo(t.getOrderNo());
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
+ tl.setProcess(OrderLogProcess.CWPD.getCode());
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
|
|
|
+ tl.setProcess(OrderLogProcess.XMZJSH.getCode());
|
|
|
+ }
|
|
|
+ tl.setRemarks(remarks);
|
|
|
+ tOrderLogMapper.insertSelective(tl);
|
|
|
+ orderNewService.pushExamineName(t);
|
|
|
+ //如果全部派单完成才需要通知和走下个流程
|
|
|
+ if (flag){
|
|
|
+ pushNoticeAndEmail(t, new1);
|
|
|
+ }
|
|
|
+
|
|
|
+ return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
+ TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()||
|
|
|
new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
@@ -505,24 +533,32 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
+ //设置发送邮件标识
|
|
|
+ order.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
|
|
|
aids.add(admin.getId());
|
|
|
}
|
|
|
}
|
|
|
- orderNewService.pushExamineName(t);
|
|
|
- TOrderLog tl=new TOrderLog();
|
|
|
- tl.setAid(TokenManager.getAdminId());
|
|
|
- tl.setOrderNo(t.getOrderNo());
|
|
|
- tl.setProcess(OrderLogProcess.CWPD.getCode());
|
|
|
- tl.setRemarks(remarks);
|
|
|
- tOrderLogMapper.insertSelective(tl);
|
|
|
- TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
- orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(),new1.getApproval());
|
|
|
- return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
+
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
|
|
|
}
|
|
|
|
|
|
+ private boolean judgeOrderExamine(String orderNo) {
|
|
|
+ List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
|
|
|
+ int max = tOrderExamines.size()+1;
|
|
|
+ int yes=0;
|
|
|
+ for (TOrderExamine e : tOrderExamines) {
|
|
|
+ if (e.getStatus()==1){
|
|
|
+ yes++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (yes==max){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|