Skip to content

yangxiujun / paidan_demo

Go to a project
Commit ba2a96ba by huangjinxin
Options

fix：工单分组返回经纬度

1 parent 812d6680
Inline Side-by-side
Showing with 6 additions and 0 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
...@@ -86,4 +86,8 @@ public class OrderServiceList { ...@@ -86,4 +86,8 @@ public class OrderServiceList {
*/ */
private String actualEndTime; private String actualEndTime;
/**
* bean同步地址id
*/
private String addressId;
} }
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
...@@ -157,6 +157,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -157,6 +157,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setMultipleOrders(o.getMultipleOrders()); record.setMultipleOrders(o.getMultipleOrders());
record.setTranscend(o.getTranscend()); record.setTranscend(o.getTranscend());
record.setIsSpecialTime(o.getIsSpecialTime()); record.setIsSpecialTime(o.getIsSpecialTime());
record.setAddressId(o.getAddressId());
record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime())); record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime()));
record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime())); record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime()));
...@@ -223,6 +224,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -223,6 +224,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setAppointEngineerCodes(o.getAppointEngineerCodes()); record.setAppointEngineerCodes(o.getAppointEngineerCodes());
record.setMultipleOrders(o.getMultipleOrders()); record.setMultipleOrders(o.getMultipleOrders());
record.setTranscend(o.getTranscend()); record.setTranscend(o.getTranscend());
record.setAddressId(o.getAddressId());
return record; return record;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!