|
|
@@ -1697,18 +1697,16 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tChangeTasks = tChangeTaskMapper.selectBySuper(null, in.getId(), tChangeTask.getCid());
|
|
|
}
|
|
|
int a=0,b=0,c=0;
|
|
|
- StringBuilder str= null;
|
|
|
+ StringBuilder str= new StringBuilder();
|
|
|
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();
|
|
|
- if (e.getServiceYear()!=null){
|
|
|
+ if (e.getServiceYear()!=null&&e.getType()!=3){
|
|
|
str.append(e.getServiceYear()).append(",");
|
|
|
}
|
|
|
}
|
|
|
- if (str != null) {
|
|
|
- tChangeTask.setServiceYear(str.substring(0,str.length()-1));
|
|
|
- }
|
|
|
+ tChangeTask.setServiceYear(str.substring(0, str.length() - 1));
|
|
|
tChangeTask.setHtMember(a);
|
|
|
tChangeTask.setAdditionalDeduction(b);
|
|
|
tChangeTask.setRdAwardsubsidy(c);
|
|
|
@@ -1739,7 +1737,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
List<TChangeTask> tChangeTasks = getChangeSonTasks(tChangeTask);
|
|
|
//如果没有子项目则修改上级
|
|
|
- if (tChangeTasks == null || tChangeTasks.isEmpty()) {
|
|
|
+ if (tChangeTasks.isEmpty()) {
|
|
|
TChangeTask changeTask = new TChangeTask();
|
|
|
changeTask.setId(tChangeTask.getSplitSuper());
|
|
|
changeTask.setSplitStatus(0);
|