diff --git a/src/main/java/com/example/mini_program/common/Result.java b/src/main/java/com/example/mini_program/common/Result.java index f2f6c0d..b1c2dea 100644 --- a/src/main/java/com/example/mini_program/common/Result.java +++ b/src/main/java/com/example/mini_program/common/Result.java @@ -11,7 +11,7 @@ public class Result { public static Result success(T data) { Result result = new Result<>(); - result.setCode(0); + result.setCode(200); result.setMessage("success"); result.setData(data); return result; diff --git a/src/main/java/com/example/mini_program/controller/AppointmentController.java b/src/main/java/com/example/mini_program/controller/AppointmentController.java index 71536a2..665c04b 100644 --- a/src/main/java/com/example/mini_program/controller/AppointmentController.java +++ b/src/main/java/com/example/mini_program/controller/AppointmentController.java @@ -3,6 +3,7 @@ package com.example.mini_program.controller; import com.example.mini_program.common.Result; import com.example.mini_program.entity.VisitApplication; import com.example.mini_program.service.AppointmentService; +import com.example.mini_program.vo.ReceptionPersonVo; import com.example.mini_program.vo.VisitApplicationVo; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -16,6 +17,7 @@ public class AppointmentController { private final AppointmentService appointmentService; + /** * 根据openid获取最新的一条预约记录 */ @@ -104,4 +106,15 @@ public class AppointmentController { VisitApplicationVo vo = appointmentService.detail(id, openid); return Result.success(vo); } + + /** + * 受访人下拉框值 + */ + @PostMapping("/person/selector") + public Result> personSelector() { + System.out.println("----------------------------------"); + // 异步处理,立即返回 + List list = appointmentService.personSelector(); + return Result.success(list); + } } diff --git a/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java b/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java new file mode 100644 index 0000000..85459c7 --- /dev/null +++ b/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java @@ -0,0 +1,11 @@ +package com.example.mini_program.entity; + +import lombok.Data; + +@Data +public class ReceptionPersonPO { + + private Long id; + private String personId; + private String personName; +} diff --git a/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java b/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java new file mode 100644 index 0000000..c0a84fa --- /dev/null +++ b/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java @@ -0,0 +1,11 @@ +package com.example.mini_program.mapper; + +import com.example.mini_program.entity.ReceptionPersonPO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ReceptionPersonMapper { + List selectReceptionPerson(); +} diff --git a/src/main/java/com/example/mini_program/service/AppointmentService.java b/src/main/java/com/example/mini_program/service/AppointmentService.java index 368b69d..837c72e 100644 --- a/src/main/java/com/example/mini_program/service/AppointmentService.java +++ b/src/main/java/com/example/mini_program/service/AppointmentService.java @@ -1,14 +1,19 @@ package com.example.mini_program.service; +import com.example.mini_program.entity.ReceptionPersonPO; import com.example.mini_program.entity.VisitApplication; +import com.example.mini_program.mapper.ReceptionPersonMapper; import com.example.mini_program.mapper.VisitApplicationMapper; +import com.example.mini_program.vo.ReceptionPersonVo; import com.example.mini_program.vo.VisitApplicationVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -20,9 +25,13 @@ import java.util.UUID; @Service @RequiredArgsConstructor public class AppointmentService { - + @Autowired private final VisitApplicationMapper visitApplicationMapper; + @Autowired private final WxApprovalService wxApprovalService; + @Autowired + private ReceptionPersonMapper receptionPersonMapper; + @Autowired private final WxSubscribeMessageService wxSubscribeMessageService; @Value("${wx.corp.creator-userid:}") @@ -155,4 +164,18 @@ public class AppointmentService { return true; } + /** + * 获取受访者下拉框的值 + */ + public List personSelector() { + List receiptPersonList = receptionPersonMapper.selectReceptionPerson(); + List voList = new ArrayList<>(); + for(ReceptionPersonPO po : receiptPersonList){ + ReceptionPersonVo vo = new ReceptionPersonVo(); + BeanUtils.copyProperties(vo, po); + voList.add(vo); + } + return voList; + } + } diff --git a/src/main/java/com/example/mini_program/vo/ReceptionPersonVo.java b/src/main/java/com/example/mini_program/vo/ReceptionPersonVo.java new file mode 100644 index 0000000..b22d234 --- /dev/null +++ b/src/main/java/com/example/mini_program/vo/ReceptionPersonVo.java @@ -0,0 +1,10 @@ +package com.example.mini_program.vo; + +import lombok.Data; + +@Data +public class ReceptionPersonVo { + + private String personId; + private String personName; +} diff --git a/src/main/resources/mapper/ReceptionPersonMapper.xml b/src/main/resources/mapper/ReceptionPersonMapper.xml new file mode 100644 index 0000000..ea03233 --- /dev/null +++ b/src/main/resources/mapper/ReceptionPersonMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + +