|
|
@@ -194,6 +194,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
|
|
|
private List<TOrderExamine> addTOrderExamines(TOrderNew o) {
|
|
|
+ tOrderExamineMapper.deleteByOrderNo(o.getOrderNo());
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
|
|
|
List<TOrderExamine> list =new ArrayList<>();
|
|
|
if(!Objects.isNull(dep)){
|
|
|
@@ -1104,19 +1105,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}else if (t2.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
|
|
|
tl.setProcess(OrderLogProcess.SH.getCode());
|
|
|
t.setProcessStatus(ProcessStatus.YPCW_JSZJ.getCode());
|
|
|
- //设置财务与技术总监通知
|
|
|
- //为了处理旧数据,后期可以去掉新增
|
|
|
- List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo,0);
|
|
|
- if (tOrderExamines.isEmpty()){
|
|
|
- List<TOrderExamine> tOrderExamines1 = addTOrderExamines(t2);
|
|
|
- for (TOrderExamine e : tOrderExamines1) {
|
|
|
- aids.add(e.getAid());
|
|
|
- }
|
|
|
- }else {
|
|
|
- tOrderExamineMapper.updateStatusByOrderNo(orderNo,null,0);
|
|
|
- for (TOrderExamine e : tOrderExamines) {
|
|
|
- aids.add(e.getAid());
|
|
|
- }
|
|
|
+ //为了防止中间加或者删除复审,在营销管理员审核的时候重新刷新
|
|
|
+ List<TOrderExamine> tOrderExamines1 = addTOrderExamines(t2);
|
|
|
+ for (TOrderExamine e : tOrderExamines1) {
|
|
|
+ aids.add(e.getAid());
|
|
|
}
|
|
|
Admin admin=adminMapper.selectFinanceAdminByOrderDep(t2.getOrderDep());
|
|
|
updateFinanceCount(admin.getId(),t2.getCreateTime());
|