|
|
@@ -197,13 +197,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
|
|
|
t.setCname(str);
|
|
|
tOrderTaskMapper.insertSelective(t);
|
|
|
- if (t.getServiceLife()!=null||t.getServiceYear()!=null){
|
|
|
+ if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
|
|
|
TTaskMember ttm=new TTaskMember();
|
|
|
ttm.setTid(t.getId());
|
|
|
- ttm.setServiceLife(t.getServiceLife());
|
|
|
- ttm.setServiceYear(t.getServiceYear());
|
|
|
- ttm.setYearSum(t.getYearSum());
|
|
|
- ttm.setContractTerm(t.getContractTerm());
|
|
|
+ if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
|
|
|
+ if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
|
|
|
+ if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
|
|
|
+ if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
|
|
|
tTaskMemberMapper.insertSelective(ttm);
|
|
|
}
|
|
|
TTaskMid tm=new TTaskMid();
|
|
|
@@ -308,13 +308,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
projcetCheckLogMapper.insertSelective(log);
|
|
|
}
|
|
|
int i=tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
- if (t.getServiceLife()!=null||t.getServiceYear()!=null){
|
|
|
+ if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
|
|
|
TTaskMember ttm=new TTaskMember();
|
|
|
ttm.setTid(t.getId());
|
|
|
- ttm.setServiceLife(t.getServiceLife());
|
|
|
- ttm.setServiceYear(t.getServiceYear());
|
|
|
- ttm.setYearSum(t.getYearSum());
|
|
|
- ttm.setContractTerm(t.getContractTerm());
|
|
|
+ if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
|
|
|
+ if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
|
|
|
+ if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
|
|
|
+ if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
|
|
|
tTaskMemberMapper.updateByTid(ttm);
|
|
|
}
|
|
|
if (flag) {
|