|
|
@@ -128,67 +128,66 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
t.setZxsRemarks(startRemarks);
|
|
|
newOrderChangeMapper.insertSelective(t);
|
|
|
NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
|
|
|
-
|
|
|
- List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
|
|
|
- List<TChangeDun> listcd=new ArrayList<>();
|
|
|
- if (listDun!=null&&!listDun.isEmpty()) {
|
|
|
- for (OutNewOrderDunBo d : listDun) {
|
|
|
- TChangeDun cd=new TChangeDun();
|
|
|
- cd.setOrderNo(d.getOrderNo());
|
|
|
- cd.setAid(d.getAid());
|
|
|
- cd.setAppropriationRatio(d.getAppropriationRatio());
|
|
|
- cd.setCid(ncb.getId());
|
|
|
- cd.setDid(d.getId());
|
|
|
- cd.setTid(d.getTid());
|
|
|
- cd.setProjectType(d.getProjectType());
|
|
|
- cd.setDunType(d.getDunType());
|
|
|
- cd.setMoney(d.getMoney());
|
|
|
- cd.setWaitDay(d.getWaitDay());
|
|
|
- cd.setStartTime(d.getStartTime());
|
|
|
- cd.setEffectiveCount(d.getEffectiveCount());
|
|
|
- cd.setCustomizeTime(d.getCustomizeTime());
|
|
|
- cd.setCustomizeName(d.getCustomizeName());
|
|
|
- listcd.add(cd);
|
|
|
- }
|
|
|
- tChangeDunMapper.insertSelectiveList(listcd);
|
|
|
- }
|
|
|
- List<TChangeTask> listck=new ArrayList<>();
|
|
|
- List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
|
|
|
- if (listTask!=null&&!listTask.isEmpty()) {
|
|
|
- for (TOrderTaskBo tt : listTask) {
|
|
|
- TChangeTask ck=new TChangeTask();
|
|
|
- ck.setOrderNo(tt.getOrderNo());
|
|
|
- ck.setCid(ncb.getId());
|
|
|
- ck.setCommodityId(tt.getCommodityId());
|
|
|
- ck.setOrderNo(tt.getOrderNo());
|
|
|
- ck.setCommodityName(tt.getCommodityName());
|
|
|
- ck.setCommodityPrice(tt.getCommodityPrice());
|
|
|
- ck.setCommodityQuantity(tt.getCommodityQuantity());
|
|
|
- ck.setTaskComment(tt.getTaskComment());
|
|
|
- ck.setSplitStatus(tt.getSplitStatus());
|
|
|
- ck.setSplitSuper(tt.getSplitSuper());
|
|
|
- ck.setReceiverName(tt.getReceiverName());
|
|
|
- ck.setMain(tt.getMain());
|
|
|
- ck.setTid(tt.getId());
|
|
|
- if(tt.getServiceLife()!=null) ck.setServiceLife(tt.getServiceLife());
|
|
|
- if(tt.getServiceYear()!=null) ck.setServiceYear(tt.getServiceYear());
|
|
|
- if(tt.getYearSum()!=null) ck.setYearSum(tt.getYearSum());
|
|
|
- if(tt.getContractTerm()!=null) ck.setContractTerm(tt.getContractTerm());
|
|
|
- listck.add(ck);
|
|
|
- }
|
|
|
- tChangeTaskMapper.insertSelectiveList(listck);
|
|
|
+ List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
|
|
|
+ List<TChangeDun> listcd=new ArrayList<>();
|
|
|
+ if (listDun!=null&&!listDun.isEmpty()) {
|
|
|
+ for (OutNewOrderDunBo d : listDun) {
|
|
|
+ TChangeDun cd=new TChangeDun();
|
|
|
+ cd.setOrderNo(d.getOrderNo());
|
|
|
+ cd.setAid(d.getAid());
|
|
|
+ cd.setAppropriationRatio(d.getAppropriationRatio());
|
|
|
+ cd.setCid(ncb.getId());
|
|
|
+ cd.setDid(d.getId());
|
|
|
+ cd.setTid(d.getTid());
|
|
|
+ cd.setProjectType(d.getProjectType());
|
|
|
+ cd.setDunType(d.getDunType());
|
|
|
+ cd.setMoney(d.getMoney());
|
|
|
+ cd.setWaitDay(d.getWaitDay());
|
|
|
+ cd.setStartTime(d.getStartTime());
|
|
|
+ cd.setEffectiveCount(d.getEffectiveCount());
|
|
|
+ cd.setCustomizeTime(d.getCustomizeTime());
|
|
|
+ cd.setCustomizeName(d.getCustomizeName());
|
|
|
+ listcd.add(cd);
|
|
|
}
|
|
|
- if (t.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
- OrderChangeLog ocl=new OrderChangeLog();
|
|
|
- ocl.setAuditor(TokenManager.getAdminId());
|
|
|
- ocl.setOrderNo(t.getOrderNo());
|
|
|
- ocl.setRemarks(startRemarks);
|
|
|
- ocl.setChangeId(ncb.getId());
|
|
|
- ocl.setStatus(0);
|
|
|
- sendNotice(0, t);//设置与通过一样发送信息
|
|
|
- orderChangeLogMapper.insertSelective(ocl);
|
|
|
+ tChangeDunMapper.insertSelectiveList(listcd);
|
|
|
+ }
|
|
|
+ List<TChangeTask> listck=new ArrayList<>();
|
|
|
+ List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),null);
|
|
|
+ if (listTask!=null&&!listTask.isEmpty()) {
|
|
|
+ for (TOrderTaskBo tt : listTask) {
|
|
|
+ TChangeTask ck=new TChangeTask();
|
|
|
+ ck.setOrderNo(tt.getOrderNo());
|
|
|
+ ck.setCid(ncb.getId());
|
|
|
+ ck.setCommodityId(tt.getCommodityId());
|
|
|
+ ck.setOrderNo(tt.getOrderNo());
|
|
|
+ ck.setCommodityName(tt.getCommodityName());
|
|
|
+ ck.setCommodityPrice(tt.getCommodityPrice());
|
|
|
+ ck.setCommodityQuantity(tt.getCommodityQuantity());
|
|
|
+ ck.setTaskComment(tt.getTaskComment());
|
|
|
+ ck.setSplitStatus(tt.getSplitStatus());
|
|
|
+ ck.setSplitSuper(tt.getSplitSuper());
|
|
|
+ ck.setReceiverName(tt.getReceiverName());
|
|
|
+ ck.setMain(tt.getMain());
|
|
|
+ ck.setTid(tt.getId());
|
|
|
+ if(tt.getServiceLife()!=null) ck.setServiceLife(tt.getServiceLife());
|
|
|
+ if(tt.getServiceYear()!=null) ck.setServiceYear(tt.getServiceYear());
|
|
|
+ if(tt.getYearSum()!=null) ck.setYearSum(tt.getYearSum());
|
|
|
+ if(tt.getContractTerm()!=null) ck.setContractTerm(tt.getContractTerm());
|
|
|
+ listck.add(ck);
|
|
|
}
|
|
|
- return 1;
|
|
|
+ tChangeTaskMapper.insertSelectiveList(listck);
|
|
|
+ }
|
|
|
+ if (t.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
+ OrderChangeLog ocl=new OrderChangeLog();
|
|
|
+ ocl.setAuditor(TokenManager.getAdminId());
|
|
|
+ ocl.setOrderNo(t.getOrderNo());
|
|
|
+ ocl.setRemarks(startRemarks);
|
|
|
+ ocl.setChangeId(ncb.getId());
|
|
|
+ ocl.setStatus(0);
|
|
|
+ sendNotice(0, t);//设置与通过一样发送信息
|
|
|
+ orderChangeLogMapper.insertSelective(ocl);
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
/*
|