|
|
@@ -1698,8 +1698,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (in.getAdditionalDeduction()!=null)newT.setAdditionalDeduction(in.getAdditionalDeduction());
|
|
|
if (in.getRdAwardsubsidy()!=null)newT.setRdAwardsubsidy(in.getRdAwardsubsidy());
|
|
|
tChangeTaskMapper.insertSelective(newT);
|
|
|
-
|
|
|
- List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tid, null, tChangeTask.getCid());
|
|
|
+ List<TChangeTask> tChangeTasks;
|
|
|
+ if (tid!=null){
|
|
|
+ tChangeTasks = tChangeTaskMapper.selectBySuper(tid, null, tChangeTask.getCid());
|
|
|
+ }else {
|
|
|
+ tChangeTasks = tChangeTaskMapper.selectBySuper(null, in.getId(), tChangeTask.getCid());
|
|
|
+ }
|
|
|
int a=0,b=0,c=0;
|
|
|
for (TChangeTask e : tChangeTasks) {
|
|
|
if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
@@ -1711,7 +1715,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTask.setRdAwardsubsidy(c);
|
|
|
//根据上级id修改上级
|
|
|
updateSuperServiceYear(tChangeTask);
|
|
|
- return tChangeTask;
|
|
|
+ return newT;
|
|
|
}
|
|
|
|
|
|
public void updateSuperServiceYear(TChangeTask tChangeTask) {
|
|
|
@@ -1749,21 +1753,30 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object updateMemberSonProject(Integer id,String taskComment) {
|
|
|
- TChangeTask tChangeTask = tChangeTaskMapper.selectById(id);
|
|
|
+ public Object updateMemberSonProject(InputAddSonProject in) {
|
|
|
+ TChangeTask tChangeTask = tChangeTaskMapper.selectById(in.getId());
|
|
|
tChangeTask.setType(2);
|
|
|
- tChangeTask.setTaskComment(taskComment);
|
|
|
+ if (in.getHtMember()!=null) tChangeTask.setHtMember(in.getHtMember());
|
|
|
+ if (in.getAdditionalDeduction()!=null) tChangeTask.setAdditionalDeduction(in.getAdditionalDeduction());
|
|
|
+ if (in.getRdAwardsubsidy()!=null) tChangeTask.setRdAwardsubsidy(in.getRdAwardsubsidy());
|
|
|
tChangeTaskMapper.update(tChangeTask);
|
|
|
- List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getTid(), null, tChangeTask.getCid());
|
|
|
+ List<TChangeTask> tChangeTasks;
|
|
|
+ if (tChangeTask.getSplitSuper()!=null){
|
|
|
+ tChangeTasks = tChangeTaskMapper.selectBySuper(tChangeTask.getSplitSuper(), null, tChangeTask.getCid());
|
|
|
+ }else {
|
|
|
+ tChangeTasks = tChangeTaskMapper.selectBySuper(null,tChangeTask.getChangeSplitSuper(), tChangeTask.getCid());
|
|
|
+ }
|
|
|
int a=0,b=0,c=0;
|
|
|
for (TChangeTask e : tChangeTasks) {
|
|
|
if (a==0&&e.getHtMember()!=null&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
if (b==0&&e.getAdditionalDeduction()!=null&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
|
|
|
if (c==0&&e.getRdAwardsubsidy()!=null&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
|
|
|
}
|
|
|
- tChangeTask.setHtMember(a);
|
|
|
- tChangeTask.setAdditionalDeduction(b);
|
|
|
- tChangeTask.setRdAwardsubsidy(c);
|
|
|
+ TChangeTask superTask = tChangeTaskMapper.selectBytid(tChangeTask.getSplitSuper());
|
|
|
+ superTask.setHtMember(a);
|
|
|
+ superTask.setAdditionalDeduction(b);
|
|
|
+ superTask.setRdAwardsubsidy(c);
|
|
|
+ tChangeTaskMapper.update(superTask);
|
|
|
updateSuperServiceYear(tChangeTask);
|
|
|
return tChangeTask;
|
|
|
}
|