|
|
@@ -1760,29 +1760,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (in.getAdditionalDeduction()!=null) tChangeTask.setAdditionalDeduction(in.getAdditionalDeduction());
|
|
|
if (in.getRdAwardsubsidy()!=null) tChangeTask.setRdAwardsubsidy(in.getRdAwardsubsidy());
|
|
|
tChangeTaskMapper.update(tChangeTask);
|
|
|
- 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 superTask;
|
|
|
- if (tChangeTask.getSplitSuper()!=null){
|
|
|
- superTask=tChangeTaskMapper.selectBytid(tChangeTask.getSplitSuper());
|
|
|
- }else {
|
|
|
- superTask=tChangeTaskMapper.selectById(tChangeTask.getChangeSplitSuper());
|
|
|
- }
|
|
|
-
|
|
|
- superTask.setHtMember(a);
|
|
|
- superTask.setAdditionalDeduction(b);
|
|
|
- superTask.setRdAwardsubsidy(c);
|
|
|
- tChangeTaskMapper.update(superTask);
|
|
|
updateSuperServiceYear(tChangeTask);
|
|
|
return tChangeTask;
|
|
|
}
|