|
|
@@ -785,6 +785,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
|
|
|
List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
|
|
|
changeAddOrderTask(listct2,map);
|
|
|
+ //处理主项目显示派单年份
|
|
|
List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
|
|
|
for (TChangeDunOut cd : listcd) {
|
|
|
NewOrderDun nd=new NewOrderDun();
|
|
|
@@ -838,9 +839,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ot.setSplitStatus(cd.getSplitStatus());
|
|
|
if (cd.getSplitStatus()==2){
|
|
|
Integer tid;
|
|
|
+ //如果原本有上级直接使用
|
|
|
if (cd.getSplitSuper()!=null){
|
|
|
ot.setSplitSuper(cd.getSplitSuper());
|
|
|
}else {
|
|
|
+ //如果没有,原本项目,这用获取新增的项目
|
|
|
if (cd.getTid()!=null){
|
|
|
tid=cd.getTid();
|
|
|
}else{
|
|
|
@@ -881,6 +884,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if(cd.getType()==3) {
|
|
|
tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
return map;
|
|
|
}
|
|
|
@@ -1097,12 +1101,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
BusinessProject bp = businessProjectMapper.selectByPrimaryKey(tt.getCommodityId());
|
|
|
Integer member=null;
|
|
|
if (t.getType()==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) {
|
|
|
+ t.setServiceYear("");
|
|
|
//删除父类下所有的子类
|
|
|
if (tt.getType()==1){
|
|
|
tChangeTaskMapper.deleteByChangeSplitSuper(tt.getTid());
|
|
|
@@ -1290,6 +1296,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
|
|
|
Integer tid=tChangeTask.getTid();
|
|
|
tChangeTask.setSplitStatus(1);
|
|
|
+ tChangeTask.setType(2);
|
|
|
tChangeTaskMapper.updateByPrimaryKey(tChangeTask);
|
|
|
//在判断是否有删除的年份没有就新增
|
|
|
tChangeTask.setId(null);
|
|
|
@@ -1305,9 +1312,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTask.setTaskComment(taskComment);
|
|
|
tChangeTask.setServiceYear(serviceYear);
|
|
|
tChangeTaskMapper.insertSelective(tChangeTask);
|
|
|
+ //根据上级id修改上级
|
|
|
+ updateSuperServiceYear(tChangeTask);
|
|
|
return tChangeTask;
|
|
|
}
|
|
|
|
|
|
+ public void updateSuperServiceYear(TChangeTask tChangeTask) {
|
|
|
+ if(tChangeTask.getSplitSuper()!=null){
|
|
|
+ tChangeTaskMapper.updateSuperServiceYear(tChangeTask);
|
|
|
+ }else {
|
|
|
+ tChangeTaskMapper.updateChangeSuperServiceYear(tChangeTask);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public int deleteMemberSonProject(Integer id) {
|
|
|
TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
|
|
|
@@ -1328,6 +1345,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
changeTask.setSplitStatus(0);
|
|
|
tChangeTaskMapper.updateByPrimaryKeySelective(changeTask);
|
|
|
}
|
|
|
+ updateSuperServiceYear(tChangeTask);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -1337,6 +1355,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTask.setType(2);
|
|
|
tChangeTask.setTaskComment(taskComment);
|
|
|
tChangeTaskMapper.updateByPrimaryKeySelective(tChangeTask);
|
|
|
+ updateSuperServiceYear(tChangeTask);
|
|
|
return tChangeTask;
|
|
|
}
|
|
|
|