Bläddra i källkod

fix 注册认证

tjf 2 månader sedan
förälder
incheckning
8b14ec1573
19 ändrade filer med 22 tillägg och 22 borttagningar
  1. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/IllegalParking.java
  2. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/bo/IllegalParkingBo.java
  3. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/vo/IllegalParkingVo.java
  4. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/PropertyRepair.java
  5. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/bo/PropertyRepairBo.java
  6. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/vo/PropertyRepairVo.java
  7. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/ReservRecord.java
  8. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/bo/ReservRecordBo.java
  9. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/vo/ReservRecordVo.java
  10. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/VisitorManage.java
  11. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/bo/VisitorManageBo.java
  12. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/vo/VisitorManageVo.java
  13. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/IllegalParkingServiceImpl.java
  14. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/PropertyRepairServiceImpl.java
  15. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ReservRecordServiceImpl.java
  16. 1 1
      ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/VisitorManageServiceImpl.java
  17. 2 2
      ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/IllegalParkingMapper.xml
  18. 2 2
      ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/PropertyRepairMapper.xml
  19. 2 2
      ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/VisitorManageMapper.xml

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/IllegalParking.java

@@ -35,7 +35,7 @@ public class IllegalParking extends TenantEntity {
     /**
      * 门户id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 关联门户

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/bo/IllegalParkingBo.java

@@ -36,7 +36,7 @@ public class IllegalParkingBo extends BaseEntity {
     /**
      * 门户id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 关联门户

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/illegalParking/vo/IllegalParkingVo.java

@@ -41,7 +41,7 @@ public class IllegalParkingVo implements Serializable {
      * 门户id
      */
     @ExcelProperty(value = "门户id")
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 关联门户

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/PropertyRepair.java

@@ -32,7 +32,7 @@ public class PropertyRepair extends TenantEntity {
     /**
      * 门户id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/bo/PropertyRepairBo.java

@@ -32,7 +32,7 @@ public class PropertyRepairBo extends BaseEntity {
     /**
      * 门户id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/propertyRepair/vo/PropertyRepairVo.java

@@ -36,7 +36,7 @@ public class PropertyRepairVo implements Serializable {
      * 门户id
      */
     @ExcelProperty(value = "门户id")
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 指派时间

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/ReservRecord.java

@@ -32,7 +32,7 @@ public class ReservRecord extends TenantEntity {
     /**
      * 门户id 房屋信息表的id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/bo/ReservRecordBo.java

@@ -33,7 +33,7 @@ public class ReservRecordBo extends BaseEntity {
      * 门户id 房屋信息表的id
      */
     @NotNull(message = "门户id 房屋信息表的id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/reservRecord/vo/ReservRecordVo.java

@@ -36,7 +36,7 @@ public class ReservRecordVo implements Serializable {
      * 门户id 房屋信息表的id
      */
     @ExcelProperty(value = "门户id 房屋信息表的id")
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/VisitorManage.java

@@ -32,7 +32,7 @@ public class VisitorManage extends TenantEntity {
     /**
      * 门户id
      */
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/bo/VisitorManageBo.java

@@ -33,7 +33,7 @@ public class VisitorManageBo extends BaseEntity {
      * 门户id
      */
     @NotNull(message = "门户id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/domain/visitor/vo/VisitorManageVo.java

@@ -36,7 +36,7 @@ public class VisitorManageVo implements Serializable {
      * 门户id
      */
     @ExcelProperty(value = "门户id")
-    private Long portalId;
+    private Long houseId;
 
     /**
      * 详细门牌号

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/IllegalParkingServiceImpl.java

@@ -102,7 +102,7 @@ public class IllegalParkingServiceImpl implements IIllegalParkingService {
         LambdaQueryWrapper<IllegalParking> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(IllegalParking::getIllegalParkingId);
         lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), IllegalParking::getPlateNumber, bo.getPlateNumber());
-        lqw.eq(bo.getPortalId() != null, IllegalParking::getPortalId, bo.getPortalId());
+        lqw.eq(bo.getHouseId() != null, IllegalParking::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getVisitPortal()), IllegalParking::getVisitPortal, bo.getVisitPortal());
         lqw.eq(StringUtils.isNotBlank(bo.getMobileNumber()), IllegalParking::getMobileNumber, bo.getMobileNumber());
         lqw.like(StringUtils.isNotBlank(bo.getVisitName()), IllegalParking::getVisitName, bo.getVisitName());

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/PropertyRepairServiceImpl.java

@@ -81,7 +81,7 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PropertyRepair> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(PropertyRepair::getRepairId);
-        lqw.eq(bo.getPortalId() != null, PropertyRepair::getPortalId, bo.getPortalId());
+        lqw.eq(bo.getHouseId() != null, PropertyRepair::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), PropertyRepair::getHouseAddress, bo.getHouseAddress());
         lqw.eq(bo.getRepairTime() != null, PropertyRepair::getRepairTime, bo.getRepairTime());
         lqw.eq(bo.getUserId() != null, PropertyRepair::getUserId, bo.getUserId());

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ReservRecordServiceImpl.java

@@ -72,7 +72,7 @@ public class ReservRecordServiceImpl implements IReservRecordService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ReservRecord> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(ReservRecord::getReservRecordId);
-        lqw.eq(bo.getPortalId() != null, ReservRecord::getPortalId, bo.getPortalId());
+        lqw.eq(bo.getHouseId() != null, ReservRecord::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), ReservRecord::getHouseAddress, bo.getHouseAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getDetailAddress()), ReservRecord::getDetailAddress, bo.getDetailAddress());
         lqw.eq(StringUtils.isNotBlank(bo.getLgt()), ReservRecord::getLgt, bo.getLgt());

+ 1 - 1
ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/VisitorManageServiceImpl.java

@@ -78,7 +78,7 @@ public class VisitorManageServiceImpl implements IVisitorManageService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<VisitorManage> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(VisitorManage::getVisitorManageId);
-        lqw.eq(bo.getPortalId() != null, VisitorManage::getPortalId, bo.getPortalId());
+        lqw.eq(bo.getHouseId() != null, VisitorManage::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getHouseAddress()), VisitorManage::getHouseAddress, bo.getHouseAddress());
         lqw.like(StringUtils.isNotBlank(bo.getName()), VisitorManage::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getNum()), VisitorManage::getNum, bo.getNum());

+ 2 - 2
ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/IllegalParkingMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="org.dromara.domain.illegalParking.IllegalParking" id="IllegalParkingResult">
         <result property="illegalParkingId"    column="illegal_parking_id"    />
         <result property="plateNumber"    column="plate_number"    />
-        <result property="portalId"    column="portal_id"    />
+        <result property="houseId"    column="house_id"    />
         <result property="visitPortal"    column="visit_portal"    />
         <result property="mobileNumber"    column="mobile_number"    />
         <result property="visitName"    column="visit_name"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIllegalParkingVo">
-        select illegal_parking_id, plate_number, car_type,portal_id, visit_portal, mobile_number, visit_name, illegal_photo, is_black, create_by, create_time, update_by, update_time, remark from illegal_parking
+        select illegal_parking_id, plate_number, car_type,house_id, visit_portal, mobile_number, visit_name, illegal_photo, is_black, create_by, create_time, update_by, update_time, remark from illegal_parking
     </sql>
 
     <select id="selectIllegalCount" resultType="java.lang.Integer">

+ 2 - 2
ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/PropertyRepairMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="org.dromara.domain.propertyRepair.PropertyRepair" id="PropertyRepairResult">
         <result property="repairId"    column="repair_id"    />
         <result property="userId"    column="user_id"    />
-        <result property="portalId"    column="portal_id"    />
+        <result property="houseId"    column="house_id"    />
         <result property="houseAddress"    column="house_address"    />
         <result property="repairTime"    column="repair_time"    />
         <result property="phoneNumber"    column="phone_number"    />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
     <sql id="selectPropertyRepairVo">
-        select repair_id, portal_id, house_address, repair_time,user_id, phone_number, repair_title, maintenance_category, repair_details, repair_images, repair_status, staff_name, staff_id, staff_phone, visit_time, visit_photo, completion_time, completion_photo, repair_completion_details, create_by, create_time, update_by, update_time, remark from property_repair
+        select repair_id, house_id, house_address, repair_time,user_id, phone_number, repair_title, maintenance_category, repair_details, repair_images, repair_status, staff_name, staff_id, staff_phone, visit_time, visit_photo, completion_time, completion_photo, repair_completion_details, create_by, create_time, update_by, update_time, remark from property_repair
     </sql>
     <select id="selectPropertyRepairListByTime" parameterType="org.dromara.domain.propertyRepair.PropertyRepair" resultMap="PropertyRepairResult">
         <include refid="selectPropertyRepairVo"/>

+ 2 - 2
ruoyi-modules/ruoyi-wuye/src/main/resources/mapper/wuYe/VisitorManageMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="org.dromara.domain.visitor.VisitorManage" id="VisitorManageResult">
         <result property="visitorManageId"    column="visitor_manage_id"    />
-        <result property="portalId"    column="portal_id"    />
+        <result property="houseId"    column="house_id"    />
         <result property="houseAddress"    column="house_address"    />
         <result property="name"    column="name"    />
         <result property="num"    column="num"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVisitorManageVo">
-        select visitor_manage_id, portal_id, house_address, name, num, reason, mobile_number, is_car, plate_number, reserve_time, visitor_time, status, photo, create_by, create_time, update_by, update_time, remark from visitor_manage
+        select visitor_manage_id, house_id, house_address, name, num, reason, mobile_number, is_car, plate_number, reserve_time, visitor_time, status, photo, create_by, create_time, update_by, update_time, remark from visitor_manage
     </sql>
 
     <select id="selectVisitorManageVehicleCount" resultType="java.lang.Integer">