From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/BodySideAppointmentsController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BodySideAppointmentsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BodySideAppointmentsController.java
index 8b45b7b..dc94c1b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BodySideAppointmentsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BodySideAppointmentsController.java
@@ -40,21 +40,20 @@
/**
* 获取所有体测预约记录
+ *
* @return
*/
@RequestMapping("/base/bodySideAppointments/listAll")
- public List<QueryBodySideAppointmentVO> listAll(@RequestBody QueryBodySideAppointment vo){
+ public List<QueryBodySideAppointmentVO> listAll(@RequestBody QueryBodySideAppointment vo) {
List<QueryBodySideAppointmentVO> queryBodySideAppointmentVOS = bodySideAppointmentService.listAll(vo);
List<Integer> list = new ArrayList<>();
for (QueryBodySideAppointmentVO queryBodySideAppointmentVO : queryBodySideAppointmentVOS) {
list.add(queryBodySideAppointmentVO.getStoreId());
}
- list.add(1);
- list.add(2);
List<Store> stores = storeClient.queryStoreByIds(list);
for (QueryBodySideAppointmentVO queryBodySideAppointmentVO : queryBodySideAppointmentVOS) {
for (Store store : stores) {
- if (queryBodySideAppointmentVO.getStoreId() == store.getId()){
+ if (queryBodySideAppointmentVO.getStoreId() == store.getId()) {
queryBodySideAppointmentVO.setStoreName(store.getName());
break;
}
@@ -62,39 +61,43 @@
}
return queryBodySideAppointmentVOS;
}
+
/**
* 增加/修改体测预约记录
+ *
* @return
*/
@RequestMapping("/base/bodySideAppointments/addBodySideAppointments")
- public Object addBodySideAppointments(@RequestBody QueryBodySideAppointmentVO vo){
+ public Object addBodySideAppointments(@RequestBody QueryBodySideAppointmentVO vo) {
BodySideAppointment bodySideAppointment = new BodySideAppointment();
- BeanUtils.copyProperties(vo,bodySideAppointment);
+ BeanUtils.copyProperties(vo, bodySideAppointment);
bodySideAppointment.setStatus(1);
bodySideAppointment.setState(1);
bodySideAppointment.setInsertTime(new Date());
- if (vo.getId() != null){
- return bodySideAppointmentService.updateById(bodySideAppointment);
- }else {
+ if (vo.getId() != null) {
+ return bodySideAppointmentService.updateById(bodySideAppointment);
+ } else {
return bodySideAppointmentService.save(bodySideAppointment);
}
}
/**
* 手动标记用户已经到店并完成体测
+ *
* @return
*/
@RequestMapping("/base/bodySideAppointments/changeState")
- public Object changeState(@RequestBody List<Integer> ids){
+ public Object changeState(@RequestBody List<Integer> ids) {
return bodySideAppointmentService.changeState(ids);
}
/**
* 通过id获取体测预约记录
+ *
* @return
*/
@RequestMapping("/base/bodySideAppointments/getInfoById")
- public BodySideAppointment getInfoById(@RequestBody Integer id){
+ public BodySideAppointment getInfoById(@RequestBody Integer id) {
return bodySideAppointmentService.getById(id);
}
--
Gitblit v1.7.1