Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 297620cd by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop 

# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
#	project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java
#	project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
2 parents 475de1a6 f4c7eb5a
Inline Side-by-side
Showing with 152 additions and 165 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/CapacityController.java
......@@ -2,7 +2,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.dituhui.pea.order.service.CapacityQueryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
......@@ -16,7 +16,7 @@ public class CapacityController {
private CapacityQueryService capacityQueryService;
@GetMapping("/capacity/query")
public Result<?> capacityQuery(@Validated CapacityStatQueryReqDTO reqDTO) {
public Result<?> capacityQuery(@Validated CapacityStatQueryDTO.Request reqDTO) {
Result<?> res = null;
try {
res = capacityQueryService.getTeamStatData(reqDTO);
......
project-order/src/main/java/com/dituhui/pea/order/controller/OrderCreateController.java
......@@ -19,7 +19,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderCreateReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.service.OrderCreateService;
import com.dituhui.pea.order.service.CapacityQueryService;
......@@ -60,10 +60,10 @@ public class OrderCreateController {
}
@PostMapping("/order/service/capacity/query")
public Result<?> capacityQuery(@Validated @RequestBody CapacityOrderQueryReqDTO capacityQueryReqDTO) {
public Result<?> capacityQuery(@Validated @RequestBody CapacityOrderQueryDTO.Request reqDTO) {
Result<?> res = null;
try {
res = capacityQueryService.getOneCapacityData(capacityQueryReqDTO);
res = capacityQueryService.getOneCapacityData(reqDTO);
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
......
project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
......@@ -24,7 +24,7 @@ public class WorkbenchController {
WorkbenchService workbenchService;
@GetMapping("/workbench/serviceOrder/change/list")
public Result<?> orderChangeList(@Validated OrderChangeListReqDTO reqDTO) {
public Result<?> orderChangeList(@Validated OrderChangeListDTO.Request reqDTO) {
Result<?> res = null;
try {
res = workbenchService.getOrderChangeList(reqDTO);
......
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryDTO.java
......@@ -3,17 +3,40 @@ package com.dituhui.pea.order.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
@Accessors(chain = true)
public class CapacityOrderQueryRespDTO {
public class CapacityOrderQueryDTO {
@Data
public static class Request {
@NotNull(message = "location不能为空")
private String location;
private String address;
@NotNull(message = "brand不能为空")
private String brand;
@NotNull(message = "type不能为空")
private String type;
@NotNull(message = "skill不能为空")
private String skill;
@NotNull(message = "startDate不能为空")
private String startDate;
@NotNull(message = "endDate不能为空")
private String endDate;
}
@Data
@Accessors(chain = true)
public static class Result {
private String startDate;
private String endDate;
private String remark;
private List<LegendDTO> legend;
private List<CalendarDTO> calendar;
}
@Data
@Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class CapacityOrderQueryReqDTO {
@NotNull(message = "location不能为空")
private String location;
private String address;
@NotNull(message = "brand不能为空")
private String brand;
@NotNull(message = "type不能为空")
private String type;
@NotNull(message = "skill不能为空")
private String skill;
@NotNull(message = "startDate不能为空")
private String startDate;
@NotNull(message = "endDate不能为空")
private String endDate;
}
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......@@ -7,18 +8,43 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.List;
@lombok.Data
@Accessors(chain = true)
public class CapacityStatQueryRespDTO {
private List<Content> content;
public class CapacityStatQueryDTO {
@lombok.Data
public static class Request {
@NotBlank
private String startDate;
@NotBlank
private String endDate;
/**
* cluster/branch/group
*/
@NotBlank
private String levelType;
/**
* clusterId/branchId/groupId
*/
@NotBlank
private String levelValue;
private Integer page = OrderConfig.DEFAULT_PAGE_INDEX;
private Integer size = OrderConfig.DEFAULT_PAGE_SIZE;
}
@lombok.Data
@Accessors(chain = true)
public static class Result {
private List<?> content;
private String levelType;
private long pageCurrent;
private long pages;
private long pageSize;
private long total;
}
@lombok.Data
@Accessors(chain = true)
......@@ -44,5 +70,3 @@ public class CapacityStatQueryRespDTO {
}
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
@lombok.Data
public class CapacityStatQueryReqDTO {
@NotBlank
private String startDate;
@NotBlank
private String endDate;
/**
* cluster/branch/group
*/
@NotBlank
private String levelType;
/**
* clusterId/branchId/groupId
*/
@NotBlank
private String levelValue;
private Integer page = OrderConfig.DEFAULT_PAGE_INDEX;
private Integer size = OrderConfig.DEFAULT_PAGE_SIZE;
}
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListDTO.java
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......@@ -7,17 +8,45 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@lombok.Data
@Accessors(chain = true)
public class OrderChangeListRespDTO {
public class OrderChangeListDTO {
@lombok.Data
public static class Request {
/**
* 查询范围：root/cluster/branch/group
*/
private String levelType;
/**
* levelType对应的id值
*/
private String levelValue;
private int page = OrderConfig.DEFAULT_PAGE_INDEX;
private int size = OrderConfig.DEFAULT_PAGE_SIZE;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate date = LocalDate.now();
/**
* 排序
*/
private String sort;
}
@lombok.Data
@Accessors(chain = true)
public static class Result {
private List<?> content;
private long pageCurrent;
private long pages;
private long pageSize;
private long total;
}
@lombok.Data
@Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import java.time.LocalDate;
@lombok.Data
public class OrderChangeListReqDTO {
/**
* 查询范围：root/cluster/branch/group
*/
private String levelType;
/**
* levelType对应的id值
*/
private String levelValue;
private int page = OrderConfig.DEFAULT_PAGE_INDEX;
private int size = OrderConfig.DEFAULT_PAGE_SIZE;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate date = LocalDate.now();
/**
* 排序
*/
private String sort;
}
project-order/src/main/java/com/dituhui/pea/order/dto/PubParameterRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/PubParameterDTO.java
......@@ -4,9 +4,12 @@ import lombok.experimental.Accessors;
import java.util.List;
@lombok.Data
public class PubParameterRespDTO {
public class PubParameterDTO {
@lombok.Data
public static class Result {
private List<?> enums;
}
@lombok.Data
@Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java
package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.fasterxml.jackson.core.JsonProcessingException;
public interface CapacityQueryService {
......@@ -13,7 +13,7 @@ public interface CapacityQueryService {
* @return
* @throws JsonProcessingException
*/
Result<?> getOneCapacityData(CapacityOrderQueryReqDTO capacityQueryReqDTO);
Result<?> getOneCapacityData(CapacityOrderQueryDTO.Request capacityQueryReqDTO);
Result<?> getTeamStatData(CapacityStatQueryReqDTO capacityStatQueryReqDTO);
Result<?> getTeamStatData(CapacityStatQueryDTO.Request capacityStatQueryReqDTO);
}
project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
......@@ -2,12 +2,12 @@ package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.EngineersGanttReqDTO;
import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
import com.dituhui.pea.order.dto.OrderChangeListDTO;
import java.time.LocalDate;
public interface WorkbenchService {
Result<?> getOrderChangeList(OrderChangeListReqDTO orderChangeListReqDTO);
Result<?> getOrderChangeList(OrderChangeListDTO.Request orderChangeListReqDTO);
Result<?> getWorkbenchSummary(String levelType, String levelValue, LocalDate dt);
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
......@@ -3,10 +3,8 @@ package com.dituhui.pea.order.service.impl;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryRespDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryRespDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.CapacityQueryService;
import com.dituhui.pea.order.service.CommonService;
......@@ -53,30 +51,30 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
private OrgBranchDao orgBranchDao;
@Override
public Result<?> getOneCapacityData(CapacityOrderQueryReqDTO reqDTO) {
public Result<?> getOneCapacityData(CapacityOrderQueryDTO.Request reqDTO) {
// 单条容量查询
log.info("===> getOneCapacityData()");
String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill());
String teamId = commonService.getTeamIdByInput(reqDTO.getLocation(), reqDTO.getAddress(), layer);
log.info("teamId[{}]layer[{}]", teamId, layer);
CapacityOrderQueryRespDTO capacityQueryRespDTO = new CapacityOrderQueryRespDTO();
capacityQueryRespDTO.setStartDate(reqDTO.getStartDate()).setEndDate(reqDTO.getEndDate());
capacityQueryRespDTO.setCalendar(getTeamCapacityByLayerAndDays(teamId, layer, reqDTO.getStartDate(), reqDTO.getEndDate()));
capacityQueryRespDTO.setLegend(getLengends());
capacityQueryRespDTO.setRemark(String.format("%s-%s", teamId, layer));
return Result.success(capacityQueryRespDTO);
CapacityOrderQueryDTO.Result rs = new CapacityOrderQueryDTO.Result();
rs.setStartDate(reqDTO.getStartDate()).setEndDate(reqDTO.getEndDate());
rs.setCalendar(getTeamCapacityByLayerAndDays(teamId, layer, reqDTO.getStartDate(), reqDTO.getEndDate()));
rs.setLegend(getLengends());
rs.setRemark(String.format("%s-%s", teamId, layer));
return Result.success(rs);
}
private List<CapacityOrderQueryRespDTO.LegendDTO> getLengends() {
List<CapacityOrderQueryRespDTO.LegendDTO> legends = new ArrayList<>();
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(1).setMemo("剩余30%以上"));
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(2).setMemo("剩余60%以上"));
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(3).setMemo("剩余30%以内"));
private List<CapacityOrderQueryDTO.LegendDTO> getLengends() {
List<CapacityOrderQueryDTO.LegendDTO> legends = new ArrayList<>();
legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(1).setMemo("剩余30%以上"));
legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(2).setMemo("剩余60%以上"));
legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(3).setMemo("剩余30%以内"));
return legends;
}
@Override
public Result<?> getTeamStatData(CapacityStatQueryReqDTO reqDTO) {
public Result<?> getTeamStatData(CapacityStatQueryDTO.Request reqDTO) {
// 根据大区/分部/分站查询，分别返回分部/分站/工作队的容量
Page<?> stats = null;
Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
......@@ -104,14 +102,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
log.info("levelType: {} ==> teamIds: {}", levelType, teamIds);
stats = capacityTeamStatDao.findByTeamIdsAndWorkdayBetween(teamIds, reqDTO.getStartDate(), reqDTO.getEndDate(), pageable);
}
CapacityStatQueryRespDTO data = new CapacityStatQueryRespDTO();
data.setLevelType(levelType);
data.setTotal(stats.getTotalElements()).setPages(stats.getTotalPages()).setPageSize(pageable.getPageSize()).setPageCurrent(stats.getNumber());
CapacityStatQueryDTO.Result rs = new CapacityStatQueryDTO.Result();
rs.setLevelType(levelType);
rs.setTotal(stats.getTotalElements()).setPages(stats.getTotalPages()).setPageSize(pageable.getPageSize()).setPageCurrent(stats.getNumber());
List<CapacityStatQueryRespDTO.Content> contents = new ArrayList<>();
List<CapacityStatQueryDTO.Content> contents = new ArrayList<>();
for (Object item : stats.getContent()) {
CapacityStatQueryRespDTO.Content content = new CapacityStatQueryRespDTO.Content();
log.info("===== content1: {}", content);
CapacityStatQueryDTO.Content content = new CapacityStatQueryDTO.Content();
if (item instanceof CapacityOrgStatEntity) {
// cluster/branch查询，都是capacity_org_stat
CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
......@@ -130,15 +127,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
.setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsed()).setCapAdjust(e.getCapAdjust())
.setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime());
}
log.info("===== content2: {}", content);
contents.add(content);
};
log.info("===== contents: {}", contents);
}
contents.stream().sorted(
Comparator.comparing(CapacityStatQueryRespDTO.Content::getDate)).collect(Collectors.toList());
data.setContent(contents);
log.info("===== data: {}", data);
return Result.success(data);
Comparator.comparing(CapacityStatQueryDTO.Content::getDate)).collect(Collectors.toList());
rs.setContent(contents);
return Result.success(rs);
}
private int getSpanType(int capLeft, int capTotal) {
......@@ -178,23 +173,23 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
* @param endDate
* @return
*/
private List<CapacityOrderQueryRespDTO.CalendarDTO> getTeamCapacityByLayerAndDays(String teamId, String layer, String beginDate, String endDate) {
private List<CapacityOrderQueryDTO.CalendarDTO> getTeamCapacityByLayerAndDays(String teamId, String layer, String beginDate, String endDate) {
log.info("==> getTimeRangeByTeamSkill({}, {}, {}, {})", teamId, layer, beginDate, endDate);
Map<String, CapacityOrderQueryRespDTO.CalendarDTO> dayMaps = new HashMap<>();
Map<String, CapacityOrderQueryDTO.CalendarDTO> dayMaps = new HashMap<>();
List<CapacityTeamStatEntity> capacityTeamStatEntityList = capacityTeamStatDao.findAllByTeamIdAndLayerAndWorkdayBetween(teamId, layer, beginDate, endDate);
for (CapacityTeamStatEntity e : capacityTeamStatEntityList) {
log.info("CapacityTeamStatEntity ==> {}", e);
CapacityOrderQueryRespDTO.TimeDTO timeDTO = new CapacityOrderQueryRespDTO.TimeDTO();
CapacityOrderQueryDTO.TimeDTO timeDTO = new CapacityOrderQueryDTO.TimeDTO();
timeDTO.setType(getSpanType(e.getCapLeft(), e.getCapTotal()));
Object[] timeSpans = getTimeSpanInfo(e.getWorkday(), e.getTimeSpan(), e.getTimeSpanDetail());
timeDTO.setText((String) timeSpans[0]);
timeDTO.setBegin((String) timeSpans[1]);
timeDTO.setEnd((String) timeSpans[2]);
CapacityOrderQueryRespDTO.CalendarDTO calendarDTO = null;
CapacityOrderQueryDTO.CalendarDTO calendarDTO = null;
if (dayMaps.containsKey(e.getWorkday())) {
calendarDTO = dayMaps.get(e.getWorkday());
} else {
calendarDTO = new CapacityOrderQueryRespDTO.CalendarDTO();
calendarDTO = new CapacityOrderQueryDTO.CalendarDTO();
calendarDTO.setDate(e.getWorkday()).setWeek(getWeekday(e.getWorkday()));
calendarDTO.setTimes(new ArrayList<>());
}
......@@ -202,7 +197,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
dayMaps.put(e.getWorkday(), calendarDTO);
}
return new ArrayList<>(dayMaps.values()).stream()
.sorted(Comparator.comparing(CapacityOrderQueryRespDTO.CalendarDTO::getDate)).collect(Collectors.toList());
.sorted(Comparator.comparing(CapacityOrderQueryDTO.CalendarDTO::getDate)).collect(Collectors.toList());
}
private String getWeekday(String day) {
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/PublicServiceImpl.java
......@@ -2,7 +2,7 @@ package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.PubParamsDao;
import com.dituhui.pea.order.dto.PubParameterRespDTO;
import com.dituhui.pea.order.dto.PubParameterDTO;
import com.dituhui.pea.order.entity.PubParamsEntity;
import com.dituhui.pea.order.service.PublicService;
import lombok.extern.slf4j.Slf4j;
......@@ -22,24 +22,24 @@ public class PublicServiceImpl implements PublicService {
@Override
public Result<?> getPublicParameter() {
List<PubParameterRespDTO.Enum> enums = new ArrayList<>();
List<PubParameterDTO.Enum> enums = new ArrayList<>();
HashMap<String, String> mapping = getMapping();
for (String k : mapping.keySet()) {
List<?> items = pubParamsDao.findByBiztype(k);
if (!items.isEmpty()) {
PubParameterRespDTO.Enum anEnum = new PubParameterRespDTO.Enum().setName(k).setDescription(mapping.get(k));
List<PubParameterRespDTO.Item> items2 = new ArrayList<>();
PubParameterDTO.Enum anEnum = new PubParameterDTO.Enum().setName(k).setDescription(mapping.get(k));
List<PubParameterDTO.Item> items2 = new ArrayList<>();
for (Object e : items) {
PubParamsEntity param = (PubParamsEntity) e;
items2.add(new PubParameterRespDTO.Item().setLabel(param.getDescription()).setValue(param.getPvalue()));
items2.add(new PubParameterDTO.Item().setLabel(param.getDescription()).setValue(param.getPvalue()));
}
anEnum.setItems(items2);
enums.add(anEnum);
}
}
PubParameterRespDTO data = new PubParameterRespDTO();
data.setEnums(enums);
return Result.success(data);
PubParameterDTO.Result rs = new PubParameterDTO.Result();
rs.setEnums(enums);
return Result.success(rs);
}
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
......@@ -3,8 +3,7 @@ package com.dituhui.pea.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
import com.dituhui.pea.order.dto.OrderChangeListRespDTO;
import com.dituhui.pea.order.dto.OrderChangeListDTO;
import com.dituhui.pea.order.dto.WorkbenchSummaryResp;
import com.dituhui.pea.order.entity.OrderChangeEntity;
import com.dituhui.pea.order.entity.OrderRequest;
......@@ -42,12 +41,11 @@ public class WorkbenchServiceImpl implements WorkbenchService {
@Autowired
private OrderEventDao orderEventDao;
@Autowired
private OrderRequestMPDao orderRequestMPDao;
@Override
public Result<?> getOrderChangeList(OrderChangeListReqDTO reqDTO) {
public Result<?> getOrderChangeList(OrderChangeListDTO.Request reqDTO) {
Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
Page<?> changes;
String levelType = reqDTO.getLevelType();
......@@ -59,10 +57,10 @@ public class WorkbenchServiceImpl implements WorkbenchService {
} else {
changes = orderEventDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
}
List<OrderChangeListRespDTO.Content> contents = new ArrayList<>();
List<OrderChangeListDTO.Content> contents = new ArrayList<>();
for (Object e1 : changes.getContent()) {
OrderChangeEntity e = (OrderChangeEntity) e1;
OrderChangeListRespDTO.Content content = new OrderChangeListRespDTO.Content();
OrderChangeListDTO.Content content = new OrderChangeListDTO.Content();
OrderRequestEntity orderRequestEntity = orderRequestDao.getByOrderId(e.getOrderId());
content.setOrderId(e.getOrderId())
.setCustomerName(orderRequestEntity.getName())
......@@ -72,12 +70,12 @@ public class WorkbenchServiceImpl implements WorkbenchService {
.setUpdateTime(e.getUpdateTime());
contents.add(content);
}
OrderChangeListRespDTO respDTO = new OrderChangeListRespDTO();
respDTO.setTotal(changes.getTotalElements())
OrderChangeListDTO.Result rs = new OrderChangeListDTO.Result();
rs.setTotal(changes.getTotalElements())
.setPages(changes.getTotalPages())
.setPageSize(changes.getSize())
.setContent(contents);
return Result.success(respDTO);
return Result.success(rs);
}
@Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!