Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/scan/xqmanage.js

@@ -14,7 +14,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 $.yvan.download({
                     method: 'post',
-                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
                 });
@@ -79,6 +79,16 @@ define(function (require) {
                         events: {keydown: enterQueryGrid1}, width: 350
                     },
                     {
+                        xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
+                        data: [
+                            {id: '1', text: '允许'},
+                            {id: '-1', text: '禁止'},
+                        ],
+                        onChange: function () {
+                            queryGrid1();
+                        }
+                    },
+                    {
                         xtype: 'datebox',
                         name: 'dateSta',
                         label: '进出时间',
@@ -164,6 +174,10 @@ define(function (require) {
                                             title: '用户名',
                                         },
                                         {
+                                            field: 'phone',
+                                            title: '电话',
+                                        },
+                                        {
                                             field: 'doorName',
                                             title: '小区大门',
                                             align: 'left',
@@ -185,7 +199,25 @@ define(function (require) {
                                                 }
 
                                             }
-                                        }
+                                        },
+                                        {
+                                            field: 'goStatus',
+                                            title: '通行状态',
+                                            align: 'center',
+                                            formatter:function (value) {
+                                                if(value==1){
+                                                    return "允许"
+                                                }else if(value ==-1){
+                                                    return "禁止"
+                                                }
+
+                                            }
+                                        },
+                                        {
+                                            field: 'errorInfo',
+                                            title: '禁止提示',
+                                            align: 'left',
+                                        },
 
                                     ]
                                 ]

whepi-doc/login.sql

