Skip to content

yangxiujun / paidan_demo

Go to a project
Commit fd91bff0 by 王力
Options

Merge branch 'dev_engineer_bussiness' into 'develop' 

修复bussiness相关接口值

See merge request !223
2 parents c9f83922 28408fb2
Inline Side-by-side
Showing with 12 additions and 33 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/EngineerBusinessListResp.java
...@@ -20,9 +20,9 @@ public class EngineerBusinessListResp { ...@@ -20,9 +20,9 @@ public class EngineerBusinessListResp {
private String kind; private String kind;
private Integer maxNum; private Integer maxNum;
private Integer maxMinute; private Integer maxMinute;
private String priority; private Integer priority;
private String address; private String address;
private String location; private String location;
private String departure; private Integer departure;
} }
} }
project-order/src/main/java/com/dituhui/pea/order/dto/EngineerBusinessUpdateReqDTO.java
...@@ -7,6 +7,6 @@ public class EngineerBusinessUpdateReqDTO { ...@@ -7,6 +7,6 @@ public class EngineerBusinessUpdateReqDTO {
private String engineerCode; private String engineerCode;
private Integer maxNum; private Integer maxNum;
private Integer maxMinute; private Integer maxMinute;
private String departure; private Integer departure;
private String priority; private Integer priority;
} }
project-order/src/main/java/com/dituhui/pea/order/service/EngineerService.java
...@@ -20,5 +20,5 @@ public interface EngineerService { ...@@ -20,5 +20,5 @@ public interface EngineerService {
Result<?> getEngineerBusinessDetail(String engineerCode); Result<?> getEngineerBusinessDetail(String engineerCode);
// 技术员业务属性配置修改 // 技术员业务属性配置修改
Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMutine, String departure, String priority); Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMinute, Integer departure, Integer priority);
} }
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
...@@ -202,27 +202,15 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -202,27 +202,15 @@ public class EngineerServiceImpl implements EngineerService {
@Transactional @Transactional
@Override @Override
public Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMinute, String departure, String priority) { public Result<?> engineerBusinessUpdate(String engineerCode, Integer maxNum, Integer maxMinute, Integer departure, Integer priority) {
// 技术员业务属性配置修改 // 技术员业务属性配置修改
LambdaUpdateWrapper<EngineerBusiness> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<EngineerBusiness> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EngineerBusiness::getEngineerCode, engineerCode); wrapper.eq(EngineerBusiness::getEngineerCode, engineerCode);
wrapper.set(maxNum >= 0, EngineerBusiness::getMaxNum, maxNum); wrapper.set(maxNum >= 0, EngineerBusiness::getMaxNum, maxNum);
wrapper.set(maxMinute >= 0, EngineerBusiness::getMaxMinute, maxMinute); wrapper.set(maxMinute >= 0, EngineerBusiness::getMaxMinute, maxMinute);
wrapper.set(EngineerBusiness::getDeparture, departure);
Integer dep = (departure.equals("配件仓")) ? 1 : 2; wrapper.set(EngineerBusiness::getPriority, priority);
wrapper.set(EngineerBusiness::getDeparture, dep);
int pri;
if (priority.equals("高")) {
pri = 3;
} else if (priority.equals("中")) {
pri = 2;
} else {
pri = 1;
}
wrapper.set(EngineerBusiness::getPriority, pri);
// 更新字段 // 更新字段
engineerBusinessDao.update(null, wrapper); engineerBusinessDao.update(null, wrapper);
...@@ -420,26 +408,17 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -420,26 +408,17 @@ public class EngineerServiceImpl implements EngineerService {
if (b == null) { if (b == null) {
item.setAddress(""); item.setAddress("");
item.setLocation(""); item.setLocation("");
item.setDeparture(""); item.setDeparture(1);
item.setMaxMinute(0); item.setMaxMinute(0);
item.setMaxNum(0); item.setMaxNum(0);
item.setPriority("低"); item.setPriority(1);
} else { } else {
item.setAddress(b.getAddress()); item.setAddress(b.getAddress());
item.setLocation(String.format("%s,%s", b.getX(), b.getY())); item.setLocation(String.format("%s,%s", b.getX(), b.getY()));
item.setDeparture((b.getDeparture() == 1) ? "配件仓" : "住址"); item.setDeparture(b.getDeparture());
item.setMaxMinute(b.getMaxMinute()); item.setMaxMinute(b.getMaxMinute());
item.setMaxNum(b.getMaxNum()); item.setMaxNum(b.getMaxNum());
item.setPriority(b.getPriority());
String priority;
if (b.getPriority() == 3) {
priority = "高";
} else if (b.getPriority() == 2) {
priority = "中";
} else {
priority = "低";
}
item.setPriority(priority);
} }
items.add(item); items.add(item);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!