Commit f44d7e8f by wangli

修改方法名,符合java规范

1 parent b61c4907
......@@ -16,7 +16,7 @@ public class OrderServiceListController {
private OrderServiceListService orderServiceListService;
@GetMapping("/order/service/list")
public Result<?> GetOrderServiceList(@RequestParam("startDate") String startDate,
public Result<?> getOrderServiceList(@RequestParam("startDate") String startDate,
@RequestParam("endDate") String endDate,
@RequestParam("page") long page,
@RequestParam("size") long size,
......@@ -28,7 +28,7 @@ public class OrderServiceListController {
@RequestParam("skill") String skill) {
Result<?> res = null;
try {
res = orderServiceListService.GetOrderServiceList(startDate, endDate, page, size, sort, appointmentType,
res = orderServiceListService.getOrderServiceList(startDate, endDate, page, size, sort, appointmentType,
appointmentStatus, type, brand, skill);
}
catch (BusinessException e) {
......
......@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface OrderServiceListService {
Result<OrderServiceListResp> GetOrderServiceList(
Result<OrderServiceListResp> getOrderServiceList(
String startDate, String endDate, long page, long size, String sort,
String appointmentType, String appointmentStatus, String type, String brand,
String skill) throws BusinessException;
......
......@@ -36,7 +36,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
@Transactional
@Override
public Result<OrderServiceListResp> GetOrderServiceList(
public Result<OrderServiceListResp> getOrderServiceList(
String startDate, String endDate, long page, long size, String sort,
String appointmentType, String appointmentStatus, String type, String brand,
String skill) throws BusinessException {
......@@ -45,8 +45,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
IPage<OrderRequest> pg = new Page(page, size);
LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
lqw.ge(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(startDate)); //预约开始日期
lqw.le(OrderRequest::getExpectTimeBegin, this.GetTimestampFromDate(endDate)); //预约结束日期
lqw.ge(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(startDate)); //预约开始日期
lqw.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(endDate)); //预约结束日期
lqw.eq(Strings.isNotEmpty(appointmentStatus), OrderRequest::getAppointmentStatus, appointmentStatus); //指派状态
lqw.eq(Strings.isNotEmpty(type), OrderRequest::getType, type); //设备类型
lqw.eq(Strings.isNotEmpty(brand), OrderRequest::getBrand, brand); //品牌
......@@ -63,7 +63,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
orderIds.add(r.getOrderId());
}
// 获取工程师姓名列表
HashMap<String, List<String>> engineerNames = this.getEngineerNames(this.GetOrderAppointments(orderIds));
HashMap<String, List<String>> engineerNames = this.getEngineerNames(this.getOrderAppointments(orderIds));
List<String> names;
List<OrderServiceList> content = new ArrayList<>();
......@@ -101,7 +101,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
}
public List<OrderAppointment> GetOrderAppointments(List<String> orderIds) {
public List<OrderAppointment> getOrderAppointments(List<String> orderIds) {
// 获取指派单列表
if(CollectionUtil.isEmpty(orderIds)) {
return new ArrayList<OrderAppointment>();
......@@ -170,7 +170,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
return String.join("、", names);
}
public Timestamp GetTimestampFromDate(String date){
public Timestamp getTimestampFromDate(String date){
return Timestamp.valueOf(date + " 00:00:00");
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!