Skip to content

yangxiujun / paidan_demo

Go to a project
Commit f4481d1b by wangli
Options

表重命名

1 parent e6752ca9
Inline Side-by-side
Showing with 26 additions and 26 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrderServiceDao.java → project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrderRequestDao.java
package com.alibaba.cloud.integration.order.dao; package com.alibaba.cloud.integration.order.dao;
import com.alibaba.cloud.integration.order.entity.OrderService; import com.alibaba.cloud.integration.order.entity.OrderRequest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface OrderServiceDao extends BaseMapper<OrderService> { public interface OrderRequestDao extends BaseMapper<OrderRequest> {
} }
project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrderService.java → project-order/src/main/java/com/alibaba/cloud/integration/order/entity/OrderRequest.java
...@@ -4,7 +4,7 @@ import lombok.Data; ...@@ -4,7 +4,7 @@ import lombok.Data;
import java.sql.Timestamp; import java.sql.Timestamp;
@Data @Data
public class OrderService { public class OrderRequest {
private Integer id; private Integer id;
private String orderId; private String orderId;
private String name; private String name;
......
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceDetailImpl.java
...@@ -4,7 +4,7 @@ import com.alibaba.cloud.integration.common.Result; ...@@ -4,7 +4,7 @@ import com.alibaba.cloud.integration.common.Result;
import com.alibaba.cloud.integration.order.dao.*; import com.alibaba.cloud.integration.order.dao.*;
import com.alibaba.cloud.integration.order.dto.KV; import com.alibaba.cloud.integration.order.dto.KV;
import com.alibaba.cloud.integration.order.dto.OrderServiceDetailResp; import com.alibaba.cloud.integration.order.dto.OrderServiceDetailResp;
import com.alibaba.cloud.integration.order.entity.OrderService; import com.alibaba.cloud.integration.order.entity.OrderRequest;
import com.alibaba.cloud.integration.order.entity.OrderAppointment; import com.alibaba.cloud.integration.order.entity.OrderAppointment;
import com.alibaba.cloud.integration.order.entity.EngineerInfo; import com.alibaba.cloud.integration.order.entity.EngineerInfo;
import com.alibaba.cloud.integration.order.entity.EngineerSkill; import com.alibaba.cloud.integration.order.entity.EngineerSkill;
...@@ -22,7 +22,7 @@ import java.util.stream.Collectors; ...@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
public class OrderServiceDetailImpl implements OrderServiceDetail { public class OrderServiceDetailImpl implements OrderServiceDetail {
@Autowired @Autowired
private OrderServiceDao orderServiceDao; private OrderRequestDao orderRequestDao;
@Autowired @Autowired
private OrderAppointmentDao orderAppointmentDao; private OrderAppointmentDao orderAppointmentDao;
...@@ -41,7 +41,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -41,7 +41,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
public Result<?> GetOrderServiceDetail(String orderId) { public Result<?> GetOrderServiceDetail(String orderId) {
// 查询订单详情 // 查询订单详情
OrderService detail = this.GetOrderDetail(orderId); OrderRequest detail = this.GetOrderDetail(orderId);
// 查询指派列表 // 查询指派列表
List<OrderServiceDetailResp.OrderAppointment> items = new ArrayList<>(); List<OrderServiceDetailResp.OrderAppointment> items = new ArrayList<>();
...@@ -107,11 +107,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -107,11 +107,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
return Result.success(res); return Result.success(res);
} }
private OrderService GetOrderDetail(String orderId) { private OrderRequest GetOrderDetail(String orderId) {
// 获取服务单记录 // 获取服务单记录
LambdaQueryWrapper<OrderService> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
lqw.eq(OrderService::getOrderId, orderId); lqw.eq(OrderRequest::getOrderId, orderId);
return orderServiceDao.selectOne(lqw); return orderRequestDao.selectOne(lqw);
} }
private List<OrderAppointment> GetOrderAppointments(String orderId) { private List<OrderAppointment> GetOrderAppointments(String orderId) {
...@@ -167,7 +167,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -167,7 +167,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
return results.stream().collect(Collectors.groupingBy(OrderTimeline::getSuborderId)); return results.stream().collect(Collectors.groupingBy(OrderTimeline::getSuborderId));
} }
private List<KV> PackOrderDetail(OrderService order) { private List<KV> PackOrderDetail(OrderRequest order) {
List<KV> items = new ArrayList<>(); List<KV> items = new ArrayList<>();
items.add(this.PackOrderItem("客户姓名:", order.getName())); items.add(this.PackOrderItem("客户姓名:", order.getName()));
items.add(this.PackOrderItem("标签:", order.getTags())); items.add(this.PackOrderItem("标签:", order.getTags()));
......
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceListImpl.java
...@@ -3,12 +3,12 @@ package com.alibaba.cloud.integration.order.service.impl; ...@@ -3,12 +3,12 @@ package com.alibaba.cloud.integration.order.service.impl;
import com.alibaba.cloud.integration.common.BusinessException; import com.alibaba.cloud.integration.common.BusinessException;
import com.alibaba.cloud.integration.common.Result; import com.alibaba.cloud.integration.common.Result;
import com.alibaba.cloud.integration.order.dao.OrderAppointmentDao; import com.alibaba.cloud.integration.order.dao.OrderAppointmentDao;
import com.alibaba.cloud.integration.order.dao.OrderServiceDao; import com.alibaba.cloud.integration.order.dao.OrderRequestDao;
import com.alibaba.cloud.integration.order.dto.OrderServiceList; import com.alibaba.cloud.integration.order.dto.OrderServiceList;
import com.alibaba.cloud.integration.order.dto.OrderServiceListReq; import com.alibaba.cloud.integration.order.dto.OrderServiceListReq;
import com.alibaba.cloud.integration.order.dto.OrderServiceListResp; import com.alibaba.cloud.integration.order.dto.OrderServiceListResp;
import com.alibaba.cloud.integration.order.entity.OrderAppointment; import com.alibaba.cloud.integration.order.entity.OrderAppointment;
import com.alibaba.cloud.integration.order.entity.OrderService; import com.alibaba.cloud.integration.order.entity.OrderRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -25,7 +25,7 @@ import java.util.stream.Collectors; ...@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
public class OrderServiceListImpl { public class OrderServiceListImpl {
@Autowired @Autowired
private OrderServiceDao orderServiceDao; private OrderRequestDao orderRequestDao;
@Autowired @Autowired
private OrderAppointmentDao orderAppointmentDao; private OrderAppointmentDao orderAppointmentDao;
...@@ -34,24 +34,24 @@ public class OrderServiceListImpl { ...@@ -34,24 +34,24 @@ public class OrderServiceListImpl {
@Transactional @Transactional
public Result<OrderServiceListResp> GetOrderServiceList(OrderServiceListReq req) throws BusinessException { public Result<OrderServiceListResp> GetOrderServiceList(OrderServiceListReq req) throws BusinessException {
//分页 //分页
IPage<OrderService> page = new Page(req.getPage(), req.getSize()); IPage<OrderRequest> page = new Page(req.getPage(), req.getSize());
LambdaQueryWrapper<OrderService> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
lqw.ge(OrderService::getExpectTimeBegin, this.GetTimestampFromDate(req.getStartDate())); //预约开始日期 lqw.ge(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(req.getStartDate())); //预约开始日期
lqw.le(OrderService::getExpectTimeBegin, this.GetTimestampFromDate(req.getEndDate())); //预约结束日期 lqw.le(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(req.getEndDate())); //预约结束日期
lqw.eq(Strings.isNotEmpty(req.getAppointmentStatus()), OrderService::getStatusAppointment, req.getAppointmentStatus()); //指派状态 lqw.eq(Strings.isNotEmpty(req.getAppointmentStatus()), OrderRequest::getStatusAppointment, req.getAppointmentStatus()); //指派状态
lqw.eq(Strings.isNotEmpty(req.getType()), OrderService::getType, req.getType()); //设备类型 lqw.eq(Strings.isNotEmpty(req.getType()), OrderRequest::getType, req.getType()); //设备类型
lqw.eq(Strings.isNotEmpty(req.getBrand()), OrderService::getBrand, req.getBrand()); //品牌 lqw.eq(Strings.isNotEmpty(req.getBrand()), OrderRequest::getBrand, req.getBrand()); //品牌
lqw.eq(Strings.isNotEmpty(req.getSkill()), OrderService::getSkill, req.getSkill()); //技能 lqw.eq(Strings.isNotEmpty(req.getSkill()), OrderRequest::getSkill, req.getSkill()); //技能
// 查询工单表列表 // 查询工单表列表
orderServiceDao.selectPage(page, lqw); orderRequestDao.selectPage(page, lqw);
List<OrderService> records = page.getRecords(); List<OrderRequest> records = page.getRecords();
//获取工单订单号列表 //获取工单订单号列表
List<String> orderIds = new ArrayList<>(); List<String> orderIds = new ArrayList<>();
for(OrderService r: records) { for(OrderRequest r: records) {
orderIds.add(r.getOrderId()); orderIds.add(r.getOrderId());
} }
// 获取指派订单列表 // 获取指派订单列表
...@@ -59,7 +59,7 @@ public class OrderServiceListImpl { ...@@ -59,7 +59,7 @@ public class OrderServiceListImpl {
List<OrderAppointment> appoint; List<OrderAppointment> appoint;
List<OrderServiceList> content = new ArrayList<>(); List<OrderServiceList> content = new ArrayList<>();
for (OrderService o: records) { for (OrderRequest o: records) {
OrderServiceList record = new OrderServiceList(); OrderServiceList record = new OrderServiceList();
appoint = appointOrders.getOrDefault(o.getOrderId(), List.of()); appoint = appointOrders.getOrDefault(o.getOrderId(), List.of());
record.setOrderId(o.getOrderId()); record.setOrderId(o.getOrderId());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!