|
|
@@ -469,12 +469,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
|
|
|
private void updateTaskMember(InputAddTask t) {
|
|
|
+
|
|
|
List<TOrderTaskListBo> list = tOrderTaskMapper.splitProjectList(t.getId(), 1);
|
|
|
int a=0,b=0,c=0;
|
|
|
for (TOrderTaskListBo e : list) {
|
|
|
- if (a==0&&e.getHtMember()==1)a=e.getHtMember();
|
|
|
- if (b==0&&e.getAdditionalDeduction()==1)b=e.getAdditionalDeduction();
|
|
|
- if (c==0&&e.getRdAwardsubsidy()==1)c=e.getRdAwardsubsidy();
|
|
|
+ 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();
|
|
|
}
|
|
|
t.setHtMember(a);
|
|
|
t.setAdditionalDeduction(b);
|