|
@@ -545,16 +545,15 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
|
|
private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
|
|
|
List<String> aids = new ArrayList<>();
|
|
List<String> aids = new ArrayList<>();
|
|
|
StringBuffer str= new StringBuffer();
|
|
StringBuffer str= new StringBuffer();
|
|
|
|
|
+ boolean flag= false;
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
|
|
if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
|
|
|
- t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
|
|
- List<String> types=new ArrayList<>();
|
|
|
|
|
- //总裁加助理
|
|
|
|
|
- types.add(AFTConstants.CED);
|
|
|
|
|
- types.add(AFTConstants.CED_ASSISTANT);
|
|
|
|
|
- for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
|
|
- aids.add(admin.getId());
|
|
|
|
|
- str=str.append(admin.getName()).append(",");
|
|
|
|
|
|
|
+ if (order.getApprovalStatus()==0){
|
|
|
|
|
+ t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
|
|
+ flag=true;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ aids.add(order.getApprovalAid());
|
|
|
|
|
+ str=str.append(order.getApprovalName()).append(",");
|
|
|
}
|
|
}
|
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
@@ -566,17 +565,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
aids.add(admin.getId());
|
|
aids.add(admin.getId());
|
|
|
str=str.append(admin.getName()).append(",");
|
|
str=str.append(admin.getName()).append(",");
|
|
|
}
|
|
}
|
|
|
- }else if (new1.getApproval()==ApprovalNewState.FZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.FZCBH.getCode()) {
|
|
|
|
|
- t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
|
|
- List<String> types=new ArrayList<>();
|
|
|
|
|
- //董事长加助理
|
|
|
|
|
- types.add(AFTConstants.VICE_CED);
|
|
|
|
|
- for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
|
|
- aids.add(admin.getId());
|
|
|
|
|
- str=str.append(admin.getName()).append(",");
|
|
|
|
|
- }
|
|
|
|
|
}else {
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (t.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
|
|
|
//设置发送邮件标识
|
|
//设置发送邮件标识
|
|
|
order.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
order.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
|
|
OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
|
|
@@ -589,6 +582,19 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
//用与外部修改名称
|
|
//用与外部修改名称
|
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
|
|
|
|
|
+ if (flag){
|
|
|
|
|
+ addTorderLog(t,"未设置特批审核人员自动跳过审核");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private void addTorderLog(TOrderNew t, String str) {
|
|
|
|
|
+ boolean flag=judgeOrderExamine(t.getOrderNo());
|
|
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
|
|
+
|
|
|
|
|
+ tl.setProcess(ProcessStatus.YPZXSGLY.getCode());
|
|
|
|
|
+ tl.setOrderNo(t.getOrderNo());
|
|
|
|
|
+ tl.setRemarks(str);
|
|
|
|
|
+ tOrderLogMapper.insertSelective(tl);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private boolean judgeOrderExamine(String orderNo) {
|
|
private boolean judgeOrderExamine(String orderNo) {
|