Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 9907a5ee by 王力
Options

Merge branch 'dev_bugfix_orderrequests' into 'master' 

接口新增priority参数

See merge request !130
2 parents d6f22c9d 7fe87d53
Inline Side-by-side
Showing with 3 additions and 1 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
...@@ -14,6 +14,7 @@ public class OrderServiceList { ...@@ -14,6 +14,7 @@ public class OrderServiceList {
private String address; private String address;
private String x; private String x;
private String y; private String y;
private Integer priority;
private String expectTimeBegin; private String expectTimeBegin;
private String expectTimeEnd; private String expectTimeEnd;
private String source; private String source;
......
project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java
...@@ -25,7 +25,7 @@ public class OrderRequest { ...@@ -25,7 +25,7 @@ public class OrderRequest {
private Timestamp expectTimeEnd; private Timestamp expectTimeEnd;
private String expectTimeDesc; private String expectTimeDesc;
private String source; private String source;
private String priority; private Integer priority;
private String areaId; private String areaId;
private String orderTags; private String orderTags;
private String tags; private String tags;
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
...@@ -78,6 +78,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -78,6 +78,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record.setY(o.getY()); record.setY(o.getY());
record.setSource(o.getSource()); record.setSource(o.getSource());
record.setDescription(o.getDescription()); record.setDescription(o.getDescription());
record.setPriority(o.getPriority());
record.setOrgBranchName(o.getOrgBranchName()); record.setOrgBranchName(o.getOrgBranchName());
record.setEngineerNum(this.getEngNum(names)); //工程师数量 record.setEngineerNum(this.getEngNum(names)); //工程师数量
record.setEngineerNames(this.getEngNames(names)); //工程师姓名列表 record.setEngineerNames(this.getEngNames(names)); //工程师姓名列表
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!