|
|
@@ -555,7 +555,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
aids.add(order.getApprovalAid());
|
|
|
- str=str.append(order.getApprovalName()).append(",");
|
|
|
+ str.append(order.getApprovalName()).append(",");
|
|
|
}
|
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
@@ -565,8 +565,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
aids.add(admin.getId());
|
|
|
- str=str.append(admin.getName()).append(",");
|
|
|
- }
|
|
|
+ str.append(admin.getName()).append(",");
|
|
|
+ }
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
}
|
|
|
@@ -578,24 +578,24 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
|
|
|
aids.add(admin.getId());
|
|
|
- str=str.append(admin.getName()).append(",");
|
|
|
+ str.append(admin.getName()).append(",");
|
|
|
}
|
|
|
}
|
|
|
//用与外部修改名称
|
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
|
|
|
if (flag){
|
|
|
- addTorderLog(t,"部门特批审核人未设置,系统自动通过");
|
|
|
+ addTorderLog(t);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void addTorderLog(TOrderNew t, String str) {
|
|
|
+ private void addTorderLog(TOrderNew t) {
|
|
|
boolean flag=judgeOrderExamine(t.getOrderNo());
|
|
|
TOrderLog tl=new TOrderLog();
|
|
|
tl.setAid(AFTConstants.SUPERADMIN_ID);
|
|
|
tl.setProcess(OrderLogProcess.TP.getCode());
|
|
|
tl.setOrderNo(t.getOrderNo());
|
|
|
- tl.setRemarks(str);
|
|
|
+ tl.setRemarks("部门特批审核人未设置,系统自动通过");
|
|
|
tOrderLogMapper.insertSelective(tl);
|
|
|
}
|
|
|
|