|
|
@@ -77,7 +77,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@Autowired
|
|
|
private OrderExamineMapper orderExamineMapper;
|
|
|
@Autowired
|
|
|
- private OrderService orderService;
|
|
|
+ private BusinessProjectMapper businessProjectMapper;
|
|
|
@Autowired
|
|
|
private NewOrderDunMapper newOrderDunMapper;
|
|
|
@Autowired
|
|
|
@@ -166,10 +166,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ck.setReceiverName(tt.getReceiverName());
|
|
|
ck.setMain(tt.getMain());
|
|
|
ck.setTid(tt.getId());
|
|
|
- if(tt.getServiceLife()!=null) ck.setServiceLife(tt.getServiceLife());
|
|
|
+ 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());
|
|
|
+ if(tt.getLastYear()!=null) ck.setContractTerm(tt.getLastYear());
|
|
|
+ if(tt.getLastYearCapital()!=null) ck.setLastYearCapital(tt.getLastYearCapital());
|
|
|
+ if(tt.getLastYearIncome()!=null) ck.setLastYearIncome(tt.getLastYearIncome());
|
|
|
listck.add(ck);
|
|
|
}
|
|
|
tChangeTaskMapper.insertSelectiveList(listck);
|
|
|
@@ -1082,9 +1085,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if(t.getTid()!=null) {
|
|
|
//type 0正常 1新增 2修改 3删除
|
|
|
TChangeTask tt=tChangeTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
+ BusinessProject bp = businessProjectMapper.selectByPrimaryKey(tt.getCommodityId());
|
|
|
+ Integer member=null;
|
|
|
if (t.getType()==3) {
|
|
|
//删除首先将项目删除,然后将所属催款做删除
|
|
|
- tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),3);
|
|
|
+ if (bp.getType()==7)member=1;
|
|
|
+ tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),3,member);
|
|
|
if (tt.getSplitStatus()==0) {
|
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
|
}else if (tt.getSplitStatus()==1) {
|
|
|
@@ -1092,7 +1098,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (tt.getType()==1){
|
|
|
tChangeTaskMapper.deleteByChangeSplitSuper(tt.getTid());
|
|
|
}else {
|
|
|
- tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
|
|
|
+ tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3,member);
|
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
|
}
|
|
|
}else if(tt.getSplitStatus()==2) {
|
|
|
@@ -1106,19 +1112,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
if (flag) {
|
|
|
//如果所有子类删除判断删除父类
|
|
|
- tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),3);
|
|
|
+ tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),3,member);
|
|
|
tChangeDunMapper.updateByTid(tt.getSplitSuper(),tt.getCid(),3);
|
|
|
}
|
|
|
}
|
|
|
}else if(t.getType()==2){
|
|
|
- tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),2);
|
|
|
+ tChangeTaskMapper.updateByTid(t.getTid(),null,tt.getCid(),2,member);
|
|
|
if (tt.getSplitStatus()==1) {
|
|
|
if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
|
|
|
tChangeTaskMapper.updateMemberByTid(tt.getTid(),t.getCid(),null,t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());
|
|
|
}
|
|
|
updateChangeType(tt);
|
|
|
}else if(tt.getSplitStatus()==2) {
|
|
|
- tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2);
|
|
|
+ tChangeTaskMapper.updateByTid(tt.getSplitSuper(),null,tt.getCid(),2,member);
|
|
|
}
|
|
|
}
|
|
|
//如果没有tid是新增项目则直接删除
|