Merge branch 'dev' into dev_jielink

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -29,6 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.rcisoft.sys.sysuser.service.SysUserService;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/org/rcisoft/sys/sysuser/dao/SysUserRepositorys.java

@@ -35,10 +35,17 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
     SysUser querySysUsersById(Long business_id);
 
     List<SysUser> querySysUsersByName(String name);
+
+    List<SysUser> querySysUsersByPhone(String phone);
+
+    List<SysUser> querySysUsersByUserName(String username);
+
+    List<SysUser> querySysUsersByDId(Integer businessId);
+
     /**
      * 分页查询 sysUser
      */
-    IPage<SysUser> querySysUsersPaged(CyPageInfo cyPageInfo, @Param("entity") SysUser sysUser);
+    IPage<SysUser> querySysUsersPaged(CyPageInfo cyPageInfo, @Param("entity") SysUser sysUser );
 
 
 }

src/main/java/org/rcisoft/sys/sysuser/dto/ExportUserDTO.java

@@ -4,10 +4,12 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.rcisoft.core.entity.CyIdIncreEntity;
+import org.rcisoft.sys.sysuser.entity.SysUser;
 
 
 @Data
-public class ExportUserDTO {
+public class ExportUserDTO extends CyIdIncreEntity<SysUser> {
 
     @JSONField(serialize = false)
     @ApiModelProperty(name = "username", value = "登录名", required = true, dataType = "varchar")
@@ -60,7 +62,9 @@ public class ExportUserDTO {
     private String flag;
 
 
-//     // 用户类型（0内部员工 1外部访客）
+    //     // 用户类型（0内部员工 1外部访客）
 //    @Excel(name = "用户类型（0内部员工 1外部访客）", orderNum = "2", width = 20)
     private String userType;
+
+    private String identity;
 }

src/main/java/org/rcisoft/sys/sysuser/entity/SysUser.java

@@ -24,9 +24,13 @@ import java.util.List;
 @TableName("sys_user")
 public class SysUser extends CyIdIncreEntity<SysUser> {
 
+    //权重
+    @Transient
+    private Integer dictSort;
     //角色
     @Transient
     private List roleList;
+
     //班次中文名
     @Transient
     private String dictLabelBynltBz;
@@ -65,7 +69,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "登录名", orderNum = "0", width = 20)
+//    @Excel(name = "登录名", orderNum = "0", width = 20)
     private String username;
 
     /**
@@ -74,7 +78,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "用户昵称", orderNum = "1", width = 20)
+//    @Excel(name = "用户昵称", orderNum = "1", width = 20)
     private String nickName;
 
     /**
@@ -83,7 +87,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "用户类型（0内部员工 1外部访客）", orderNum = "2", width = 20)
+//    @Excel(name = "用户类型（0内部员工 1外部访客）", orderNum = "2", width = 20)
     private String userType;
 
     /**
@@ -101,7 +105,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "用户邮箱", orderNum = "4", width = 20)
+//    @Excel(name = "用户邮箱", orderNum = "4", width = 20)
     private String email;
 
     /**
@@ -119,7 +123,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "用户性别（0男 1女 2未知）", orderNum = "6", width = 20)
+    @Excel(name = "用户性别", orderNum = "6", width = 20)
     private String sex;
 
     /**
@@ -128,7 +132,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "密码", orderNum = "7", width = 20)
+//    @Excel(name = "密码", orderNum = "7", width = 20)
     private String password;
 
     /**
@@ -137,7 +141,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "身份证号", orderNum = "8", width = 20)
+//    @Excel(name = "身份证号", orderNum = "8", width = 20)
     private String idNumber;
 
     /**
@@ -146,7 +150,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "头像地址", orderNum = "9", width = 20)
+//    @Excel(name = "头像地址", orderNum = "9", width = 20)
     private String avatar;
 
     /**
@@ -155,7 +159,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "最后登录ip", orderNum = "10", width = 20)
+//    @Excel(name = "最后登录ip", orderNum = "10", width = 20)
     private String loginIp;
 
     /**
@@ -164,7 +168,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "最后登录时间", orderNum = "11", width = 20)
+//    @Excel(name = "最后登录时间", orderNum = "11", width = 20)
     private Date loginDate;
 
     /**
@@ -173,7 +177,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "所属部门id", orderNum = "12", width = 20)
+    @Excel(name = "所属部门", orderNum = "12", width = 20)
     private String deptId;
 
     /**
@@ -182,8 +186,8 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "身份（1正式员工2实习生）", orderNum = "13", width = 20)
-    private Long identity;
+//    @Excel(name = "身份", orderNum = "13", width = 20)
+    private String identity;
 
     /**
      * @desc 微信id
@@ -191,7 +195,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "微信id", orderNum = "14", width = 20)
+//    @Excel(name = "微信id", orderNum = "14", width = 20)
     private String wxOpenid;
 
     /**
@@ -200,7 +204,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "wx地址", orderNum = "15", width = 20)
+//    @Excel(name = "wx地址", orderNum = "15", width = 20)
     private String wxAddress;
 
     /**
@@ -209,7 +213,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "wx头像", orderNum = "16", width = 20)
+//    @Excel(name = "wx头像", orderNum = "16", width = 20)
     private String wxHead;
 
     /**
@@ -218,7 +222,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "wx性别", orderNum = "17", width = 20)
+//    @Excel(name = "wx性别", orderNum = "17", width = 20)
     private String wxSex;
 
     /**
@@ -227,7 +231,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "wx昵称", orderNum = "18", width = 20)
+//    @Excel(name = "wx昵称", orderNum = "18", width = 20)
     private String wxNickName;
 
     /**
@@ -245,7 +249,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "职位（暂时数据字典，可能多个）", orderNum = "20", width = 20)
+    @Excel(name = "职位", orderNum = "20", width = 20)
     private String position;
 
     /**
@@ -254,7 +258,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "入职时间", orderNum = "21", width = 20)
+//    @Excel(name = "入职时间", orderNum = "21", width = 20)
     private Date nltStartDate;
 
     /**
@@ -263,7 +267,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "地址", orderNum = "22", width = 20)
+    @Excel(name = "所属园区", orderNum = "22", width = 20)
     private String address;
 
     /**
@@ -272,7 +276,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "人脸信息（可能第三方图片数据）", orderNum = "23", width = 20)
+//    @Excel(name = "人脸信息", orderNum = "23", width = 20)
     private String faceAddress;
 
     /**
@@ -281,7 +285,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
      * @default
      * @default
      */
-    @Excel(name = "黑名单状态（0不存在1存在）", orderNum = "24", width = 20)
+//    @Excel(name = "黑名单状态（0不存在1存在）", orderNum = "24", width = 20)
     private Long blacklistFlag;
 
 

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysDeptServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.rcisoft.core.exception.CyServiceException;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.aop.CyPageUtilAsp;
 import org.rcisoft.core.model.CyPersistModel;
@@ -12,7 +13,9 @@ import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.service.CyBaseService;
 
 import org.rcisoft.sys.sysuser.dao.SysDeptRepositorys;
+import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
 import org.rcisoft.sys.sysuser.entity.SysDept;
+import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.rcisoft.sys.sysuser.service.SysDeptService;
 import org.rcisoft.sys.wbac.dept.dao.SysDeptRepository;
 
@@ -39,6 +42,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptRepositorys, SysDept>
 
     @Autowired
     SysDeptRepositorys sysDeptRepositorys;
+    @Autowired
+    SysUserRepositorys sysUserRepositorys;
 
     /**
      * 保存 部门表
@@ -80,6 +85,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptRepositorys, SysDept>
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel removeLogical(SysDept sysDept) {
+        //查询部门是否有员工
+        List<SysUser> sysUsers = sysUserRepositorys.querySysUsersByDId(sysDept.getBusinessId());
+        if (sysUsers.size() > 0) {
+            throw new CyServiceException(500, "该部门下存在员工，请先处理后再删除");
+        }
         sysDept.setDeleted();
         int line = baseMapper.deleteById(sysDept);
         log.debug(CyUserUtil.getAuthenUsername() + "逻辑删除了ID为" +

src/main/java/org/rcisoft/sys/visit/controller/InvitedPersonController.java

+package org.rcisoft.sys.visit.controller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.constant.CyMessCons;
+import org.rcisoft.core.controller.CyPaginationController;
+import org.rcisoft.core.model.CyGridModel;
+import org.rcisoft.core.model.CyPersistModel;
+import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
+import org.rcisoft.core.result.CyResult;
+import org.rcisoft.core.util.CyResultGenUtil;
+import org.rcisoft.sys.visit.entity.VisitInfoMation;
+import org.rcisoft.sys.visit.service.InvitedPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by cy laoluo 2022年11月22日
+ * 受邀人员请求接口
+ */
+@RestController
+@RequestMapping("/invitedPerson")
+@Api(tags = "受邀人员邀请信息")
+public class InvitedPersonController extends CyPaginationController<VisitInfoMation> {
+
+    @Autowired
+    private InvitedPersonService invitedPersonService;
+
+    /**
+     * 根据当前时间获取最近一次的访问安排
+     */
+    @CyOpeLogAnno(title = "visit-获取最近一次访问安排", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "获取最近一次访问安排", notes = "根据当前时间获取最近一次的访问安排")
+    @GetMapping("/invitedPerson")
+    public CyResult getLastVisitInfo(HttpServletRequest request) {
+
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                invitedPersonService.getLastVisitInfo(request));
+
+    }
+
+    /**
+     * 根据id获取受邀记录详情信息
+     *
+     * @param id 受邀记录id
+     * @return
+     */
+    @CyOpeLogAnno(title = "visit-获取受邀记录详情信息", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "根据id查找受邀记录详情")
+    @GetMapping("/getVisitInfoById/{id:\\w+}")
+    public CyResult getVisitInfoById(@PathVariable int id) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                invitedPersonService.getVisitUserById(id));
+    }
+
+    /**
+     * 根据手机号获取受邀记录详情信息
+     * @param visitPhone 访客手机号
+     * @return
+     */
+    @CyOpeLogAnno(title = "visit-获取受邀记录详情信息",businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "根据Phone查找受邀记录详情")
+    @GetMapping("/getVisitInfoByPhone/{visitPhone:\\w+}")
+    public CyResult getVisitInfoById(@PathVariable String visitPhone){
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                invitedPersonService.getVisitUserByPhone(visitPhone));
+    }
+
+
+    /**
+     * 根据条件查询邀请记录
+     * 分页请求对方法名有要求必须以ByPagination结尾 因为需要对方法名称进行过滤
+     */
+    @CyOpeLogAnno(title = "visit-根据条件查询邀请记录", businessType = CyLogTypeEnum.QUERY)
+    @ApiOperation(value = "根据条件查询邀请记录")
+    @GetMapping("/getVisitInfoListByPagination")
+    public CyGridModel getVisitInfoListByPagination(VisitInfoMation visitInfomation ,HttpServletRequest request) {
+        invitedPersonService.getVisitInfoListByPagination(getPaginationUtility(), visitInfomation ,request);
+        return getGridModelResponse();
+    }
+
+}

