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 8990aed..49c7c83 100644 --- a/src/main/java/com/example/mini_program/controller/AppointmentController.java +++ b/src/main/java/com/example/mini_program/controller/AppointmentController.java @@ -3,8 +3,8 @@ 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.entity.ReceptionDepartmentPo; import com.example.mini_program.vo.ReceptionPersonVo; -import com.example.mini_program.vo.VisitApplicationVo; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,12 +107,20 @@ public class AppointmentController { } /** - * 受访人下拉框值 + * 被访人下拉框值 */ @GetMapping("/person/selector") public Result> personSelector(@RequestParam String department) { - // 异步处理,立即返回 List list = appointmentService.personSelector(department); return Result.success(list); } + + /** + * 被访区域下拉框值 + */ + @GetMapping("/department/selector") + public Result> departmentSelector() { + List list = appointmentService.departmentSelector(); + return Result.success(list); + } } diff --git a/src/main/java/com/example/mini_program/entity/ReceptionDepartmentPo.java b/src/main/java/com/example/mini_program/entity/ReceptionDepartmentPo.java new file mode 100644 index 0000000..1d082e7 --- /dev/null +++ b/src/main/java/com/example/mini_program/entity/ReceptionDepartmentPo.java @@ -0,0 +1,10 @@ +package com.example.mini_program.entity; + +import lombok.Data; + +@Data +public class ReceptionDepartmentPo { + + private String departmentCode; + private String departmentName; +} diff --git a/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java b/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java index d28f67d..476b865 100644 --- a/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java +++ b/src/main/java/com/example/mini_program/entity/ReceptionPersonPO.java @@ -9,4 +9,5 @@ public class ReceptionPersonPO { private String personId; private String personName; private String department; + private String departmentName; } diff --git a/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java b/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java index 0ddaf3c..1ba7eae 100644 --- a/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java +++ b/src/main/java/com/example/mini_program/mapper/ReceptionPersonMapper.java @@ -1,5 +1,6 @@ package com.example.mini_program.mapper; +import com.example.mini_program.entity.ReceptionDepartmentPo; import com.example.mini_program.entity.ReceptionPersonPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -9,4 +10,6 @@ import java.util.List; @Mapper public interface ReceptionPersonMapper { List selectReceptionPerson(@Param("department") String department); + + List selectReceptionDepartment(); } 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 890fd94..d93f7ad 100644 --- a/src/main/java/com/example/mini_program/service/AppointmentService.java +++ b/src/main/java/com/example/mini_program/service/AppointmentService.java @@ -4,6 +4,7 @@ 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.entity.ReceptionDepartmentPo; import com.example.mini_program.vo.ReceptionPersonVo; import com.example.mini_program.vo.VisitApplicationVo; import lombok.RequiredArgsConstructor; @@ -157,7 +158,7 @@ public class AppointmentService { } /** - * 获取受访者下拉框的值 + * 获取被访者下拉框的值 */ public List personSelector(String department) { List receiptPersonList = receptionPersonMapper.selectReceptionPerson(department); @@ -170,4 +171,11 @@ public class AppointmentService { return voList; } + /** + * 获取被访区域下拉框的值 + */ + public List departmentSelector() { + return receptionPersonMapper.selectReceptionDepartment(); + } + } diff --git a/src/main/resources/mapper/ReceptionPersonMapper.xml b/src/main/resources/mapper/ReceptionPersonMapper.xml index 31ae5c1..26d9e83 100644 --- a/src/main/resources/mapper/ReceptionPersonMapper.xml +++ b/src/main/resources/mapper/ReceptionPersonMapper.xml @@ -7,6 +7,12 @@ + + + + + + + +