|
|
@@ -1672,7 +1672,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (tChangeTask.getType()!=1)tChangeTask.setType(2);
|
|
|
TChangeTask newT=new TChangeTask();
|
|
|
BeanUtils.copyProperties(tChangeTask,newT);
|
|
|
- tChangeTaskMapper.update(tChangeTask);
|
|
|
+
|
|
|
//在判断是否有删除的年份没有就新增
|
|
|
newT.setId(null);
|
|
|
newT.setTid(null);
|
|
|
@@ -1688,12 +1688,25 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
newT.setTaskComment(in.getTaskComment());
|
|
|
newT.setServiceYear(in.getServiceYear());
|
|
|
tChangeTaskMapper.insertSelective(tChangeTask);
|
|
|
+
|
|
|
+
|
|
|
//根据上级id修改上级
|
|
|
updateSuperServiceYear(tChangeTask);
|
|
|
return tChangeTask;
|
|
|
}
|
|
|
|
|
|
public void updateSuperServiceYear(TChangeTask tChangeTask) {
|
|
|
+ List<TChangeTask> tChangeTasks = tChangeTaskMapper.selectBySuper(null, tChangeTask.getId(), tChangeTask.getCid());
|
|
|
+ int a=0,b=0,c=0;
|
|
|
+ for (TChangeTask e : tChangeTasks) {
|
|
|
+ if (e.getHtMember()!=null)a=e.getHtMember();
|
|
|
+ if (e.getAdditionalDeduction()!=null)b=e.getAdditionalDeduction();
|
|
|
+ if (e.getRdAwardsubsidy()!=null)c=e.getRdAwardsubsidy();
|
|
|
+ }
|
|
|
+ tChangeTask.setHtMember(a);
|
|
|
+ tChangeTask.setAdditionalDeduction(b);
|
|
|
+ tChangeTask.setRdAwardsubsidy(c);
|
|
|
+ tChangeTaskMapper.update(tChangeTask);
|
|
|
if(tChangeTask.getSplitSuper()!=null){
|
|
|
tChangeTaskMapper.updateSuperServiceYear(tChangeTask);
|
|
|
}else {
|