添加访问记录

src/main/java/com/xjrsoft/module/personnel/controller/ReservationSchoolController.java

@@ -17,6 +17,7 @@ import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.QrCodeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
+import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.personnel.dto.AddReservationSchoolDto;
 import com.xjrsoft.module.personnel.dto.ReservationSchoolVisitorPageDto;
 import com.xjrsoft.module.personnel.dto.UpdateReservationSchoolDto;
@@ -32,6 +33,7 @@ import com.xjrsoft.module.personnel.vo.ReservationSchoolPageVo;
 import com.xjrsoft.module.personnel.vo.ReservationSchoolVisitorPageVo;
 import com.xjrsoft.module.personnel.vo.ReservationSchoolVo;
 import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -86,11 +88,10 @@ public class ReservationSchoolController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/visitor-page")
+    @GetMapping(value = "/my-visitor-page")
     @ApiOperation(value="我的访客(分页)")
     @SaCheckPermission("reservationschool:detail")
-    public RT<PageOutput<ReservationSchoolVisitorPageVo>> visitorPage(@Valid ReservationSchoolVisitorPageDto dto){
-
+    public RT<PageOutput<ReservationSchoolVisitorPageVo>> myVisitorPage(@Valid ReservationSchoolVisitorPageDto dto){
         IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
                 ReservationSchoolVisitorPageVo.class
                 , MPJWrappers.<ReservationSchool>lambdaJoin()
@@ -104,8 +105,32 @@ public class ReservationSchoolController {
                         .select(ReservationSchool.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
                         .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getReservationSchooId,ReservationSchool::getId)
                         .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+        );
+        PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
+        return RT.ok(pageOutput);
+    }
 
-
+    @GetMapping(value = "/visitor-page")
+    @ApiOperation(value="访客记录(分页)")
+    @SaCheckPermission("reservationschool:detail")
+    public RT<PageOutput<ReservationSchoolVisitorPageVo>> visitorPage(@Valid ReservationSchoolVisitorPageDto dto){
+        IPage<ReservationSchoolVisitorPageVo> page = reservationSchoolService.selectJoinListPage(ConventPage.getPage(dto),
+                ReservationSchoolVisitorPageVo.class
+                , MPJWrappers.<ReservationSchool>lambdaJoin()
+                        .orderByDesc(ReservationSchoolPeople::getId)
+                        .disableSubLogicDel()
+                        .le(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getStartTime,dto.getVisitTime())
+                        .ge(ObjectUtil.isNotNull(dto.getVisitTime()),ReservationSchool::getEndTime,dto.getVisitTime())
+                        .like(!StrUtil.isEmpty(dto.getName()),ReservationSchoolPeople::getName,dto.getName())
+                        .like(ObjectUtil.isNotNull(dto.getIdentityCard()),ReservationSchoolPeople::getIdentityCard,dto.getIdentityCard())
+                        .eq(ObjectUtil.isNotEmpty(dto.getDeptId())&&dto.getDeptId()!=0,ReservationSchool::getDeptId,dto.getDeptId())
+                        .select(ReservationSchoolPeople::getId)
+                        .selectAs(ReservationSchoolPeople::getReservationSchooId,ReservationSchoolVisitorPageVo::getPId)
+                        .select(ReservationSchool.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
+                        .leftJoin(ReservationSchoolPeople.class,ReservationSchoolPeople::getReservationSchooId,ReservationSchool::getId)
+                        .leftJoin(Department.class,Department::getId,ReservationSchool::getDeptId,ext->ext.selectAs(Department::getName,ReservationSchoolVisitorPageVo::getDeptCn))
+                        .leftJoin(XjrUser.class,XjrUser::getId,ReservationSchool::getRespondentUserId,ext->ext.selectAs(XjrUser::getName,ReservationSchoolVisitorPageVo::getRespondentUserCn))
+                        .select(ReservationSchoolPeople.class,x -> VoToColumnUtil.fieldsToColumns(ReservationSchoolVisitorPageVo.class).contains(x.getProperty()))
         );
         PageOutput<ReservationSchoolVisitorPageVo> pageOutput = ConventPage.getPageOutput(page, ReservationSchoolVisitorPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/personnel/dto/ReservationSchoolVisitorPageDto.java

@@ -23,4 +23,16 @@ public class ReservationSchoolVisitorPageDto extends PageInput {
      */
     @ApiModelProperty("访客名称")
     private String name;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String identityCard;
+
+    /**
+     * 到访部门id
+     */
+    @ApiModelProperty("到访部门id")
+    private Long deptId;
 }

src/main/java/com/xjrsoft/module/personnel/vo/ReservationSchoolVisitorPageVo.java

@@ -12,6 +12,11 @@ public class ReservationSchoolVisitorPageVo {
      */
     @ApiModelProperty("主键")
     private String id;
+    /**
+     * 主键 主表
+     */
+    @ApiModelProperty("主键 主表")
+    private String pId;
     /**
      * 创建时间
      */
@@ -63,4 +68,15 @@ public class ReservationSchoolVisitorPageVo {
      */
     @ApiModelProperty("性别")
     private String gender;
+    /**
+     * 部门
+     */
+    @ApiModelProperty("部门")
+    private String deptCn;
+
+    /**
+     * 被访人用户
+     */
+    @ApiModelProperty("被访人用户")
+    private String respondentUserCn;
 }