|
@@ -517,7 +517,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
StringBuffer str=new StringBuffer();
|
|
StringBuffer str=new StringBuffer();
|
|
|
for (TOrderExamine e : tOrderExamines) {
|
|
for (TOrderExamine e : tOrderExamines) {
|
|
|
if (e.getStatus()==0){
|
|
if (e.getStatus()==0){
|
|
|
- str=str.append(e.getAname());
|
|
|
|
|
|
|
+ str=str.append(e.getAname()).append(",");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
@@ -539,7 +539,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
types.add(AFTConstants.CED_ASSISTANT);
|
|
types.add(AFTConstants.CED_ASSISTANT);
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
aids.add(admin.getId());
|
|
aids.add(admin.getId());
|
|
|
- str=str.append(admin.getName());
|
|
|
|
|
|
|
+ str=str.append(admin.getName()).append(",");
|
|
|
}
|
|
}
|
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()||
|
|
|
new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
@@ -550,7 +550,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
|
|
types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
aids.add(admin.getId());
|
|
aids.add(admin.getId());
|
|
|
- str=str.append(admin.getName());
|
|
|
|
|
|
|
+ str=str.append(admin.getName()).append(",");
|
|
|
}
|
|
}
|
|
|
}else {
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
@@ -560,7 +560,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
t.setFinanceId(oo.getFinanceId());
|
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
|
|
for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
|
|
|
aids.add(admin.getId());
|
|
aids.add(admin.getId());
|
|
|
- str=str.append(admin.getName());
|
|
|
|
|
|
|
+ str=str.append(admin.getName()).append(",");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
//用与外部修改名称
|
|
//用与外部修改名称
|
|
@@ -569,6 +569,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private boolean judgeOrderExamine(String orderNo) {
|
|
private boolean judgeOrderExamine(String orderNo) {
|
|
|
|
|
+ tOrderExamineMapper.updateStatusByOrderNo(orderNo,TokenManager.getAdminId(),1);
|
|
|
List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
|
|
List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
|
|
|
int max = tOrderExamines.size()+1;
|
|
int max = tOrderExamines.size()+1;
|
|
|
int yes=0;
|
|
int yes=0;
|