发布

src/main/java/com/template/api/SmartVisitorControllerAPI.java

@@ -62,11 +62,30 @@ public interface SmartVisitorControllerAPI {
      *             待审核：1
      *             已拒绝：2
      *             已推送：3
+     *
+     * @return
+     */
+
+    /**
+     * 预约记录分页数据
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param userId 用户ID
+     * @param type 类型：
+     *             全部：0
+     *             待审核：1
+     *             已拒绝：2
+     *             已推送：3
+     * @param createStartTime 创建起始时间
+     * @param createEndTime 创建结束时间
+     * @param keyWord 关键字
+     * @param visitorStartTime 来访起始时间
+     * @param visitorEndTime 来访结束时间
      * @return
      */
     @GetMapping(value = "/appointmentPageRecord")
     @ApiOperation(value = "当前用户的预约记录", notes = "当前用户的预约记录", httpMethod = "GET")
-    CommonResult appointmentPageRecord(@RequestParam int currentPage, @RequestParam int pageCount, Integer userId, @RequestParam int type);
+    CommonResult appointmentPageRecord(@RequestParam int currentPage, @RequestParam int pageCount, Integer userId, @RequestParam int type, String createStartTime, String createEndTime, String keyWord, String visitorStartTime,String visitorEndTime);
 
     /**
      * 访客记录审核

src/main/java/com/template/common/exception/EmsExceptionHandler.java

@@ -67,9 +67,8 @@ public class EmsExceptionHandler {
     @ResponseBody
     public CommonResult exception(Exception e) {
         e.printStackTrace();
-        //String error=e.getFieldError().getDefaultMessage();
         logger.error("错误信息",e.fillInStackTrace());
-        return CommonResult.resultValue(ResponseStatusEnum.SYSTEM_ERROR);
+        return CommonResult.fail(e.getMessage());
     }
 
     //mysql连接超时

src/main/java/com/template/controller/SmartScoreController.java

@@ -197,7 +197,9 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         SmartScore ss = new SmartScore();
         ss.setSemester(isr.getSemester());
         ss.setGrade(isr.getGrade());
+        ss.setGradeId(isr.getGradeId());
         ss.setSchoolClass(isr.getSchoolClass());
+        ss.setSchoolClassId(isr.getSchoolClassId());
         ss.setCardNo(isr.getCardNo());
         ss.setUserId(isr.getUserId());
         ss.setName(user.getName());
@@ -233,7 +235,9 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         }
 
         score.setSemester(usr.getSemester());
+        score.setGradeId(usr.getGradeId());
         score.setGrade(usr.getGrade());
+        score.setSchoolClassId(usr.getSchoolClassId());
         score.setSchoolClass(usr.getSchoolClass());
         score.setCardNo(usr.getCardNo());
         score.setUserId(usr.getUserId());
@@ -242,6 +246,7 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         score.setExamType(usr.getExamType());
         score.setScore(usr.getScore());
 
+
         int result = smartScoreService.updateSmartScore(score);
 
         return result > 0 ? CommonResult.ok("编辑成功") : CommonResult.fail("编辑失败");

src/main/java/com/template/controller/SmartUserController.java

@@ -1618,7 +1618,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         if (data != null && data.isPresent()) {
             departmentStr = departmentStr == null ? data.get().getName() : data.get().getName() + "/" + departmentStr;
-            QueryParentDepartments(data.get().getParentId(), lists, departmentStr);
+            departmentStr = QueryParentDepartments(data.get().getParentId(), lists, departmentStr);
         }
 
         return departmentStr;

src/main/java/com/template/controller/SmartVisitorController.java

@@ -38,9 +38,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.template.common.utils.AesTestOne.decrypt;
+
 /**
  * <p>
  * 前端控制器
@@ -132,6 +135,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
+        //region 推送到希沃班牌，通知访客记录取消
+        //endregion
+        //region 删除百胜中的访客数据
+        //endregion
+
+
         int result = smartVisitorService.deleteSmartVisitorById(id);
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
@@ -242,8 +251,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     }
 
     @Override
-    public CommonResult appointmentPageRecord(int currentPage, int pageCount, Integer userId, int type) {
-        PageUtils<VisitorPageVo> result = smartVisitorService.smartVisitorPageByUserId(currentPage, pageCount, userId, type);
+    public CommonResult appointmentPageRecord(int currentPage, int pageCount, Integer userId, int type, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime) {
+        PageUtils<VisitorPageVo> result = smartVisitorService.smartVisitorPageByUserId(currentPage, pageCount, userId, type, createStartTime, createEndTime, keyWord, visitorStartTime, visitorEndTime);
 
         return CommonResult.ok(result);
     }
@@ -265,6 +274,11 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return CommonResult.fail("访客记录已失效，审核失败！");
         }
 
+        //审核处理后的数据不能再处理判断
+        if(visitor.getStatu().intValue() != eApproveStatu.Audit.getValue()){
+            return CommonResult.fail("该记录已被操作过，请勿重复操作");
+        }
+
         try {
             if (type == eExamineStatu.Agree.getValue()) {
                 visitor.setStatu(eApproveStatu.Pushed.getValue());
@@ -315,6 +329,10 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         if (!result.contains("预约成功")) {
                             throw new Exception("审核失败");
                         }
+
+                        ObjectMapper objectMapper = new ObjectMapper();
+                        BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
+                        visitor.setBsOrderNo(reservation.getData().getReOrderNo());
                     }
                 }
 
@@ -428,7 +446,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return CommonResult.ok(result);
         }
 
-        result = smartVisitorService.queryVisitorPageDatas(currentPage, pageCount, type, studentIds, studentIds != null && whereSql != null ? "or "+ whereSql : whereSql);
+        result = smartVisitorService.queryVisitorPageDatas(currentPage, pageCount, type, studentIds, studentIds != null && whereSql != null ? "or " + whereSql : whereSql);
 
         return CommonResult.ok(result);
     }
@@ -438,28 +456,28 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         TurnOnDeviceVo result = new TurnOnDeviceVo();
 
         //region 参数判断
-        if(data == null){
+        if (data == null) {
             result.setResultcode(2);
             result.setMessage("扫码参数不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(data.getActionName() == null){
+        if (data.getActionName() == null) {
             result.setResultcode(2);
             result.setMessage("指令不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(!data.getActionName().equals("qrCodePush")){
+        if (!data.getActionName().equals("qrCodePush")) {
             result.setResultcode(2);
             result.setMessage("指令错误");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(data.getData() == null){
+        if (data.getData() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
@@ -468,28 +486,28 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
 
         ObjectMapper objectMapper = new ObjectMapper();
         qrCodeVo codeVo = objectMapper.readValue(data.getData(), qrCodeVo.class);
-        if(codeVo == null){
+        if (codeVo == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(codeVo.getQrCode() == null){
+        if (codeVo.getQrCode() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(data.getDeviceno() == null){
+        if (data.getDeviceno() == null) {
             result.setResultcode(2);
             result.setMessage("设备编号不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
 
-        if(data.getVersion() == null){
+        if (data.getVersion() == null) {
             result.setResultcode(2);
             result.setMessage("版本不能为空");
             result.setActionName("qrCodePush");
@@ -501,7 +519,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         QrcodeImageVo qiv = objectMapper.readValue(codeVo.getQrCode(), QrcodeImageVo.class);
 
         SmartUser user = smartUserService.getSmartById(qiv.getId());
-        if(user == null){
+        if (user == null) {
             result.setResultcode(2);
             result.setMessage("用户身份无效，刷码失败");
             result.setActionName("qrCodePush");
@@ -511,8 +529,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         //目前二维码一分钟内有效
         //过期：（时间戳 + 有效期分钟数）<= 当前时间
         //时间戳转时间
-        Date dateNow = TimeExchange.StringToDate(TimeExchange.TimeRangeI10(qiv.getTimestamp(), 1),"yyyy-MM-dd HH:mm:ss");
-        if(dateNow.compareTo(new Date()) < 0){
+        Date dateNow = TimeExchange.StringToDate(TimeExchange.TimeRangeI10(qiv.getTimestamp(), 1), "yyyy-MM-dd HH:mm:ss");
+        if (dateNow.compareTo(new Date()) < 0) {
             result.setResultcode(2);
             result.setMessage("身份码已过期");
             result.setActionName("qrCodePush");
@@ -527,7 +545,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
 
 
         int insertResult = smartQrcodeService.insertSmartQrcode(sq);
-        if(insertResult <= 0){
+        if (insertResult <= 0) {
             result.setResultcode(2);
             result.setMessage("新增刷码记录失败");
             result.setActionName("qrCodePush");

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -22,6 +22,7 @@ import com.template.model.pojo.SmsCode;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.tongji.*;
+import com.template.model.vo.AffiliateParentVo;
 import com.template.model.vo.LoginVO;
 import com.template.model.vo.WechatUserVo;
 import com.template.model.weixin.AccessToken;
@@ -42,6 +43,7 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Title: WechatScanLoginController
@@ -371,10 +373,19 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
             userData.setPhone(su.getPhone());
             userData.setAffiliate(su.getAffiliate());
             //查找关联人
-            if(su.getIdentityId().intValue() == eIdentityStatu.Student.getValue()){//学生
-
-            }else if(su.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()){//家长
-
+            if (su.getIdentityId().intValue() == eIdentityStatu.Student.getValue()) {//学生
+                List<AffiliateParentVo> parents = smartUserService.queryAffiliateParents(su.getId());
+                if(parents != null && parents.size() > 0){
+                    String affiliateStr = StringUtils.join(parents.stream().map(AffiliateParentVo::getName).collect(Collectors.toList()),",");
+                    userData.setAffiliateName(affiliateStr);
+                }
+            } else if (su.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()) {//家长
+                if(su.getAffiliate() != null){
+                    List<String> affiliates = Arrays.asList(su.getAffiliate().split(","));
+                    List<SmartUser> childs = smartUserService.getSmartUserIds(affiliates);
+                    String affiliateStr = StringUtils.join(childs.stream().map(SmartUser::getName).collect(Collectors.toList()),",");
+                    userData.setAffiliateName(affiliateStr);
+                }
             }
             //关联人名称用逗号隔开
 
@@ -407,13 +418,12 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
      * @param lists    数据集合
      * @return
      */
-    private String QueryParentDepartments(Integer parentID, List<SmartDepartment> lists, String departmentStr) {
-
+    private static String QueryParentDepartments(Integer parentID, List<SmartDepartment> lists, String departmentStr) {
         Optional<SmartDepartment> data = lists.stream().filter(e -> e.getId().equals(parentID)).findFirst();
 
         if (data != null && data.isPresent()) {
             departmentStr = departmentStr == null ? data.get().getName() : data.get().getName() + "/" + departmentStr;
-            QueryParentDepartments(data.get().getParentId(), lists, departmentStr);
+            departmentStr = QueryParentDepartments(data.get().getParentId(), lists, departmentStr);
         }
 
         return departmentStr;

src/main/java/com/template/mapper/SmartUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.SmartUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.template.model.vo.AffiliateParentVo;
 import com.template.model.vo.AffiliateUserVo;
 import com.template.model.vo.GradeVo;
 import com.template.model.vo.UserVo;
@@ -34,4 +35,6 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
 
     List<SmartUser> warningPushList();
 
+    List<AffiliateParentVo> queryAffiliateParents(@Param("userId") Integer userId);
+
 }

src/main/java/com/template/mapper/SmartVisitorMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
  */
 @Repository
 public interface SmartVisitorMapper extends BaseMapper<SmartVisitor> {
-    IPage<VisitorPageVo> queryVisitorPage(IPage<VisitorPageVo> page, @Param("userId") Integer userId, @Param("statu") Integer statu);
+    IPage<VisitorPageVo> queryVisitorPage(IPage<VisitorPageVo> page, @Param("userId") Integer userId, @Param("statu") Integer statu, @Param("createStartTime") String createStartTime, @Param("createEndTime") String createEndTime, @Param("keyWord") String keyWord, @Param("visitorStartTime") String visitorStartTime, @Param("visitorEndTime") String visitorEndTime);
 
     Integer queryVisitorCount(@Param("cardNo") String cardNo, @Param("startTime") String startTime, @Param("endTime") String endTime);
 

src/main/java/com/template/model/pojo/SmartScore.java

@@ -40,9 +40,15 @@ public class SmartScore implements Serializable {
     @ApiModelProperty(value = "年级")
     private String grade;
 
+    @ApiModelProperty(value = "年级ID")
+    private Integer gradeId;
+
     @ApiModelProperty(value = "班级")
     private String schoolClass;
 
+    @ApiModelProperty(value = "班级Id")
+    private Integer schoolClassId;
+
     @ApiModelProperty(value = "卡号")
     private String cardNo;
 

src/main/java/com/template/model/pojo/SmartVisitor.java

@@ -95,6 +95,9 @@ public class SmartVisitor implements Serializable {
     @ApiModelProperty(value = "访客类型")
     private Integer visitorType;
 
+    @ApiModelProperty(value = "百胜预约订单号")
+    private String bsOrderNo;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/request/insertScoreRequest.java

@@ -20,12 +20,24 @@ public class insertScoreRequest {
     private String semester;
 
     /**
+     * 年级ID
+     */
+    @NotNull(message = "年级ID不能为空")
+    private Integer gradeId;
+
+    /**
      * 年级
      */
     @NotBlank(message = "年级不能为空")
     private String grade;
 
     /**
+     * 班级ID
+     */
+    @NotNull(message = "班级ID不能为空")
+    private Integer schoolClassId;
+
+    /**
      * 班级
      */
     @NotBlank(message = "班级不能为空")

src/main/java/com/template/model/request/updateScoreRequest.java

@@ -27,12 +27,24 @@ public class updateScoreRequest {
     private String semester;
 
     /**
+     * 年级ID
+     */
+    @NotNull(message = "年级ID不能为空")
+    private Integer gradeId;
+
+    /**
      * 年级
      */
     @NotBlank(message = "年级不能为空")
     private String grade;
 
     /**
+     * 班级ID
+     */
+    @NotNull(message = "班级ID不能为空")
+    private Integer schoolClassId;
+
+    /**
      * 班级
      */
     @NotBlank(message = "班级不能为空")

src/main/java/com/template/model/vo/AffiliateParentVo.java

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/4 星期一 15:57
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class AffiliateParentVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 关联人名称
+     */
+    private String name;
+}

src/main/java/com/template/model/vo/BsReservationVo.java

@@ -0,0 +1,24 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2024/1/5 星期五 14:53
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class BsReservationVo {
+
+    private String code;
+
+    private String msg;
+
+    private String rand;
+
+    private BsVisitorVo data;
+
+    private String sign;
+
+}

src/main/java/com/template/model/vo/BsVisitorVo.java

@@ -0,0 +1,32 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2024/1/23 星期二 11:13
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class BsVisitorVo {
+    /**
+     * 车场唯一编号
+     */
+    private String parkKey;
+
+    /**
+     * 车牌号码
+     */
+    private String carNo;
+
+    /**
+     * 预约开始时间
+     */
+    private String reserveTime;
+
+    /**
+     * 预约订单号
+     */
+    private String reOrderNo;
+}

src/main/java/com/template/services/SmartUserService.java

@@ -4,10 +4,7 @@ import com.template.model.pojo.SmartUser;
 import com.template.model.pojo.SmartUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.AffiliateUserVo;
-import com.template.model.vo.GradeVo;
-import com.template.model.vo.ParentOfStudentsVo;
-import com.template.model.vo.UserVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -57,4 +54,6 @@ public interface SmartUserService extends IService<SmartUser> {
     PageUtils<UserVo> warningUserList(int currentPage, int pageCount, List<Integer> departmentIds, String name);
 
     List<SmartUser> warningPushList();
+
+    List<AffiliateParentVo> queryAffiliateParents(Integer userId);
 }

src/main/java/com/template/services/SmartVisitorService.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -30,7 +30,7 @@ public interface SmartVisitorService extends IService<SmartVisitor> {
 
     boolean insertVisitorBatch(List<SmartVisitor> visitors);
 
-    PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu);
+    PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime);
 
     Integer queryVisitorCount(String cardNo, String startTime, String endTime);
 

src/main/java/com/template/services/impl/SmartUserServiceImpl.java

@@ -7,10 +7,7 @@ import com.template.mapper.SmartUserMapper;
 import com.template.model.enumModel.eIdentityStatu;
 import com.template.model.pojo.SmartUser;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.AffiliateUserVo;
-import com.template.model.vo.GradeVo;
-import com.template.model.vo.ParentOfStudentsVo;
-import com.template.model.vo.UserVo;
+import com.template.model.vo.*;
 import com.template.services.SmartUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.ibatis.annotations.Param;
@@ -184,4 +181,9 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         return smartUserMapper.warningPushList();
     }
 
+    @Override
+    public List<AffiliateParentVo> queryAffiliateParents(Integer userId){
+        return smartUserMapper.queryAffiliateParents(userId);
+    }
+
 }

src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -47,7 +47,7 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
         Page<SmartVisitor> page = new Page<>(currentPage, pageCount);
         QueryWrapper<SmartVisitor> queryWrapper = new QueryWrapper<>();
         //queryWrapper.like(StringUtils.hasText(name), "name", name);
-        IPage<SmartVisitor> result = smartVisitorMapper.selectPage(page,queryWrapper);
+        IPage<SmartVisitor> result = smartVisitorMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
 
@@ -70,11 +70,11 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
     }
 
     @Override
-    public PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu) {
+    public PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime) {
         Page<VisitorPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<VisitorPageVo> datas = smartVisitorMapper.queryVisitorPage(page, userId, statu);
+        IPage<VisitorPageVo> datas = smartVisitorMapper.queryVisitorPage(page, userId, statu, createStartTime, createEndTime, keyWord, visitorStartTime, visitorEndTime);
         return new PageUtils(datas);
     }
 

src/main/resources/mapper/template/SmartUserMapper.xml

@@ -44,7 +44,8 @@
         <result property="timeGroupId" column="time_group_id"/>
     </resultMap>
     <select id="querySmartUserPages" resultType="com.template.model.vo.UserVo" resultMap="smartUserPageMap">
-        select id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
+        select
+        id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
         phone,affiliate,title,address,nation,of_student,graduate,duties,time_group_id
         from smart_user
         where deleted = 0 and is_cancel = 0
@@ -84,7 +85,8 @@
         <result property="duties" column="duties"/>
     </resultMap>
     <select id="querySmartUsers" resultType="com.template.model.pojo.SmartUser" resultMap="smartUsersMap">
-        select card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
+        select
+        card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
         phone,affiliate,title,address,nation,of_student,graduate,duties from smart_user
         where deleted = 0 and is_cancel = 0
         <if test="departmentIds != null and departmentIds.size() > 0">
@@ -129,8 +131,21 @@
         </if>
     </select>
     <select id="warningPushList" resultType="com.template.model.pojo.SmartUser">
-        SELECT * FROM `smart_user` WHERE is_push=1 and is_cancel=0
+        SELECT * FROM `smart_user` WHERE is_push=1 and is_cancel=0 and deleted = 0
     </select>
 
 
+    <resultMap type="com.template.model.vo.AffiliateParentVo" id="affiliateParentMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryAffiliateParents" resultType="com.template.model.vo.AffiliateParentVo" resultMap="affiliateParentMap">
+        SELECT id,name FROM `smart_user`
+        where deleted = 0 and is_cancel=0
+        <if test="userId != null and userId != ''">
+            and FIND_IN_SET(#{userId},affiliate)
+        </if>
+    </select>
+
 </mapper>

src/main/resources/mapper/template/SmartVisitorMapper.xml

@@ -23,7 +23,8 @@
     </resultMap>
 
     <select id="queryVisitorPage" resultType="com.template.model.vo.VisitorPageVo" resultMap="visitorPageMap">
-        select sv.id,sv.user_id,sv.user_name,sv.user_phone,sv.user_number,sv.peer_num,sv.car_num,sv.visit_reason,sv.statu,sv.visitor_time,sv.visitor_deadline,sv.respondent,
+        select
+        sv.id,sv.user_id,sv.user_name,sv.user_phone,sv.user_number,sv.peer_num,sv.car_num,sv.visit_reason,sv.statu,sv.visitor_time,sv.visitor_deadline,sv.respondent,
         sv.responcode,sv.department_id,sv.respondent_phone,sv.respondent_name,sv.visitor_type,sv.create_time from
         smart_visitor sv
         inner join smart_user su on su.deleted = 0 and sv.user_id = su.id
@@ -31,7 +32,18 @@
         <if test="userId != null and userId != ''">
             and sv.user_id = #{userId}
         </if>
-
+        <if test="createStartTime != null and createStartTime != '' and createEndTime != null and createEndTime != ''">
+            and sv.create_time &gt;= #{createStartTime} and sv.create_time &lt;= #{createEndTime}
+        </if>
+        <if test="keyWord != null and keyWord != ''">
+            and (sv.user_name like '%' #{keyWord} '%' or sv.user_phone like '%' #{keyWord} '%' or sv.respondent_name
+            like '%' #{keyWord} '%'
+            or sv.department_id in (select id from smart_department where deleted = 0 and name like '%' #{keyWord} '%')
+            or sv.respondent_phone like '%' #{keyWord} '%' or sv.car_num like '%' #{keyWord} '%')
+        </if>
+        <if test="visitorStartTime != null and visitorStartTime != '' and visitorEndTime != null and visitorEndTime != ''">
+            and sv.visitor_time &gt;= #{visitorStartTime} and sv.visitor_time &lt;= #{visitorEndTime}
+        </if>
         <if test="statu != null and statu != ''">
             and sv.statu = #{statu}
         </if>

target/classes/mapper/template/SmartUserMapper.xml

@@ -44,7 +44,8 @@
         <result property="timeGroupId" column="time_group_id"/>
     </resultMap>
     <select id="querySmartUserPages" resultType="com.template.model.vo.UserVo" resultMap="smartUserPageMap">
-        select id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
+        select
+        id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
         phone,affiliate,title,address,nation,of_student,graduate,duties,time_group_id
         from smart_user
         where deleted = 0 and is_cancel = 0
@@ -84,7 +85,8 @@
         <result property="duties" column="duties"/>
     </resultMap>
     <select id="querySmartUsers" resultType="com.template.model.pojo.SmartUser" resultMap="smartUsersMap">
-        select card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
+        select
+        card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
         phone,affiliate,title,address,nation,of_student,graduate,duties from smart_user
         where deleted = 0 and is_cancel = 0
         <if test="departmentIds != null and departmentIds.size() > 0">
@@ -129,8 +131,21 @@
         </if>
     </select>
     <select id="warningPushList" resultType="com.template.model.pojo.SmartUser">
-        SELECT * FROM `smart_user` WHERE is_push=1 and is_cancel=0
+        SELECT * FROM `smart_user` WHERE is_push=1 and is_cancel=0 and deleted = 0
     </select>
 
 
+    <resultMap type="com.template.model.vo.AffiliateParentVo" id="affiliateParentMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryAffiliateParents" resultType="com.template.model.vo.AffiliateParentVo" resultMap="affiliateParentMap">
+        SELECT id,name FROM `smart_user`
+        where deleted = 0 and is_cancel=0
+        <if test="userId != null and userId != ''">
+            and FIND_IN_SET(#{userId},affiliate)
+        </if>
+    </select>
+
 </mapper>

target/classes/mapper/template/SmartVisitorMapper.xml

@@ -23,7 +23,8 @@
     </resultMap>
 
     <select id="queryVisitorPage" resultType="com.template.model.vo.VisitorPageVo" resultMap="visitorPageMap">
-        select sv.id,sv.user_id,sv.user_name,sv.user_phone,sv.user_number,sv.peer_num,sv.car_num,sv.visit_reason,sv.statu,sv.visitor_time,sv.visitor_deadline,sv.respondent,
+        select
+        sv.id,sv.user_id,sv.user_name,sv.user_phone,sv.user_number,sv.peer_num,sv.car_num,sv.visit_reason,sv.statu,sv.visitor_time,sv.visitor_deadline,sv.respondent,
         sv.responcode,sv.department_id,sv.respondent_phone,sv.respondent_name,sv.visitor_type,sv.create_time from
         smart_visitor sv
         inner join smart_user su on su.deleted = 0 and sv.user_id = su.id
@@ -31,7 +32,18 @@
         <if test="userId != null and userId != ''">
             and sv.user_id = #{userId}
         </if>
-
+        <if test="createStartTime != null and createStartTime != '' and createEndTime != null and createEndTime != ''">
+            and sv.create_time &gt;= #{createStartTime} and sv.create_time &lt;= #{createEndTime}
+        </if>
+        <if test="keyWord != null and keyWord != ''">
+            and (sv.user_name like '%' #{keyWord} '%' or sv.user_phone like '%' #{keyWord} '%' or sv.respondent_name
+            like '%' #{keyWord} '%'
+            or sv.department_id in (select id from smart_department where deleted = 0 and name like '%' #{keyWord} '%')
+            or sv.respondent_phone like '%' #{keyWord} '%' or sv.car_num like '%' #{keyWord} '%')
+        </if>
+        <if test="visitorStartTime != null and visitorStartTime != '' and visitorEndTime != null and visitorEndTime != ''">
+            and sv.visitor_time &gt;= #{visitorStartTime} and sv.visitor_time &lt;= #{visitorEndTime}
+        </if>
         <if test="statu != null and statu != ''">
             and sv.statu = #{statu}
         </if>

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -183,6 +183,7 @@ com\template\model\request\insertScoreRequest.class
 com\template\services\SmartAuthorGroupService.class
 com\template\model\request\updateDepartmentRequest.class
 com\template\mapper\SmartSubjectRuleMapper.class
+com\template\model\vo\BsReservationVo.class
 com\template\services\SmartSchoolService.class
 com\template\core\CORSConfiguration$1.class
 com\template\model\seewo\HomeSchoolServiceSendNoteToKidResult$ResponseBody.class
@@ -399,6 +400,7 @@ com\template\model\seewo\StudentServiceUpdateStudentInfoParam$ParentsItem.class
 com\template\api\SmartDataSourceControllerAPI.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam$RequestBody$RequestBodyBuilder.class
 com\template\model\seewo\TeacherServiceBatchSetClassMastersRequest.class
+com\template\model\vo\BsVisitorVo.class
 com\template\model\pojo\SmartFreezeRecord.class
 com\template\mapper\SmartDutiesMapper.class
 com\template\model\evaluate\teacher\SimpleEvaluateScore.class
@@ -594,6 +596,7 @@ com\template\common\utils\AccessToken.class
 com\template\model\seewo\TeacherServiceBatchSetClassMastersParam.class
 com\template\services\impl\SmartDataSourceLogServiceImpl.class
 com\template\core\SwaggerConfiguration.class
+com\template\model\vo\AffiliateParentVo.class
 com\template\model\seewo\AttendanceRuleListEventByClazzResult$Data.class
 com\template\services\SystemUserService.class
 com\template\common\utils\RSAUtils.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,4 @@
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\AffiliateParentVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsResult.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\qrCodeVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartEvaluateSdetailService.java
@@ -155,6 +156,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\aop\LoginCheckAspect.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\DutiesListVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartWarningServiceImpl.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\BsReservationVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\RepairAdminControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDsColumnCor.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\ExcelUtils.java
@@ -447,6 +449,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\teacher\SimpleEvaluateScore.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\teacher\SmartScoreManageList.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\weixin\Result.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\BsVisitorVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SystemUserServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartScoreMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartUserControllerAPI.java