|
|
@@ -999,8 +999,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(cid,3);//3设置不等于2
|
|
|
for (TChangeTaskOut tChangeTaskOut : list) {
|
|
|
if(tChangeTaskOut.getSplitStatus()==1){
|
|
|
- List<TChangeTask> list2=tChangeTaskMapper.selectBySuper(tChangeTaskOut.getTid(),cid);
|
|
|
- tChangeTaskOut.setList(list2);
|
|
|
+ if (tChangeTaskOut.getChangeSplitSuper()==null){
|
|
|
+ tChangeTaskOut.setList(tChangeTaskMapper.selectBySuper(tChangeTaskOut.getTid(),null,cid));
|
|
|
+ }else {
|
|
|
+ tChangeTaskOut.setList(tChangeTaskMapper.selectBySuper(null,tChangeTaskOut.getChangeSplitSuper(),cid));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
return list;
|
|
|
@@ -1027,7 +1032,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTaskMapper.updateByTid(null,tt.getTid(),tt.getCid(),3);
|
|
|
tChangeDunMapper.updateByTid(tt.getTid(),tt.getCid(),3);
|
|
|
}else if(tt.getSplitStatus()==2) {
|
|
|
- List<TChangeTask> list=tChangeTaskMapper.selectBySuper(tt.getSplitSuper(),tt.getCid());
|
|
|
+ List<TChangeTask> list=tChangeTaskMapper.selectBySuper(tt.getSplitSuper(),null,tt.getCid());
|
|
|
boolean flag=true;
|
|
|
for (TChangeTask tc : list) {
|
|
|
if (tc.getType()!=3) {
|
|
|
@@ -1208,7 +1213,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
public int deleteMemberSonProject(Integer id) {
|
|
|
TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
|
|
|
tChangeTaskMapper.deleteByPrimaryKey(id);
|
|
|
- List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getSplitSuper(), tChangeTask.getCid());
|
|
|
+ List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getSplitSuper(),null, tChangeTask.getCid());
|
|
|
+ tChangeTasks.addAll(tChangeTaskMapper.selectBySuper(null,tChangeTask.getChangeSplitSuper(), tChangeTask.getCid()));
|
|
|
//如果没有子项目则修改上级
|
|
|
if (tChangeTasks==null||tChangeTasks.isEmpty()){
|
|
|
TChangeTask changeTask = new TChangeTask();
|