@@ -198,6 +198,8 @@ CREATE TABLE out_scan  (
   in_type           int(11) NOT NULL DEFAULT 0 COMMENT '进出状态:1进,2出',
   day_date          date NOT NULL DEFAULT '0000-01-01' COMMENT '当天时间',
   date              datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '进出时间',
+  go_status         int(11) NOT NULL DEFAULT 0 COMMENT '通行状态:1允许,-1禁止',
+  error_info        varchar(100)  NOT NULL DEFAULT '' COMMENT '错误信息',
   user_create       bigint(20) NOT NULL DEFAULT 0 COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
@@ -222,6 +224,8 @@ CREATE TABLE out_scan_estate  (
   user_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '人员ID',
   day_date          date NOT NULL DEFAULT '0000-01-01' COMMENT '当天时间',
   scan_date         datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '扫码时间',
+  go_status         int(11) NOT NULL DEFAULT 0 COMMENT '通行状态:1允许,-1禁止',
+  error_info        varchar(100)  NOT NULL DEFAULT '' COMMENT '错误信息',
   user_create       bigint(20) NOT NULL DEFAULT 0 COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',

whepi-web/src/main/java/com/bofeng/dao/OutScanEstateMapper.java

@@ -18,7 +18,7 @@ public interface OutScanEstateMapper extends BaseMapper<OutScanEstate> {
      * @param userId
      * @return
      */
-    @Select("select * from out_scan_estate where day_date=curdate() and user_id=#{userId}")
+    @Select("select * from out_scan_estate where day_date=curdate() and go_status = 1 and user_id=#{userId}")
     List<OutScanEstate> getOutScanEstateTodayByUser(@Param("userId") Long userId);
 
     /**
@@ -26,6 +26,6 @@ public interface OutScanEstateMapper extends BaseMapper<OutScanEstate> {
      * @param userId
      * @return
      */
-    @Select("SELECT * FROM out_scan_estate WHERE user_id = #{userId} order by time_create desc LIMIT 1")
+    @Select("SELECT * FROM out_scan_estate WHERE user_id = #{userId} and go_status = 1 order by time_create desc LIMIT 1")
     OutScanEstate getOutScanEstatLately(@Param("userId") Long userId);
 }

whepi-web/src/main/java/com/bofeng/dao/OutScanMapper.java

@@ -16,7 +16,7 @@ public interface OutScanMapper extends BaseMapper<OutScan> {
      * @param userId
      * @return
      */
-    @Select("SELECT s.* FROM out_scan s WHERE s.user_id = #{userId} and in_type = 2 ORDER BY s.time_create DESC LIMIT 1")
+    @Select("SELECT s.* FROM out_scan s WHERE s.user_id = #{userId} and go_status = 1 and in_type = 2 ORDER BY s.time_create DESC LIMIT 1")
     OutScan getOutScanByUserlimit(@Param("userId") Long userId);
 
 
@@ -25,7 +25,7 @@ public interface OutScanMapper extends BaseMapper<OutScan> {
      * @param userId
      * @return
      */
-    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and in_type = 2 and day_date = curdate()")
+    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and go_status = 1 and in_type = 2 and day_date = curdate()")
     OutScan getOutScanToday(@Param("userId") Long userId);
 
     /**
@@ -33,7 +33,7 @@ public interface OutScanMapper extends BaseMapper<OutScan> {
      * @param userId
      * @return
      */
-    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and in_type = #{inType} and day_date > date_sub(curdate(),interval #{goOutFre} day) ORDER BY time_create DESC LIMIT 1")
+    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and go_status = 1 and in_type = #{inType} and day_date > date_sub(curdate(),interval #{goOutFre} day) ORDER BY time_create DESC LIMIT 1")
     OutScan getOutScanThreeday(@Param("userId") Long userId, @Param("inType") Integer inType, @Param("goOutFre") Integer goOutFre);
 
     /**
@@ -41,6 +41,6 @@ public interface OutScanMapper extends BaseMapper<OutScan> {
      * @param userId
      * @return
      */
-    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and in_type = #{inType} order by time_create desc LIMIT 1")
+    @Select("SELECT * FROM out_scan WHERE user_id = #{userId} and go_status = 1 and in_type = #{inType} order by time_create desc LIMIT 1")
     OutScan getOutScanLately(@Param("userId") Long userId, @Param("inType") Integer inType);
 }

whepi-web/src/main/java/com/bofeng/entity/OutScan.java

@@ -46,6 +46,14 @@ public class OutScan {
     @TableField("date")
     private DateTime date;
 
+    @ApiModelProperty("通行状态:1允许,-1禁止")
+    @TableField("go_status")
+    private Integer goStatus;
+
+    @ApiModelProperty("错误信息")
+    @TableField("error_info")
+    private String errorInfo;
+
     @TableField("user_create")
     private Long userCreate;
 

whepi-web/src/main/java/com/bofeng/entity/OutScanEstate.java

@@ -34,6 +34,14 @@ public class OutScanEstate {
     @TableField("scan_date")
     private DateTime scanDate;
 
+    @ApiModelProperty("通行状态:1允许,-1禁止")
+    @TableField("go_status")
+    private Integer goStatus;
+
+    @ApiModelProperty("错误信息")
+    @TableField("error_info")
+    private String errorInfo;
+
     @TableField("user_create")
     private Long userCreate;
 

whepi-web/src/main/java/com/bofeng/entity/SysUptownHouse.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.joda.time.DateTime;
 
@@ -58,18 +59,18 @@ public class SysUptownHouse implements Serializable {
     private String uptownName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = {"小区大门"}, index = 5)
+    @ExcelProperty(value = {"小区大门"}, index = 6)
     private String doorName;
 
     @TableField(exist = false)
-    @ExcelProperty(value = {"进出时间"}, index = 6)
+    @ExcelProperty(value = {"进出时间"}, index = 7)
     private String date;
 
     @TableField(exist = false)
     private Integer inType;
 
     @TableField(exist = false)
-    @ExcelProperty(value = {"记录状态"}, index = 7)
+    @ExcelProperty(value = {"记录状态"}, index = 8)
     private String inTypeStr;
 
     @TableField(exist = false)
@@ -77,6 +78,23 @@ public class SysUptownHouse implements Serializable {
     private String linkman;
 
     @TableField(exist = false)
+    @ExcelProperty(value = {"电话"}, index = 5)
+    private String phone;
+
+    @TableField(exist = false)
+    private Integer goStatus;
+
+    @ExcelProperty(value = {"通行状态"}, index = 9)
+    @ApiModelProperty("通行状态:1允许,-1禁止")
+    @TableField(exist = false)
+    private String goStatusStr;
+
+    @ExcelProperty(value = {"禁止提示"}, index = 10)
+    @ApiModelProperty("禁止提示")
+    @TableField(exist = false)
+    private String errorInfo;
+
+    @TableField(exist = false)
     private String jcStatus;
 
 

whepi-web/src/main/java/com/bofeng/service/ScanService.java

@@ -23,7 +23,7 @@ public class ScanService {
     private OutScanEstateMapper outScanEstateMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void saveOutScan(Long userId, Integer inType, Long uptownId, Long doorId) {
+    public void saveOutScan(Long userId, Integer inType, Long uptownId, Long doorId, Integer status, String errorInfo) {
         OutScan outScan = new OutScan();
         outScan.setScanId(IdWorker.getId());
         outScan.setUserId(userId);
@@ -32,18 +32,22 @@ public class ScanService {
         outScan.setInType(inType);
         outScan.setDayDate(new Date());
         outScan.setDate(new DateTime());
+        outScan.setGoStatus(status);
+        outScan.setErrorInfo(errorInfo);
         outScan.setUserCreate(userId);
         outScan.setUserUpdate(userId);
         outScanMapper.insert(outScan);
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void saveOutScanEstate(Long userId) {
+    public void saveOutScanEstate(Long userId, Integer status, String errorInfo) {
         OutScanEstate o = new OutScanEstate();
         o.setSeId(IdWorker.getId());
         o.setUserId(userId);
         o.setDayDate(new Date());
         o.setScanDate(new DateTime());
+        o.setGoStatus(status);
+        o.setErrorInfo(errorInfo);
         o.setUserCreate(userId);
         o.setUserUpdate(userId);
         outScanEstateMapper.insert(o);

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -35,6 +35,11 @@ public class SweepCodeService {
                 }else if(sysUptownHouses.get(i).getInType() == 2 ){
                     sysUptownHouses.get(i).setInTypeStr("外出");
                 }
+                if(sysUptownHouses.get(i).getGoStatus() == 1 ){
+                    sysUptownHouses.get(i).setGoStatusStr("允许");
+                }else if(sysUptownHouses.get(i).getGoStatus() == -1 ){
+                    sysUptownHouses.get(i).setGoStatusStr("禁止");
+                }
             }
         }
 

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -104,6 +104,7 @@ public class ScanController {
                 model.put("into", "禁止" + getMsg(inType));
                 model.put("collor", "red");
                 model.put("errorMsg", "非本小区居民，禁止" + getMsg(inType) + "。");
+                scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                 return new ModelAndView("/user/scan.ftl", model);
             }
             OutScan o = outScanMapper.getOutScanLately(userOpen.getUserId(), inType);
@@ -119,7 +120,7 @@ public class ScanController {
                     model.put("collor", "orange");
                     model.put("into", "允许进入");
                     model.put("errorMsg", "您在外驻留时间超过1日，请尽快上报您的健康状况，防止在外长时间逗留。");
-                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId());
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
             }
@@ -129,15 +130,23 @@ public class ScanController {
                     model.put("collor", "green");
                     model.put("into", "允许通行");
                     model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，保生产同时注意自身安全。");
-                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId());
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
                 OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(uptownDoor.getUptownId());
+                if (outScanConf.getGoOutFre() == 0) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止外出");
+                    model.put("errorMsg", "最近一段时间非就医、防疫、保运行人员不能外出。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
                 OutScan outScan = outScanMapper.getOutScanThreeday(userOpen.getUserId(), 2, outScanConf.getGoOutFre());
                 if (outScan != null) {
                     model.put("collor", "red");
                     model.put("into", "禁止" + getMsg(inType));
                     model.put("errorMsg", "距您上次外出时间未满"+outScanConf.getGoOutFre()+"日，禁止外出，请配合。上次外出登记时间 "+sdf.format(new Date(outScan.getDate().getMillis()))+"。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
                 }
                 MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
@@ -145,6 +154,7 @@ public class ScanController {
                     model.put("collor", "red");
                     model.put("into", "禁止通行");
                     model.put("errorMsg", "健康日报提示您存在健康问题，禁止外出，请配合。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
                 }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
@@ -152,12 +162,13 @@ public class ScanController {
                     model.put("collor", "red");
                     model.put("into", "禁止" + getMsg(inType));
                     model.put("errorMsg", "您最近三日未上报健康日报，请说明原因，配合监测人员。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
                 } else if (msReports.size() < 3) {
                     model.put("collor", "orange");
                     model.put("into", "可以" + getMsg(inType));
                     model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
-                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId());
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
             }
@@ -168,7 +179,7 @@ public class ScanController {
             } else if (inType == 1) {
                 model.put("errorMsg", "欢迎归来，注意防护。");
             }
-            scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId());
+            scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
             return new ModelAndView("/user/scan.ftl", model);
         }
     }
@@ -187,6 +198,7 @@ public class ScanController {
         } else {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
+            OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(unit.getUptownId());
             model.put("doorplate", unit.getUptownName() + "小区" +unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -200,17 +212,25 @@ public class ScanController {
             }
             OutUser outUser = outUserMapper.getOutUserByPhone(Long.parseLong(uptownHomes.get(0).getPhone()));
             if (outUser != null) {
-                scanService.saveOutScanEstate(userOpen.getUserId());
                 model.put("collor", "green");
                 model.put("into", "允许通行");
                 model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，保生产同时注意自身安全。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), 1, "");
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
+            if (outScanConf.getGoOutFre() == 0) {
+                model.put("collor", "red");
+                model.put("into", "禁止外出");
+                model.put("errorMsg", "最近一段时间非就医、防疫、保运行人员不能外出。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
+                return new ModelAndView("/user/goOut.ftl", model);
+            }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
             if (msReports.size() != 3) {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
                 model.put("errorMsg", "您近期有漏报健康日报，无法判断您健康状态，请尽快返回住处。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
             MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
@@ -218,6 +238,7 @@ public class ScanController {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
                 model.put("errorMsg", "您近日提交的健康日报显示您健康存在问题，请尽快返回住处。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
             OutScan outScan = outScanMapper.getOutScanToday(userOpen.getUserId());
@@ -225,6 +246,7 @@ public class ScanController {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
                 model.put("errorMsg", "您今日没有正常出门记录，为自身及家人安全，请赶紧回家。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
             List<OutScanEstate> list1 = outScanEstateMapper.getOutScanEstateTodayByUser(userOpen.getUserId());
@@ -237,12 +259,13 @@ public class ScanController {
                 } else {
                     model.put("errorMsg", "您今日已"+conut+"次被问讯，请说明外出原因，尽快回家。问询时间："+queryTime(list1)+"。");
                 }
+                scanService.saveOutScanEstate(userOpen.getUserId(), 1, "");
             } else {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
                 model.put("errorMsg", "您今日已被巡检人员问讯超过2次，为自身及家人安全，请赶紧回家。问询时间："+queryTime(list1)+"。");
+                scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
             }
-            scanService.saveOutScanEstate(userOpen.getUserId());
 //            model.put("img", "/scan/scanEstate_qr.png");
             return new ModelAndView("/user/scanEstate.ftl", model);
         }
@@ -273,6 +296,13 @@ public class ScanController {
                 model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，保生产同时注意自身安全。");
                 return new ModelAndView("/user/goOut.ftl", model);
             }
+            OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(unit.getUptownId());
+            if (outScanConf.getGoOutFre() == 0) {
+                model.put("collor", "red");
+                model.put("into", "禁止外出");
+                model.put("errorMsg", "最近一段时间非就医、防疫、保运行人员不能外出。");
+                return new ModelAndView("/user/goOut.ftl", model);
+            }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
             if (msReports.size() == 0) {
                 model.put("collor", "red");
@@ -287,7 +317,6 @@ public class ScanController {
                 model.put("errorMsg", "健康日报提示您存在健康问题，禁止外出，请配合。");
                 return new ModelAndView("/user/goOut.ftl", model);
             }
-            OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(unit.getUptownId());
             OutScan outScan = outScanMapper.getOutScanThreeday(userOpen.getUserId(), 2, outScanConf.getGoOutFre());
             if (outScan != null) {
                 model.put("collor", "red");

whepi-web/src/main/resources/mapper/SweepCodeMapper.xml

@@ -8,9 +8,13 @@
      d.unit,
      e.doorplate,
      b.door_name,
-     c.date,
+     DATE_FORMAT(c.date,'%y-%m-%d %h:%i:%s') as date,
      c.in_type,
-     g.linkman
+     c.go_status as goStatus,
+     c.error_info as errorInfo,
+     g.linkman,
+     g.phone,
+     c.time_update
      from out_scan c
      inner join sys_user_role t on c.user_id = t.user_id and role_id =1
      inner join sys_uptown_home g on g.house_id = t.property_id
@@ -22,6 +26,9 @@
          <if test="queryProperties != null and queryProperties != ''">
           a.uptown_name like concat('%',#{queryProperties},'%')
          </if>
+         <if test="goStatus != null and goStatus !=''">
+          and c.go_status = #{goStatus}
+         </if>
          <if test="dateSta != null and dateSta !=''">
           and c.date >= #{dateSta}
          </if>
@@ -29,6 +36,7 @@
           and c.date &lt; #{dateEnd}
          </if>
         </where>
+     order by c.time_update desc
     </select>
     <select id="export" resultType="com.bofeng.entity.SysUptownHouse">
      select DISTINCT
@@ -37,9 +45,13 @@
      d.unit,
      e.doorplate,
      b.door_name,
-     c.date,
+     DATE_FORMAT(c.date,'%y-%m-%d %h:%i:%s') as date,
      c.in_type,
-     g.linkman
+     c.go_status as goStatus,
+     c.error_info as errorInfo,
+     g.linkman,
+     g.phone,
+     c.time_update
      from out_scan c
      inner join sys_user_role t on c.user_id = t.user_id and role_id =1
      inner join sys_uptown_home g on g.house_id = t.property_id
@@ -51,6 +63,9 @@
          <if test="queryProperties != null and queryProperties != ''">
           a.uptown_name like concat('%',#{queryProperties},'%')
          </if>
+         <if test="goStatus != null and goStatus !=''">
+          and c.go_status = #{goStatus}
+         </if>
          <if test="dateSta != null and dateSta !=''">
           and c.date >= #{dateSta}
          </if>
@@ -58,6 +73,7 @@
           and c.date &lt; #{dateEnd}
          </if>
         </where>
+     order by c.time_update desc
     </select>