lin
2024-03-20 d87fc2aa632ff4dedade3a18fa1a860554189042
租客性别+年龄+时间字段
3 files modified
55 ■■■■ changed files
src/main/java/org/springblade/modules/house/entity/HouseTenantEntity.java 23 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml 29 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/entity/HouseTenantEntity.java
@@ -16,10 +16,8 @@
 */
package org.springblade.modules.house.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
@@ -29,6 +27,7 @@
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serializable;
import java.util.Date;
/**
 * 租户管理 实体类
@@ -93,4 +92,20 @@
    @ApiModelProperty("是否已删除 0:否  1:是")
    private Integer isDeleted;
    /** 性别 */
    @ApiModelProperty(value = "性别", example = "")
    @TableField("gender")
    private Integer gender;
    /** 民族 */
    @ApiModelProperty(value = "民族", example = "")
    @TableField("ethnicity")
    private Integer ethnicity;
    /** 创建时间 */
    @ApiModelProperty(value = "创建时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(value = "create_time",fill = FieldFill.INSERT)
    private Date createTime;
}
src/main/java/org/springblade/modules/house/mapper/HouseTenantMapper.xml
@@ -4,15 +4,18 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="houseTenantResultMap" type="org.springblade.modules.house.entity.HouseTenantEntity">
        <result column="id" property="id"/>
        <result column="housing_rental_id" property="housingRentalId"/>
        <result column="name" property="name"/>
        <result column="phone" property="phone"/>
        <result column="id_card" property="idCard"/>
        <result column="domicile" property="domicile"/>
        <result column="work_unit" property="workUnit"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
        <result property="id"    column="id"    />
        <result property="housingRentalId"    column="housing_rental_id"    />
        <result property="name"    column="name"    />
        <result property="phone"    column="phone"    />
        <result property="idCard"    column="id_card"    />
        <result property="domicile"    column="domicile"    />
        <result property="workUnit"    column="work_unit"    />
        <result property="remark"    column="remark"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="gender"    column="gender"    />
        <result property="ethnicity"    column="ethnicity"    />
        <result property="createTime"    column="create_time"    />
    </resultMap>
    <sql id="selectHouseTenant">
@@ -25,7 +28,10 @@
            domicile,
            work_unit,
            remark,
            is_deleted
            is_deleted,
            gender,
            ethnicity,
            create_time
        from
            jczz_house_tenant
    </sql>
@@ -43,6 +49,9 @@
            <if test="houseTenant.workUnit != null  and workUnit != ''"> and work_unit = #{houseTenant.workUnit}</if>
            <if test="houseTenant.remark != null  and remark != ''"> and remark = #{houseTenant.remark}</if>
            <if test="houseTenant.isDeleted != null "> and is_deleted = #{houseTenant.isDeleted}</if>
            <if test="houseTenant.gender != null "> and gender = #{houseTenant.gender}</if>
            <if test="houseTenant.ethnicity != null "> and ethnicity = #{houseTenant.ethnicity}</if>
            <if test="houseTenant.createTime != null "> and create_time = #{houseTenant.createTime}</if>
        </where>
    </select>
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -21,8 +21,8 @@
        LEFT JOIN jczz_house jh on jh.house_code=jtrpa.house_code
        left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
        left join blade_region br on br.code = jg.community_code
        where jtrpa.is_deleted = 0
        <where>
            and jtrpa.is_deleted = 0
            <if test="residen.id != null ">and id = #{residen.id}</if>
            <if test="residen.name != null  and residen.name != ''">and name = #{residen.name}</if>
            <if test="residen.phone != null  and residen.phone != ''">and phone = #{residen.phone}</if>
@@ -88,7 +88,6 @@
                </if>
            </if>
            and is_deleted = 0
        </where>
    </select>