修改表字段

whepi-doc/login.sql

@@ -193,6 +193,7 @@ DROP TABLE IF EXISTS out_scan;
 CREATE TABLE out_scan  (
   scan_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '扫码ID',
   user_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '人员会ID',
+  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID,下拉选ID',
   door_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '小区大门ID',
   into_date         datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '进入时间',
   out_date          datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '出去时间',

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface UptownDoorMapper extends BaseMapper<UptownDoor> {
 
-    @Select("select ud.door_id,u.uptown_name,ud.door_name from sys_uptown_door ud inner join sys_uptown u " +
-            "on u.uptown_id = ud.uptown_id where ud.door_id = #{doorId} and ud.status = 1")
+    @Select("select ud.door_id,u.uptown_id,u.uptown_name,ud.door_name from sys_uptown_door ud inner join " +
+            "sys_uptown u on u.uptown_id = ud.uptown_id where ud.door_id = #{doorId} and ud.status = 1")
     UptownDoor getUptownDoorById(@Param("doorId") Long doorId);
 }

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

@@ -29,8 +29,8 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
 
     List<UptownUnit> queryYiChangList(@Param("uptownId") Long uptownId, @Param("reportDate") String reportDate);
 
-    @Select("SELECT ur.user_id,uu.ridgepole,uu.unit,uh.doorplate FROM sys_user_role ur " +
-            "INNER JOIN sys_uptown_house uh ON uh.house_id = ur.property_id INNER JOIN sys_uptown_unit " +
-            "uu ON uh.unit_id = uu.unit_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
+    @Select("SELECT u.uptown_id,uu.ridgepole,uu.unit,uh.doorplate FROM sys_user_role ur INNER JOIN sys_uptown_house uh " +
+            "ON uh.house_id = ur.property_id INNER JOIN sys_uptown_unit uu ON uh.unit_id = uu.unit_id INNER JOIN " +
+            "sys_uptown u ON u.uptown_id = uu.uptown_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
     UptownUnit getUptownUnitByUser(@Param("userId") Long userId);
 }

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

@@ -24,6 +24,10 @@ public class OutScan {
     @TableField("user_id")
     private Long userId;
 
+    @ApiModelProperty("小区ID")
+    @TableField("uptown_id")
+    private Long uptownId;
+
     @ApiModelProperty("小区大门ID")
     @TableField("door_id")
     private Long doorId;

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

@@ -51,6 +51,10 @@ public class ScanController {
             UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
+            if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
+                model.put("type", "-1");
+                return new ModelAndView("/user/scan.ftl", model);
+            }
             model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
             model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate());
             model.put("name", uptownHomes.get(0).getLinkman());