修改bug

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

@@ -233,7 +233,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             sv.setVisitorType(eVisitorType.Parent.getValue());
 //            图片
             sv.setImage(par.getImage());
-
+//            来源
+            sv.setSource(1);
             //        获取受访者id
             Integer respondent = sv.getRespondent();
             SmartUser smartUser = smartUserService.getById(respondent);
@@ -369,7 +370,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         sv.setRespondentName(oar.getRespondentName());
         sv.setRespondentPhone(oar.getRespondentPhone());
         sv.setVisitorType(eVisitorType.Other.getValue());
-
+        //            来源
+        sv.setSource(1);
         List<SmartVisitorRestsConfig> list = smartVisitorRestsConfigService.list(new LambdaQueryWrapper<>());
         SmartVisitorRestsConfig smartVisitorRestsConfig = list.get(0);
         Integer auditConfig = smartVisitorRestsConfig.getAuditConfig();
@@ -885,7 +887,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             //将第一个受访学生的部门ID带过去
             sv.setDepartmentId(student.getDepartmentId());
             sv.setVisitorType(eVisitorType.Parent.getValue());
-
+//            来源
+            sv.setSource(2);
             //        获取受访者id
             Integer respondent = sv.getRespondent();
             SmartUser smartUser = smartUserService.getById(respondent);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.SmartVisitor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.SmartVisitorPageVo;
 import com.template.model.vo.SmartVisitorScreenVo;
 import com.template.model.vo.VisitorPageVo;
 import org.apache.ibatis.annotations.Param;
@@ -27,7 +28,7 @@ public interface SmartVisitorMapper extends BaseMapper<SmartVisitor> {
 
     IPage<SmartVisitor> queryVisitorPageDatas(IPage<SmartVisitor> page, @Param("type") Integer type, @Param("studentIds") List<Integer> studentIds, @Param("isAdmin") String isAdmin);
 
-    IPage<SmartVisitor> getPage(Page<SmartVisitor> page,@Param("type")Integer type,@Param("keyWord") String keyWord,@Param("status") Integer status,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("visitorStartTime") String visitorStartTime,@Param("visitorEndTime") String visitorEndTime);
+    IPage<SmartVisitorPageVo> getPage(Page<SmartVisitorPageVo> page, @Param("type")Integer type, @Param("keyWord") String keyWord, @Param("status") Integer status, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("visitorStartTime") String visitorStartTime, @Param("visitorEndTime") String visitorEndTime);
 
 
     IPage<SmartVisitorScreenVo> getScreenPage(Page<SmartVisitorScreenVo> page,@Param("phone") String phone,@Param("status")  String status);

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

@@ -116,6 +116,9 @@ public class SmartVisitor implements Serializable {
     @ApiModelProperty(value = "图片")
     private String image;
 
+    @ApiModelProperty(value = "来源")
+    private Integer source;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

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

@@ -0,0 +1,112 @@
+package com.template.model.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SmartVisitorPageVo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "访客姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "访客手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "访客证件号")
+    private String userNumber;
+
+    @ApiModelProperty(value = "同行人数")
+    private Integer peerNum;
+
+    /**
+     * 家长预约 去掉车牌号字段
+     */
+    @ApiModelProperty(value = "车牌号")
+    private String carNum;
+
+    @ApiModelProperty(value = "访问事由")
+    private String visitReason;
+
+    @ApiModelProperty(value = "状态 待审核：1  已拒绝：2  已推送：3")
+    private Integer statu;
+
+    @ApiModelProperty(value = "来访时间")
+    private Date visitorTime;
+
+    /**
+     * 来访截止时间
+     * 家长预约的话 来访时间+4小时
+     * 其他访客时间 当天23:59:59秒结束
+     */
+    @ApiModelProperty(value = "来访截止时间")
+    private Date visitorDeadline;
+
+    @ApiModelProperty(value = "受访者ID")
+    private Integer respondent;
+
+    @ApiModelProperty(value = "受访者编号")
+    private String responcode;
+
+    @ApiModelProperty(value = "部门ID")
+    private Integer departmentId;
+
+    @ApiModelProperty(value = "受访者电话")
+    private String respondentPhone;
+
+    @ApiModelProperty(value = "受访者姓名")
+    private String respondentName;
+
+    @ApiModelProperty(value = "百胜同步授权编码")
+    private String visitorsync;
+
+    /**
+     * 设备编号
+     * 多个设备用逗号隔开
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNum;
+
+    /**
+     * 访客类型
+     * 家长：1
+     * 其他：2
+     */
+    @ApiModelProperty(value = "访客类型")
+    private Integer visitorType;
+
+    @ApiModelProperty(value = "百胜预约订单号")
+    private String bsOrderNo;
+
+    @ApiModelProperty(value = "访客验证码")
+    private String visitorCode;
+
+    @ApiModelProperty(value = "图片")
+    private String image;
+
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String createUser;
+
+    private String updateUser;
+
+    private Integer deleted;
+
+    private String departmentName;
+
+    private Integer source;
+
+}

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

@@ -94,5 +94,8 @@ public class SmartVisitorVo {
     @ApiModelProperty(value = "图片")
     private List<String> image;
 
+    private String departmentName;
+
+    private Integer source;
 
 }

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

@@ -147,14 +147,14 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
 
     @Override
     public PageUtils<SmartVisitorVo> getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime) {
-        Page<SmartVisitor> page = new Page<>();
+        Page<SmartVisitorPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<SmartVisitor> datas = smartVisitorMapper.getPage(page,type,keyWord,status,startTime,endTime,visitorStartTime,visitorEndTime);
+        IPage<SmartVisitorPageVo> datas = smartVisitorMapper.getPage(page,type,keyWord,status,startTime,endTime,visitorStartTime,visitorEndTime);
 
-        List<SmartVisitor> list = datas.getRecords();
+        List<SmartVisitorPageVo> list = datas.getRecords();
         ArrayList<SmartVisitorVo> smartVisitorVos = new ArrayList<>();
-        for (SmartVisitor smartVisitor : list) {
+        for (SmartVisitorPageVo smartVisitor : list) {
             SmartVisitorVo smartVisitorVo = new SmartVisitorVo();
             BeanUtils.copyProperties(smartVisitor,smartVisitorVo);
             String image = smartVisitor.getImage();

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

@@ -111,12 +111,15 @@
         order by create_time desc
     </select>
 
-    <select id="getPage" resultType="com.template.model.pojo.SmartVisitor">
+    <select id="getPage" resultType="com.template.model.vo.SmartVisitorPageVo">
         SELECT
-            sv.*
+        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,sv.image,sv.source,
+        sd.name as departmentName
         FROM
             `smart_visitor` sv
-        WHERE deleted=0 and sv.visitor_type=#{type}
+        left join  smart_department sd on sv.department_id=sd.id
+        WHERE  sv.deleted=0 and sv.visitor_type=#{type}
         <if test="status != null and status != ''">
             and sv.statu = #{status}
         </if>
@@ -130,7 +133,7 @@
             and sv.create_time &gt;= #{startTime} and sv.create_time &lt;= #{endTime}
         </if>
         <if test="visitorStartTime != null and visitorStartTime != '' and visitorEndTime != null and visitorEndTime != ''">
-            and sv.visitor_time &gt;= #{visitorStartTime} and sv.visitor_time &lt;= #{visitorEndTime
+            and sv.visitor_time &gt;= #{visitorStartTime} and sv.visitor_time &lt;= #{visitorEndTime}
         </if>
         order by sv.create_time desc
     </select>