From 01cf8140ee6ea6a98ff12d5ef973b050fbf75bf1 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 16 Mar 2024 15:23:02 +0800
Subject: [PATCH] 场所添加字段+从业人员添加字段
---
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 5
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 170 +++++++++++++++---------
src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java | 3
src/main/java/org/springblade/modules/house/entity/HouseEntity.java | 5
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java | 5
src/main/java/org/springblade/modules/label/entity/LabelEntity.java | 5
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 52 +++---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 65 +++++----
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 97 +++++++------
9 files changed, 236 insertions(+), 171 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
index 9782c79..d1e15ad 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
@@ -16,10 +16,7 @@
*/
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;
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
index ff36524..a5d0de2 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -283,4 +283,9 @@
@ApiModelProperty("出租屋id")
private Long housingRentalId;
+ /** 自愿者组织 */
+ @ApiModelProperty(value = "自愿者组织", example = "")
+ @TableField("volunteer_org")
+ private String volunteerOrg;
+
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 784962a..0296e5e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -4,73 +4,106 @@
<!-- 通用查询映射结果 -->
<resultMap id="householdResultMap" type="org.springblade.modules.house.entity.HouseholdEntity">
- <result column="id" property="id"/>
- <result column="house_code" property="houseCode"/>
- <result column="name" property="name"/>
- <result column="phone_number" property="phoneNumber"/>
- <result column="associated_user_id" property="associatedUserId"/>
- <result column="relationship" property="relationship"/>
- <!-- <result column="primary_contact" property="primaryContact"/>-->
- <result column="residential_status" property="residentialStatus"/>
- <result column="gender" property="gender"/>
- <result column="birthday" property="birthday"/>
- <result column="id_card" property="idCard"/>
- <result column="ethnicity" property="ethnicity"/>
- <result column="education" property="education"/>
- <result column="hukou_registration" property="hukouRegistration"/>
- <result column="work_status" property="workStatus"/>
- <result column="employer" property="employer"/>
- <result column="marital_status" property="maritalStatus"/>
- <result column="card_number" property="cardNumber"/>
- <result column="other_contact" property="otherContact"/>
- <result column="current_address" property="currentAddress"/>
- <result column="disability_cert" property="disabilityCert"/>
- <!-- <result column="data_status" property="dataStatus"/>-->
- <result column="role_type" property="roleType"/>
- <result column="party_ember" property="partyEmber"/>
- <result column="create_user" property="createUser"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
- <result column="remark" property="remark"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="confirm_flag" property="confirmFlag"/>
- <result column="housing_rental_id" property="housingRentalId"/>
+ <result property="id" column="id" />
+ <result property="houseCode" column="house_code" />
+ <result property="name" column="name" />
+ <result property="phoneNumber" column="phone_number" />
+ <result property="associatedUserId" column="associated_user_id" />
+ <result property="roleType" column="role_type" />
+ <result property="relationship" column="relationship" />
+ <result property="isPrimaryContact" column="is_primary_contact" />
+ <result property="residentialStatus" column="residential_status" />
+ <result property="gender" column="gender" />
+ <result property="birthday" column="birthday" />
+ <result property="idCard" column="id_card" />
+ <result property="cardType" column="card_type" />
+ <result property="cardNo" column="card_no" />
+ <result property="ethnicity" column="ethnicity" />
+ <result property="education" column="education" />
+ <result property="residentType" column="resident_type" />
+ <result property="hukouRegistration" column="hukou_registration" />
+ <result property="residentAdcode" column="resident_adcode" />
+ <result property="nativePlaceAdcode" column="native_place_adcode" />
+ <result property="religiousBelief" column="religious_belief" />
+ <result property="healthStatus" column="health_status" />
+ <result property="diseaseName" column="disease_name" />
+ <result property="workStatus" column="work_status" />
+ <result property="employer" column="employer" />
+ <result property="occupation" column="occupation" />
+ <result property="cmpyRegAddr" column="cmpy_reg_addr" />
+ <result property="goOutAddr" column="go_out_addr" />
+ <result property="goOutWhere" column="go_out_where" />
+ <result property="goOutTime" column="go_out_time" />
+ <result property="goOutReason" column="go_out_reason" />
+ <result property="maritalStatus" column="marital_status" />
+ <result property="cardNumber" column="card_number" />
+ <result property="otherContact" column="other_contact" />
+ <result property="homeAdcode" column="home_adcode" />
+ <result property="currentAddress" column="current_address" />
+ <result property="disabilityCert" column="disability_cert" />
+ <result property="partyEmber" column="party_ember" />
+ <result property="housingRentalId" column="housing_rental_id" />
+ <result property="confirmFlag" column="confirm_flag" />
+ <result property="createUser" column="create_user" />
+ <result property="createTime" column="create_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="volunteerOrg" column="volunteer_org" />
</resultMap>
<sql id="selectHousehold">
- select id,
- house_code,
- name,
- phone_number,
- associated_user_id,
- role_type,
- relationship,
- is_primary_contact,
- residential_status,
- gender,
- birthday,
- id_card,
- ethnicity,
- education,
- hukou_registration,
- work_status,
- employer,
- marital_status,
- card_number,
- other_contact,
- current_address,
- disability_cert,
- party_ember,
- create_user,
- create_time,
- update_user,
- update_time,
- remark,
- is_deleted,
- confirm_flag,
- housing_rental_id
- from jczz_household
+ select
+ id,
+ house_code,
+ name,
+ phone_number,
+ associated_user_id,
+ role_type,
+ relationship,
+ is_primary_contact,
+ residential_status,
+ gender,
+ birthday,
+ id_card,
+ card_type,
+ card_no,
+ ethnicity,
+ education,
+ resident_type,
+ hukou_registration,
+ resident_adcode,
+ native_place_adcode,
+ religious_belief,
+ health_status,
+ disease_name,
+ work_status,
+ employer,
+ occupation,
+ cmpy_reg_addr,
+ go_out_addr,
+ go_out_where,
+ go_out_time,
+ go_out_reason,
+ marital_status,
+ card_number,
+ other_contact,
+ home_adcode,
+ current_address,
+ disability_cert,
+ party_ember,
+ housing_rental_id,
+ confirm_flag,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ remark,
+ is_deleted,
+ volunteer_org
+ from
+ jczz_household
</sql>
<resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
@@ -158,6 +191,7 @@
jg.grid_name,
jhs.building,
jhs.district_code aoiCode,
+ jh.volunteer_org,
jhs.unit
FROM
jczz_household jh
@@ -173,6 +207,9 @@
</if>
<if test="household.name!=null and household.name !=''">
and jh.name like concat('%',#{household.name},'%')
+ </if>
+ <if test="volunteerOrg != null and volunteerOrg != ''">
+ and jh.volunteer_org like concat('%',#{household.volunteerOrg},'%')
</if>
<if test="household.houseCode!=null and household.houseCode !=''">
and jh.house_code = #{household.houseCode}
@@ -319,6 +356,7 @@
concat( jhs.building, " ", unit, " ", room ) AS address,
jda.town_street_name AS townStreetName,
jda.nei_name AS neiName,
+ jh.volunteer_org,
jg.grid_name
FROM
jczz_household jh
@@ -452,6 +490,7 @@
jh.remark,
jh.confirm_flag,
jh.housing_rental_id,
+ jh.volunteer_org,
if(jda.id is not null, substring(jda.town_street_code, 1, 9), jh.home_adcode) as home_adcode,
br1.name as residentAdName,
br1.province_code as residentProvinceAdCode,
@@ -492,7 +531,7 @@
jh.is_primary_contact isPrimaryContact,jh.residential_status residentialStatus,jh.gender,
jh.birthday,jh.id_card idCard,jh.ethnicity,jh.education,
jh.hukou_registration hukouRegistration,jh.work_status workStatus,jh.employer,jh.marital_status maritalStatus,
- jh.card_number cardNumber,jh.other_contact otherContact,jh.current_address currentAddress,
+ jh.card_number cardNumber,jh.other_contact otherContact,jh.current_address currentAddress,jh.volunteer_org,
jh.disability_cert disabilityCert,jh.party_ember partyEmber,jh.remark,
jhs.district_name aoiName,
concat(jhs.building," ",unit," ",room) as address
@@ -887,6 +926,7 @@
jh.remark,
jh.confirm_flag,
jh.housing_rental_id,
+ jh.volunteer_org,
IF
( jda.id IS NOT NULL, substring( jda.town_street_code, 1, 9 ), jh.home_adcode ) AS home_adcode,
jhs.district_name aoiName,
diff --git a/src/main/java/org/springblade/modules/label/entity/LabelEntity.java b/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
index eac3c67..8e02e54 100644
--- a/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
+++ b/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
@@ -18,12 +18,10 @@
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 com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -54,6 +52,7 @@
/** 标签名称 */
@ApiModelProperty(value = "标签名称", example = "")
@TableField("label_name")
+ @JsonProperty("name")
private String labelName;
/** 排序 */
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index 7f88fa0..147b2a9 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -195,6 +195,11 @@
@TableField("aoi_code")
private String aoiCode;
+ /** 1：否 2：是 三级消防单位 */
+ @ApiModelProperty(value = "1：否 2：是 三级消防单位", example = "")
+ @TableField("three_fire_protection")
+ private Integer threeFireProtection;
+
}
diff --git a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
index 65a10b7..15e4fcc 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -40,12 +40,9 @@
@ApiModel(value = "PlacePractitioner对象", description = "场所从业人员")
public class PlacePractitionerEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 主键
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("主键id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
+ /** 主键 */
+ @ApiModelProperty(value = "主键ID", example = "")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 场所ID */
@@ -63,8 +60,8 @@
@TableField("telephone")
private String telephone;
- /** 现住地址 */
- @ApiModelProperty(value = "现住地址", example = "")
+ /** 暂住地 */
+ @ApiModelProperty(value = "暂住地", example = "")
@TableField("temp_address")
private String tempAddress;
@@ -88,16 +85,6 @@
@TableField("card_type")
private String cardType;
- /** 工作单位(就职单位) */
- @ApiModelProperty(value = "工作单位(就职单位)", example = "")
- @TableField("employer")
- private String employer;
-
- /** 户籍地址 */
- @ApiModelProperty(value = "户籍地址", example = "")
- @TableField("registered_address")
- private String registeredAddress;
-
/** 岗位性质 */
@ApiModelProperty(value = "岗位性质", example = "")
@TableField("job_nature")
@@ -108,19 +95,15 @@
@TableField("employer_img")
private String employerImg;
- /** 微信号 */
- @ApiModelProperty(value = "微信号", example = "")
- @TableField("wx_account")
- private String wxAccount;
-
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
+
/** 生日 */
@ApiModelProperty(value = "生日", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("birthday")
private Date birthday;
@@ -129,11 +112,11 @@
@TableField("ethnicity")
private Integer ethnicity;
- /** 民族 */
+ /** 0：否1：是 */
@ApiModelProperty(value = "0：否1：是", example = "")
@TableField("is_deleted")
+ @TableLogic
private Integer isDeleted;
-
/** 0:否 1：是 前科 */
@ApiModelProperty(value = "0:否 1：是 前科", example = "")
@@ -145,5 +128,22 @@
@TableField("fake_id_card")
private Integer fakeIdCard;
+ /** 审查异常分类 */
+ @ApiModelProperty(value = "审查异常分类", example = "")
+ @TableField("ano_type_name")
+ private String anoTypeName;
+
+ /** 入职时间 */
+ @ApiModelProperty(value = "入职时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "employment_time",fill = FieldFill.INSERT)
+ private Date employmentTime;
+
+ /** 离职时间 */
+ @ApiModelProperty(value = "离职时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("resignation_time")
+ private Date resignationTime;
+
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 847b7e6..e2d80b1 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -685,39 +685,44 @@
<result property="remark" column="remark" />
<result property="isDeleted" column="is_deleted" />
<result property="aoiCode" column="aoi_code" />
+ <result property="threeFireProtection" column="three_fire_protection" />
</resultMap>
<sql id="selectPlace">
- select
- id,
- house_code,
- building_code,
- principal_user_id,
- principal,
- principal_id_card,
- principal_phone,
- place_name,
- lng,
- lat,
- location,
- image_urls,
- grid_code,
- source,
- status,
- is_scene,
- is_nine,
- nine_type,
- is_front,
- front_type,
- create_user,
- create_time,
- update_user,
- update_time,
- remark,
- is_deleted,
-
- from
- jczz_place
+ select
+ id,
+ house_code,
+ house_code_binds,
+ building_code,
+ principal_user_id,
+ principal,
+ principal_phone,
+ principal_id_card,
+ place_name,
+ lng,
+ lat,
+ location,
+ image_urls,
+ grid_id,
+ grid_code,
+ jw_grid_code,
+ source,
+ status,
+ is_scene,
+ is_nine,
+ nine_type,
+ is_front,
+ front_type,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ remark,
+ is_deleted,
+ aoi_code,
+ three_fire_protection
+ from
+ jczz_place
</sql>
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index f243d1c..927abd8 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -15,16 +15,15 @@
jpp.id_card,
jpp.card_type,
jp.place_name employer,
- jpp.registered_address,
- jpp.job_nature,
jpp.employer_img,
- jpp.wx_account,
jpp.create_time,
jpp.birthday,
jpp.ethnicity,
jpp.is_deleted,
jpp.criminal_record_flag,
jpp.fake_id_card,
+ jpp.employment_time,
+ jpp.resignation_time,
jc.category_name
FROM
jczz_place_practitioner jpp
@@ -57,19 +56,20 @@
<if test="placePractitioner.employer != null and placePractitioner.employer != ''">and jpp.employer =
#{placePractitioner.employer}
</if>
- <if test="placePractitioner.registeredAddress != null and placePractitioner.registeredAddress != ''">and
- jpp.registered_address = #{placePractitioner.registeredAddress}
+
+ <if test="placePractitioner.resignation != null and placePractitioner.resignation == 1">
+ and jpp.resignation_time is null
</if>
- <if test="placePractitioner.jobNature != null and placePractitioner.jobNature != ''">and jpp.job_nature =
- #{placePractitioner.jobNature}
+
+ <if test="placePractitioner.resignation != null and placePractitioner.resignation == 2">
+ and jpp.resignation_time is not null
</if>
+
<if test="placePractitioner.employerImg != null and placePractitioner.employerImg != ''">and
jpp.employer_img =
#{placePractitioner.employerImg}
</if>
- <if test="placePractitioner.wxAccount != null and placePractitioner.wxAccount != ''">and jpp.wx_account =
- #{placePractitioner.wxAccount}
- </if>
+
<if test="placePractitioner.createTime != null ">and jpp.create_time = #{placePractitioner.createTime}</if>
<if test="placePractitioner.birthday != null ">and jpp.birthday = #{placePractitioner.birthday}</if>
<if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>
@@ -93,42 +93,52 @@
<resultMap type="org.springblade.modules.place.dto.PlacePractitionerDTO" id="JczzPlacePractitionerDTOResult">
- <result property="id" column="id"/>
- <result property="placeId" column="place_id"/>
- <result property="name" column="name"/>
- <result property="telephone" column="telephone"/>
- <result property="tempAddress" column="temp_address"/>
- <result property="age" column="age"/>
- <result property="gender" column="gender"/>
- <result property="idCard" column="id_card"/>
- <result property="cardType" column="card_type"/>
- <result property="employer" column="employer"/>
- <result property="registeredAddress" column="registered_address"/>
- <result property="jobNature" column="job_nature"/>
- <result property="employerImg" column="employer_img"/>
- <result property="wxAccount" column="wx_account"/>
- <result property="createTime" column="create_time"/>
+ <result property="id" column="id" />
+ <result property="placeId" column="place_id" />
+ <result property="name" column="name" />
+ <result property="telephone" column="telephone" />
+ <result property="tempAddress" column="temp_address" />
+ <result property="age" column="age" />
+ <result property="gender" column="gender" />
+ <result property="idCard" column="id_card" />
+ <result property="cardType" column="card_type" />
+ <result property="jobNature" column="job_nature" />
+ <result property="employerImg" column="employer_img" />
+ <result property="createTime" column="create_time" />
+ <result property="birthday" column="birthday" />
+ <result property="ethnicity" column="ethnicity" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="criminalRecordFlag" column="criminal_record_flag" />
+ <result property="fakeIdCard" column="fake_id_card" />
+ <result property="anoTypeName" column="ano_type_name" />
+ <result property="employmentTime" column="employment_time" />
+ <result property="resignationTime" column="resignation_time" />
</resultMap>
<sql id="selectJczzPlacePractitioner">
- select id,
- place_id,
- name,
- telephone,
- temp_address,
- age,
- gender,
- id_card,
- card_type,
- employer,
- registered_address,
- job_nature,
- employer_img,
- wx_account,
- create_time,
- birthday,
- ethnicity
- from jczz_place_practitioner
+ select
+ id,
+ place_id,
+ name,
+ telephone,
+ temp_address,
+ age,
+ gender,
+ id_card,
+ card_type,
+ job_nature,
+ employer_img,
+ create_time,
+ birthday,
+ ethnicity,
+ is_deleted,
+ criminal_record_flag,
+ fake_id_card,
+ ano_type_name,
+ employment_time,
+ resignation_time
+ from
+ jczz_place_practitioner
</sql>
<select id="selectPlaceCountByType" parameterType="long" resultType="integer">
@@ -149,6 +159,7 @@
and jc.category_no in (180202,180201)
</if>
and jpp.is_deleted = 0
+ and jpp.resignation_time is null
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java b/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
index ddeaebe..91fc7e2 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
@@ -40,4 +40,7 @@
@ApiModelProperty(value = "标签类型", example = "")
private String categoryName;
+ @ApiModelProperty(value = "1：未辞职 2：已辞职", example = "")
+ private Integer resignation;
+
}
--
Gitblit v1.9.3