src/main/java/org/rcisoft/sys/visit/controller/VisitPersonController.java

@@ -50,7 +50,7 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
     @PostMapping(value = "/add")
     public CyResult add(@RequestBody SysUser sysUser, BindingResult bindingResult) {
         sysUser.setUserType("1");
-        sysUser.setIdentity(3L);
+        sysUser.setIdentity("3");
         CyPersistModel data = sysUserServiceImpl.persist(sysUser);
         return CyResultGenUtil.builder(data,
             CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/sys/visit/dao/InvitedPersonRepository.java

+package org.rcisoft.sys.visit.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.core.mapper.CyBaseMapper;
+import org.rcisoft.core.model.CyPageInfo;
+import org.rcisoft.sys.visit.entity.VisitInfoMation;
+import org.rcisoft.sys.visit.entity.VisitUser;
+
+import java.util.List;
+
+@Mapper
+public interface InvitedPersonRepository extends CyBaseMapper<VisitInfoMation> {
+
+    VisitInfoMation getVisitInfo(@Param("visit_id") int visit_id);
+
+    List<VisitUser> getVisitUserByPhone(@Param("visitPhone") String visitPhone);
+
+    /**
+     * 分页查询 visitInfomation
+     *
+     */
+    IPage<VisitInfoMation> queryVisitInfomationsPaged(CyPageInfo cyPageInfo, @Param("entity") VisitInfoMation visitInfomation, @Param("phone")String phone);
+
+
+    VisitUser getVisitUserById(@Param("businessId") int businessId);
+}

src/main/java/org/rcisoft/sys/visit/dao/VisitUserRepository.java

 package org.rcisoft.sys.visit.dao;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.rcisoft.core.mapper.CyBaseMapper;
 import org.rcisoft.sys.visit.entity.VisitUser;
 import org.rcisoft.core.model.CyPageInfo;
@@ -11,7 +12,7 @@ import java.util.List;
 /**
 * Created with cy on 2022年11月16日 下午4:30:18.
 */
-
+@Mapper
 public interface VisitUserRepository extends CyBaseMapper<VisitUser> {
 
 

src/main/java/org/rcisoft/sys/visit/entity/VisitInfoMation.java

@@ -60,6 +60,14 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
      */
     private String visitReasonCode;
 
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitReasonCodes;
+
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitReasons;
+
     /**
      * @desc 访问事由
      * @column visit_reason
@@ -83,6 +91,17 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @Excel(name = "访问区域", orderNum = "5", width = 20)
     private String visitRegion;
 
+    /**
+     * @desc 访问区域code
+     * @column visit_region_code
+     * @default
+     */
+    private String visitRegionCode;
+
+    @Transient // 查询输入的多选事由
+    @TableField(exist = false)
+    private String[] visitRegionCodes;
+
     @Transient
     @TableField(exist = false)
     private String[] visitRegions;
@@ -167,6 +186,11 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @TableField(exist = false)
     private String boolVisit;
 
+    /** 判断搜索条件是否存在其他访问事由 YES or NO**/
+    @Transient
+    @TableField(exist = false)
+    private String boolExistOtherReason;
+
     @Transient //访客信息
     @TableField(exist = false)
     List<VisitUser> userList;

src/main/java/org/rcisoft/sys/visit/entity/VisitUser.java

@@ -40,6 +40,8 @@ public class VisitUser  extends CyIdIncreEntity<VisitUser> {
      @Excel(name = "访客手机号", orderNum = "2", width = 20)
      private String visitPhone;
 
+     private VisitInfoMation visitInfo;
+
      public VisitUser() {
      }
 

src/main/java/org/rcisoft/sys/visit/service/InvitedPersonService.java

+package org.rcisoft.sys.visit.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.model.CyPageInfo;
+import org.rcisoft.core.model.CyPersistModel;
+import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
+import org.rcisoft.core.result.CyResult;
+import org.rcisoft.sys.visit.entity.VisitInfoMation;
+import org.rcisoft.sys.visit.entity.VisitUser;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.List;
+
+/**
+ * 受邀人员获取邀请信息
+ */
+public interface InvitedPersonService {
+
+    /**
+     * 根据当前时间获取最近一次的访问安排
+     */
+    VisitInfoMation getLastVisitInfo(HttpServletRequest request);
+
+    /**
+     * 根据id获取受邀记录详情信息
+     *
+     * @param id 受邀记录id
+     * @return
+     */
+    CyPersistModel getVisitInfoById(int id);
+
+    /**
+     * 根据条件查询邀请记录
+     */
+
+    IPage<VisitInfoMation> getVisitInfoListByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request);
+
+    List<VisitUser> getVisitUserByPhone(String visitPhone);
+
+    VisitUser getVisitUserById(int visitId);
+}

src/main/java/org/rcisoft/sys/visit/service/impl/InvitedPersonServiceImpl.java

+package org.rcisoft.sys.visit.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.core.jwt.util.CyJwtUtil;
+import org.rcisoft.core.model.CyPageInfo;
+import org.rcisoft.core.model.CyPersistModel;
+import org.rcisoft.core.util.CyUserUtil;
+import org.rcisoft.sys.visit.dao.InvitedPersonRepository;
+import org.rcisoft.sys.visit.dao.VisitUserRepository;
+import org.rcisoft.sys.visit.entity.VisitInfoMation;
+import org.rcisoft.sys.visit.entity.VisitUser;
+import org.rcisoft.sys.visit.service.InvitedPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * 受邀信息逻辑类
+ */
+@Service
+@Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
+@Slf4j
+public class InvitedPersonServiceImpl extends ServiceImpl<InvitedPersonRepository, VisitInfoMation> implements InvitedPersonService {
+
+    @Autowired
+    private InvitedPersonRepository invitedPersonRepository;
+
+    @Autowired
+    private CyJwtUtil cyJwtUtil;
+
+    @Autowired
+    private VisitUserRepository visitUserRepository;
+
+    /**
+     * 获取最近访问安排
+     *
+     * @return
+     */
+    @Override
+    @Transactional
+    public VisitInfoMation getLastVisitInfo(HttpServletRequest request) {
+        //获取当前时间
+        Date date = new Date();
+        System.out.println("当前系统时间" + date);
+
+        //获取当前用户手机号
+        String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE);
+        System.out.println("用户手机号" + phone);
+        //根据当前用户的手机号获取受邀记录id列表
+        LambdaQueryWrapper<VisitUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userLambdaQueryWrapper.select(VisitUser::getVisitId)
+                .eq(VisitUser::getVisitPhone, phone);
+        //查找获取受邀信息列表
+        List<VisitUser> visitUsers = visitUserRepository.selectList(userLambdaQueryWrapper);
+        //过滤id列表
+        Stream<Integer> integerStream = visitUsers.stream().map(VisitUser::getVisitId);
+        List<Integer> idList = integerStream.toList();
+
+
+        //查询条件 查询比当前时间大的第一条记录
+        QueryWrapper<VisitInfoMation> infoMationQueryWrapper = new QueryWrapper<>();
+        infoMationQueryWrapper.ge("visit_real_time", date)
+                .orderByAsc("visit_real_time")
+                .in("business_id", idList)
+                .last("limit 1");
+
+        //查找对象
+        VisitInfoMation visitInfoMation = invitedPersonRepository.selectOne(infoMationQueryWrapper);
+//        System.out.println("请求返回数据" + visitInfoMation);
+
+        return visitInfoMation;
+
+    }
+
+
+    @Override
+    public CyPersistModel getVisitInfoById(int id) {
+        return null;
+    }
+
+    /**
+     * @param paginationUtility 分页
+     * @param visitInfomation   查找信息
+     * @return
+     */
+    @Override
+    public IPage<VisitInfoMation> getVisitInfoListByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request) {
+
+        //获取当前用户手机号
+        String phone = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_PHONE);
+        System.out.println("用户手机号" + phone);
+
+        //查找对象
+        IPage<VisitInfoMation> visitInfoMationIPage = invitedPersonRepository.queryVisitInfomationsPaged(paginationUtility, visitInfomation, phone);
+        System.out.println("请求返回数据" +  visitInfoMationIPage.getPages());
+
+        return visitInfoMationIPage;
+    }
+
+    @Override
+    public List<VisitUser> getVisitUserByPhone(String visitPhone) {
+        return invitedPersonRepository.getVisitUserByPhone(visitPhone);
+    }
+
+    @Override
+    public VisitUser getVisitUserById(int visitId){
+        VisitUser visitUser = invitedPersonRepository.getVisitUserById(visitId);
+        System.out.println(visitUser);
+        return invitedPersonRepository.getVisitUserById(visitId);
+    }
+}

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -103,6 +103,16 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         }
         region = region.substring(0, region.length() - 1);
         visitInfomation.setVisitRegion(region);
