|
|
@@ -1687,14 +1687,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
newT.setCommodityPrice(new BigDecimal(0));
|
|
|
newT.setTaskComment(in.getTaskComment());
|
|
|
newT.setServiceYear(in.getServiceYear());
|
|
|
- tChangeTaskMapper.insertSelective(tChangeTask);
|
|
|
+ if (in.getHtMember()!=null)newT.setHtMember(in.getHtMember());
|
|
|
+ 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());
|
|
|
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();
|
|
|
+ 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();
|
|
|
}
|
|
|
tChangeTask.setHtMember(a);
|
|
|
tChangeTask.setAdditionalDeduction(b);
|