Commit e1faa690 by 丁伟峰

改用apply_node,原先的order_request的description字段,仅仅用于内部备注,不对外

1 parent a94dc1ad
...@@ -120,7 +120,7 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -120,7 +120,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity.setExpectTimeBegin(LocalDateTimeUtil.parse(req.getExpectBegin(), PATTERN_DATETIME)); entity.setExpectTimeBegin(LocalDateTimeUtil.parse(req.getExpectBegin(), PATTERN_DATETIME));
entity.setExpectTimeEnd(LocalDateTimeUtil.parse(req.getExpectEnd(), PATTERN_DATETIME)); entity.setExpectTimeEnd(LocalDateTimeUtil.parse(req.getExpectEnd(), PATTERN_DATETIME));
entity.setExpectTimeDesc(req.getExpectDesc()); entity.setExpectTimeDesc(req.getExpectDesc());
entity.setDescription(req.getDescription()); entity.setApplyNote(req.getDescription()); // order_request的description字段,仅仅用于内部备注,不对外
entity.setDt(LocalDateTimeUtil.parseDate(req.getExpectBegin().substring(0, 10), PATTERN_DATE)); entity.setDt(LocalDateTimeUtil.parseDate(req.getExpectBegin().substring(0, 10), PATTERN_DATE));
// location // location
LocationDTO location = req.getLocation(); LocationDTO location = req.getLocation();
...@@ -128,7 +128,6 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -128,7 +128,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity.setCity(location.getCity()); entity.setCity(location.getCity());
entity.setCounty(location.getDistrict()); entity.setCounty(location.getDistrict());
entity.setAddress(location.getFormattedAddress()); entity.setAddress(location.getFormattedAddress());
// 根据分单,填写clusterId/branchId/groupId/teamId等
List<String> blockIds = null; List<String> blockIds = null;
List<String> layerIds = capacityUtils.getLayers(req.getBrand(), req.getType(), req.getSkill()); List<String> layerIds = capacityUtils.getLayers(req.getBrand(), req.getType(), req.getSkill());
...@@ -152,6 +151,7 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -152,6 +151,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
// 遍历工作队,每个工作队 // 遍历工作队,每个工作队
String teamId = teamIds.get(0); String teamId = teamIds.get(0);
OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(teamId); OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(teamId);
// 根据分单,填写clusterId/branchId/groupId/teamId等
entity.setOrgClusterId(teamEntity.getClusterId()); entity.setOrgClusterId(teamEntity.getClusterId());
entity.setOrgBranchId(teamEntity.getBranchId()); entity.setOrgBranchId(teamEntity.getBranchId());
entity.setOrgGroupId(teamEntity.getGroupId()); entity.setOrgGroupId(teamEntity.getGroupId());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!