|
|
@@ -189,15 +189,27 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
private void addOrderExamine(TOrderNew o) {
|
|
|
List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(o.getOrderNo());
|
|
|
if (tOrderExamines.isEmpty()){
|
|
|
- OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
|
|
|
- List<TOrderExamine> list =new ArrayList<>();
|
|
|
- if (dep!=null&&dep.getFinanceId()!=null)list.add(new TOrderExamine(o.getOrderNo(),dep.getFinanceId(),dep.getFinanceName()));
|
|
|
- List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
|
|
|
- for (Admin admin : admins) {
|
|
|
- list.add(new TOrderExamine(o.getOrderNo(),admin.getId(),admin.getName()));
|
|
|
+ addTOrderExamines(o);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private List<TOrderExamine> addTOrderExamines(TOrderNew o) {
|
|
|
+ OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
|
|
|
+ List<TOrderExamine> list =new ArrayList<>();
|
|
|
+ if(!Objects.isNull(dep)){
|
|
|
+ if (!Objects.isNull(dep.getFinanceId())){
|
|
|
+ list.add(new TOrderExamine(o.getOrderNo(),dep.getFinanceId(),dep.getFinanceName()));
|
|
|
}
|
|
|
- tOrderExamineMapper.insertBatch(list);
|
|
|
+ if (!Objects.isNull(dep.getRetrialFinanceId())){
|
|
|
+ list.add(new TOrderExamine(o.getOrderNo(),dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
|
|
|
+ for (Admin admin : admins) {
|
|
|
+ list.add(new TOrderExamine(o.getOrderNo(),admin.getId(),admin.getName()));
|
|
|
}
|
|
|
+ tOrderExamineMapper.insertBatch(list);
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1096,16 +1108,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//为了处理旧数据,后期可以去掉新增
|
|
|
List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo);
|
|
|
if (tOrderExamines.isEmpty()){
|
|
|
- OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
|
|
|
- List<TOrderExamine> list =new ArrayList<>();
|
|
|
- list.add(new TOrderExamine(orderNo,dep.getFinanceId(),dep.getFinanceName()));
|
|
|
- aids.add(dep.getFinanceId());
|
|
|
- List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
|
|
|
- for (Admin admin : admins) {
|
|
|
- aids.add(admin.getId());
|
|
|
- list.add(new TOrderExamine(orderNo,admin.getId(),admin.getName()));
|
|
|
+ List<TOrderExamine> tOrderExamines1 = addTOrderExamines(t2);
|
|
|
+ for (TOrderExamine e : tOrderExamines1) {
|
|
|
+ aids.add(e.getAid());
|
|
|
}
|
|
|
- tOrderExamineMapper.insertBatch(list);
|
|
|
}else {
|
|
|
tOrderExamineMapper.updateStatusByOrderNo(orderNo,null,0);
|
|
|
for (TOrderExamine e : tOrderExamines) {
|
|
|
@@ -1161,11 +1167,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}else if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
|
|
|
if (t.getOrderDep()!=null){
|
|
|
- OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
|
|
|
- str=str.append(dep.getFinanceName()).append(",");
|
|
|
- List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
|
|
|
- for (Admin admin : admins) {
|
|
|
- str=str.append(admin.getName()).append(",");
|
|
|
+ List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(t.getOrderNo());
|
|
|
+ for (TOrderExamine e : list) {
|
|
|
+ str=str.append(e.getAname()).append(",");
|
|
|
}
|
|
|
}
|
|
|
}else if (t.getProcessStatus()==ProcessStatus.YPYXY.getCode()){
|