Commit fe68b974 by 丁伟峰

Merge branch 'feature-dingwf-0715' into develop

2 parents 5da780c4 6fdfc841
...@@ -186,8 +186,12 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -186,8 +186,12 @@ public class OrderCreateServiceImpl implements OrderCreateService {
oa.setEngineerCode(assignEngineerCode); oa.setEngineerCode(assignEngineerCode);
EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(assignEngineerCode); EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(assignEngineerCode);
oa.setEngineerName(engineerInfo.getName()); oa.setEngineerName(engineerInfo.getName());
int age = (int)DateUtils.getAge(engineerInfo.getBirth()); if(StringUtils.isNotBlank(engineerInfo.getBirth())) {
int age = (int) DateUtils.getAge(engineerInfo.getBirth());
oa.setEngineerAge(age); oa.setEngineerAge(age);
} else {
oa.setEngineerAge(0);
}
oa.setEngineerPhone(engineerInfo.getPhone()); oa.setEngineerPhone(engineerInfo.getPhone());
oa.setPreStatus("VIRTUAL"); oa.setPreStatus("VIRTUAL");
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!