+
+        String[] regionCodes = visitInfomation.getVisitRegionCodes();
+        String regionCode = "";
+        for (String code:regionCodes){
+            regionCode = regionCode + code +",";
+        }
+        if (regionCode.length()>0){
+            regionCode = regionCode.substring(0,regionCode.length()-1);
+            visitInfomation.setVisitRegionCode(regionCode);
+        }
         int line = baseMapper.insert(visitInfomation);
         log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
                 visitInfomation.getBusinessId() + "的邀访信息信息");
@@ -192,14 +202,24 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      */
     @Override
     public VisitInfoMation findById(int id) {
-        VisitInfoMation visitInfoMation = baseMapper.queryVisitById(id);
+        VisitInfoMation v = baseMapper.queryVisitById(id);
+        if (v.getVisitRegionCode() !=null){
+            String[] regionCodes = v.getVisitRegionCode().split(",");
+            v.setVisitRegionCodes(regionCodes);
+        }
+        if (v.getVisitRegion() != null) {
+            String[] regions = v.getVisitRegion().split(",");
+            v.setVisitRegions(regions);
+        }
         String vuList = "";
-        for (VisitUser vu : visitInfoMation.getUserList()) {
+        for (VisitUser vu : v.getUserList()) {
             vuList = vuList + vu.getUserName() + ',';
         }
-        vuList = vuList.substring(0, vuList.length() - 1);
-        visitInfoMation.setUserArry(vuList);
-        return visitInfoMation;
+        if (vuList.length()>0){
+            vuList = vuList.substring(0, vuList.length() - 1);
+        }
+        v.setUserArry(vuList);
+        return v;
     }
 
     /**
@@ -211,9 +231,30 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     @Override
     public IPage<VisitInfoMation> findAllByPagination(CyPageInfo<VisitInfoMation> paginationUtility,
                                                       VisitInfoMation visitInfomation) {
+        if (visitInfomation.getVisitReason()!= null && visitInfomation.getVisitReason().length()>0){
+            String[] reasons = visitInfomation.getVisitReason().split(",");
+            String[] reasonCodes = visitInfomation.getVisitReasonCode().split(",");
+            for (String r: reasons) {
+                if (r.equals("other")){
+                    visitInfomation.setBoolExistOtherReason("YES");
+                }
+            }
+            visitInfomation.setVisitReasonCodes(reasonCodes);
+            visitInfomation.setVisitReasons(reasons);
+        }
+        if (visitInfomation.getVisitRegion()!= null && visitInfomation.getVisitRegion().length()>0){
+            String[] regions = visitInfomation.getVisitRegion().split(",");
+            String[] regionCodes = visitInfomation.getVisitRegionCode().split(",");
+            visitInfomation.setVisitRegionCodes(regionCodes);
+            visitInfomation.setVisitRegions(regions);
+        }
         IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsPaged(paginationUtility, visitInfomation);
         List<VisitInfoMation> mationList = list.getRecords();
         for (VisitInfoMation v : mationList) {
+            if (v.getVisitRegionCode() !=null){
+                String[] regionCodes = v.getVisitRegionCode().split(",");
+                v.setVisitRegionCodes(regionCodes);
+            }
             if (v.getVisitRegion() != null) {
                 String[] regions = v.getVisitRegion().split(",");
                 v.setVisitRegions(regions);

src/main/resources/mapper/InvitedPersonMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.rcisoft.sys.visit.dao.InvitedPersonRepository">
+    <resultMap id="BaseResultMap" type="org.rcisoft.sys.visit.entity.VisitUser">
+        <id column="business_id" jdbcType="BIGINT" property="businessId"/>
+        <result column="visit_id" jdbcType="INTEGER" property="visitId"/>
+        <result column="user_name" jdbcType="VARCHAR" property="userName"/>
+        <result column="visit_phone" jdbcType="VARCHAR" property="visitPhone"/>
+        <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="flag" jdbcType="VARCHAR" property="flag"/>
+        <collection property="visitInfo" ofType="org.rcisoft.sys.visit.entity.VisitInfoMation" column="visit_id" select="getVisitInfo"/>
+    </resultMap>
+
+    <select id="getVisitInfo" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation">
+        select business_id,user_id,user_name,dept_name,post_name,visit_reason_code,visit_reason,visit_region,visit_date,visit_real_time,visit_time,visit_status,create_date info_create_date
+        from visit_infomation
+        where del_flag = 0
+        and business_id = #{visit_id}
+    </select>
+
+    <select id="getVisitUserByPhone" resultMap="BaseResultMap">
+        select * from visit_user
+        where del_flag = 0
+        and visit_phone = #{visitPhone}
+    </select>
+
+    <select id="queryVisitInfomationsPaged" resultMap="BaseResultMap">
+        select
+        vi.business_id,
+               vi.user_name,
+               vi.dept_name,
+               vi.post_name,
+               vi.create_date,
+               vi.visit_reason,
+               vi.visit_region,
+               vi.visit_date,
+               vi.visit_time,
+               vi.visit_status,
+               vi.visit_real_time
+        from visit_infomation vi
+        left join visit_user vu on vu.visit_id = vi.business_id
+        where 1=1 and vi.del_flag = 0 and vu.visit_phone = #{phone}
+        <if test="entity.visitStatus !=null and entity.visitStatus != ''">
+            and vi.visit_status = #{entity.visitStatus}
+        </if>
+        <if test="entity.selectTime !=null and entity.selectTime != ''">
+            <if test="entity.selectTime == '0'.toString()">
+                and vi.visit_real_time between current_timestamp and current_timestamp + interval '3' day
+            </if>
+            <if test="entity.selectTime == '1'.toString()">
+                and vi.visit_real_time between current_timestamp and current_timestamp + interval '7' day
+            </if>
+            <if test="entity.selectTime == '2'.toString()">
+                and vi.visit_real_time between current_timestamp and current_timestamp + interval '30' day
+            </if>
+        </if>
+        <if test="entity.boolVisit !=null and entity.boolVisit != ''">
+            <if test="entity.boolVisit == '0'.toString()">
+                and vi.visit_real_time >= now()
+            </if>
+            <if test="entity.boolVisit == '1'.toString()">
+                and vi.visit_real_time &lt;= now()
+            </if>
+        </if>
+        <if test="entity.sort !=null and entity.sort != ''">
+            order by
+            <if test="entity.sort == '0'.toString()">
+                vi.create_date desc
+            </if>
+            <if test="entity.sort == '1'.toString()">
+                vi.create_date
+            </if>
+            <if test="entity.sort == '2'.toString()">
+                vi.visit_real_time
+            </if>
+        </if>
+    </select>
+
+
+    <select id="getVisitUserById" resultMap="BaseResultMap">
+        select * from visit_user
+        where del_flag = 0
+          and business_id = #{businessId}
+    </select>
+</mapper>

src/main/resources/mapper/SysUserRepositorys.xml

@@ -42,44 +42,9 @@
     <select id="querySysUsers" resultMap="BaseResultMap">
         select *
         from sys_user
-        where
-        del_flag = 0
-        <if test="entity.userType !=null and entity.userType != '' ">
-            and user_type = #{entity.userType}
-        </if>
-        <if test="entity.name !=null and entity.name != '' ">
-            and name = #{entity.name}
-        </if>
-        <if test="entity.wxOpenid !=null and entity.wxOpenid != '' ">
-            and wx_openid = #{entity.wxOpenid}
-        </if>
-        <if test="entity.position !=null and entity.position != '' ">
-            and position in(${entity.position})
-        </if>
-        <if test="entity.blacklistFlag !=null and entity.blacklistFlag != '' ">
-            and blacklist_flag = #{entity.blacklistFlag}
-        </if>
-        <if test="entity.deptId !=null and entity.deptId != '' ">
-            and dept_id in(${entity.deptId})
-        </if>
-        <if test="entity.phone !=null and entity.phone != '' ">
-            and phone = #{entity.phone}
-        </if>
-        <if test="entity.beginTime != null and entity.beginTime !='' "><!-- 开始时间检索 -->
-            and date_format(create_date,'%Y-%m-%d') &gt;= date_format(#{entity.beginTime},'%Y-%m-%d')
-        </if>
-        <if test="entity.endTime != null and entity.endTime !='' "><!-- 结束时间检索 -->
-            and date_format(create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
-        </if>
-        <if test="entity.px == 1 "><!-- 排序-->
-            ORDER BY create_date
-        </if>
-        <if test="entity.px == 2 "><!-- 排序-->
-            ORDER BY position
-        </if>
-        <if test="entity.px == 3 "><!-- 排序-->
-            ORDER BY name
-        </if>
+        where del_flag = 0
+          and user_type = 0
+          and identity = 1
     </select>
 
     <select id="querySysUsersPaged" resultMap="BaseResultMap">
@@ -90,6 +55,12 @@
         <if test="entity.userType !=null and entity.userType != '' ">
             and user_type = #{entity.userType}
         </if>
+        <if test="entity.name !=null and entity.name != '' ">
+            and name like concat ("%",#{entity.name},"%")
+        </if>
+        <if test="entity.identity !=null and entity.identity != '' ">
+            and identity = #{entity.identity}
+        </if>
         <if test="entity.flag !=null and entity.flag != '' ">
             and flag = #{entity.flag}
         </if>
@@ -111,13 +82,13 @@
         <if test="entity.endTime != null and entity.endTime !='' "><!-- 结束时间检索 -->
             and date_format(create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
         </if>
-        <if test="entity.px == '1' "><!-- 排序-->
-            ORDER BY create_date
+        <if test="entity.px == '1'.toString() "><!-- 排序-->
+            ORDER BY create_date desc
         </if>
-        <if test="entity.px == '2' "><!-- 排序-->
+        <if test="entity.px == '2'.toString() "><!-- 排序-->
             ORDER BY position
         </if>
-        <if test="entity.px == '3' "><!-- 排序-->
+        <if test="entity.px == '3'.toString() "><!-- 排序-->
             ORDER BY name
         </if>
 
@@ -137,6 +108,9 @@
             <if test="position != null">position ,</if>
             <if test="nltBz != null">nlt_bz ,</if>
             <if test="flag != null">flag ,</if>
+            <if test="identity != null">identity ,</if>
+            create_date ,
+            update_date ,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="username != null">#{username},</if>
@@ -150,6 +124,9 @@
             <if test="position != null">#{position},</if>
             <if test="nltBz != null">#{nltBz},</if>
             <if test="flag != null">#{flag},</if>
+            <if test="identity != null">#{identity},</if>
+            #{createDate},
+            #{updateDate},
         </trim>
     </insert>
 
@@ -168,6 +145,9 @@
             <if test="nltBz != null">nlt_bz ,</if>
             <if test="flag != null">flag ,</if>
             <if test="identity != null">identity ,</if>
+            create_date ,
+            update_date ,
+            password ,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="username != null">#{username},</if>
@@ -182,6 +162,9 @@
             <if test="nltBz != null">#{nltBz},</if>
             <if test="flag != null">#{flag},</if>
             <if test="identity != null">#{identity},</if>
+            #{createDate},
+            #{updateDate},
+            #{password},
         </trim>
     </insert>
 
@@ -231,4 +214,30 @@
         where del_flag = 0
           and name = #{name}
     </select>
+    <select id="querySysUsersByPhone" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where del_flag = 0
+          and phone = #{phone}
+    </select>
+
+    <select id="queryVisitUsersByPhone" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where user_type = 1
+          and phone = #{phone}
+    </select>
+
+    <select id="querySysUsersByUserName" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where del_flag = 0
+          and username = #{username}
+    </select>
+    <select id="querySysUsersByDId" resultMap="BaseResultMap">
+        select *
+        from sys_user
+        where del_flag = 0
+          and dept_id = #{businessId}
+    </select>
 </mapper>

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="org.rcisoft.sys.visit.dao.VisitInfomationRepository">
     <resultMap id="BaseResultMap" type="org.rcisoft.sys.visit.entity.VisitInfoMation">
         <id column="business_id" jdbcType="BIGINT" property="businessId"/>
-
         <result column="user_id" jdbcType="INTEGER" property="userId"/>
         <result column="user_name" jdbcType="VARCHAR" property="userName"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
@@ -30,8 +29,6 @@
         select user_name,visit_phone from visit_user where visit_id = #{business_id}
     </select>
 
-
-    <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryVisitInfomations" resultMap="BaseResultMap">
         select
         vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_date,vi.visit_time,vi.visit_status,vi.visit_real_time from visit_infomation vi
@@ -102,20 +99,9 @@
         </if>
     </select>
 
-    <!--    <select id="queryVisitInfomationsPaged" resultMap="BaseResultMap">-->
-    <!--        select * from visit_infomation-->
-    <!--        where 1=1-->
-    <!--            <if test="entity.delFlag !=null and entity.delFlag != '' ">-->
-    <!--                and del_flag = #{entity.delFlag}-->
-    <!--            </if>-->
-    <!--            <if test="entity.flag !=null and entity.flag != '' ">-->
-    <!--                and flag = #{entity.flag}-->
-    <!--            </if>-->
-    <!--    </select>-->
-
     <select id="queryVisitInfomationsPaged" resultMap="BaseResultMap">
         select
-        vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_date,vi.visit_time,vi.visit_status,vi.visit_real_time from visit_infomation vi
+        vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.visit_reason_other,vi.create_date,vi.visit_reason_code,vi.visit_reason,vi.visit_region_code,vi.visit_region,vi.visit_date,vi.visit_time,vi.visit_status,vi.visit_real_time from visit_infomation vi
         where 1=1 and del_flag = 0
         <if test="entity.createDateBegin !=null">
             and vi.create_date >= #{entity.createDateBegin}
@@ -129,8 +115,14 @@
         <if test="entity.visitDateEnd !=null">
             and vi.visit_date &lt;= #{entity.visitDateEnd}
         </if>
-        <if test="entity.visitReason !=null and entity.visitReason != '' ">
-            and vi.visit_reason = #{entity.visitReason}
+        <if test="entity.visitReasons !=null and entity.visitReasons != '' ">
+            and vi.visit_reason_code in
+            <foreach collection="entity.visitReasonCodes" item="code" open="(" separator="," close=")">
+                #{code}
+            </foreach>
+            <if test="entity.boolExistOtherReason !=null">
+            or LENGTH(vi.visit_reason_other) > 0
+            </if>
         </if>
         <if test="entity.visitRegions !=null and entity.visitRegions.length > 0">
             and
@@ -254,7 +246,7 @@
     </select>
 
     <select id="queryVisitById" resultMap="BaseResultMap">
-        select vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_real_time,
+        select vi.business_id,vi.user_name,vi.user_id,vi.visit_reason_code,vi.visit_region_code,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_real_time,vi.del_flag,
         vi.visit_date,vi.visit_time,vi.visit_status
         from visit_infomation vi
         where vi.del_flag='0'
@@ -292,6 +284,7 @@
         and visit_real_time &lt;= current_timestamp
         ORDER BY visit_real_time DESC
     </select>
+
     <select id="queryFuture" resultMap="BaseResultMap">
         select vi.business_id,vi.user_name,vi.dept_name,vi.post_name,vi.create_date,vi.visit_reason,vi.visit_region,vi.visit_real_time,
                vi.visit_date,vi.visit_time,vi.visit_status

src/main/resources/mapper/VisitUserMapper.xml

@@ -42,4 +42,5 @@
     <delete id="deleteByVisitId">
         delete from visit_user where visit_id = #{visitId}
     </delete>
+
 </mapper>