From 9d24b9e6ce4e09bc76dcde0a6a7c2d4c97f5dd8b Mon Sep 17 00:00:00 2001 From: "java_cuibaocheng@163.com" Date: Sat, 4 Nov 2023 15:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20,=20=E4=BA=BA=E5=8F=A3=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=20,=20=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../populationinfo/PopulationInfoBaseDTO.java | 10 +++ .../populationinfo/PopulationInfoDTO.java | 10 +++ .../mybatis/mapper/dispute/dispute-mapper.xml | 3 +- .../mybatis/mapper/drug/drug-mapper.xml | 34 +++++----- .../mapper/petition/petition-mapper.xml | 3 +- .../populationinfo/population-info-mapper.xml | 8 ++- .../mybatis/mapper/release/release-mapper.xml | 64 +++++++++---------- .../mapper/security/security-mapper.xml | 53 +++++++-------- 8 files changed, 106 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java index 96e8b86..28977ef 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java @@ -61,6 +61,16 @@ public class PopulationInfoBaseDTO { private String phone; @ApiModelProperty(name = "age", value = "年龄") private Integer age; + @ApiModelProperty(name = "创建人", value = "创建人") + private String creator; + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } public String getHealthStatus() { return healthStatus; diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java index 9eafef8..ce4039e 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoDTO.java @@ -168,6 +168,16 @@ public class PopulationInfoDTO { @ApiModelProperty(name = "age", value = "年龄") @CheckEmptyAnnotation(name = "年龄") private Integer age; + @ApiModelProperty(name = "创建人", value = "创建人") + private String creator; + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } public String getDepartmentType() { return departmentType == null ? "" : departmentType; diff --git a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml index c2cc571..b89f062 100644 --- a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml +++ b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml @@ -831,7 +831,8 @@ t1.partyb_idcard, t1.partyb_name, t1.partyb_phone, - t1.dispute_id + t1.dispute_id, + t1.creator FROM population_dispute t1 LEFT JOIN diff --git a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml index 06a5d6b..165ed2d 100644 --- a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml +++ b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml @@ -79,23 +79,23 @@ gmt_modified, is_delete ) VALUES( - #{drugId}, - #{populationInfoId}, - #{startTime}, - #{control}, - #{controlPhone}, - #{help}, - #{helpPhone}, - #{charge}, - #{reason}, - #{reasonOther}, - #{consequence}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + #{drugId}, + #{populationInfoId}, + #{startTime}, + #{control}, + #{controlPhone}, + #{help}, + #{helpPhone}, + #{charge}, + #{reason}, + #{reasonOther}, + #{consequence}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) diff --git a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml index 67a7849..1ef85e4 100644 --- a/src/main/resources/mybatis/mapper/petition/petition-mapper.xml +++ b/src/main/resources/mybatis/mapper/petition/petition-mapper.xml @@ -311,7 +311,8 @@ t2.dictionary_name AS coordinate_name, t1.talk, t3.dictionary_name AS talk_name, - t1.petition_id + t1.petition_id, + t1.creator FROM population_petition t1 LEFT JOIN diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml index 23d6a75..290ae5f 100644 --- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml +++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml @@ -18,6 +18,7 @@ + @@ -95,6 +96,7 @@ + @@ -663,7 +665,8 @@ t1.is_disability, t1.is_military, t1.is_succour, - t1.is_party + t1.is_party, + t1.creator FROM population_population_info t1 WHERE @@ -1004,7 +1007,8 @@ t1.is_party, t1.party_organization, t1.party_time, - t1.othertext + t1.othertext, + t1.creator FROM population_population_info t1 WHERE diff --git a/src/main/resources/mybatis/mapper/release/release-mapper.xml b/src/main/resources/mybatis/mapper/release/release-mapper.xml index 35dce31..7c91950 100644 --- a/src/main/resources/mybatis/mapper/release/release-mapper.xml +++ b/src/main/resources/mybatis/mapper/release/release-mapper.xml @@ -71,21 +71,21 @@ gmt_modified, is_delete ) VALUES( - #{releaseId}, - #{populationInfoId}, - #{charge}, - #{prisonTerm}, - #{type}, - #{organization}, - #{superviseTime}, - #{isRelease}, - #{releaseTime}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + #{releaseId}, + #{populationInfoId}, + #{charge}, + #{prisonTerm}, + #{type}, + #{organization}, + #{superviseTime}, + #{isRelease}, + #{releaseTime}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) @@ -229,25 +229,25 @@ SELECT - t1.security_id, - t1.population_info_id, - t1.charge, - t1.time, - t1.security_address, - t1.security_area_code, - t1.security_area_name, - t1.lat, - t1.lng, - t1.map_address, - t1.degree, - t1.creator, - t1.gmt_create, - t1.modifier, - t1.gmt_modified, - t1.is_delete, - t1.acceptance_population_info_id, - t1.acceptance_name, - t1.acceptance_idcard, - t1.acceptance_phone, - t1.handle_population_info_id, - t1.handle_name, - t1.handle_idcard, - t1.handle_phone + t1.security_id, + t1.population_info_id, + t1.charge, + t1.time, + t1.security_address, + t1.security_area_code, + t1.security_area_name, + t1.lat, + t1.lng, + t1.map_address, + t1.degree, + t1.creator, + t1.gmt_create, + t1.modifier, + t1.gmt_modified, + t1.is_delete, + t1.acceptance_population_info_id, + t1.acceptance_name, + t1.acceptance_idcard, + t1.acceptance_phone, + t1.handle_population_info_id, + t1.handle_name, + t1.handle_idcard, + t1.handle_phone, + t1.creator FROM - population_security t1 + population_security t1 WHERE - t1.is_delete = 0 + t1.is_delete = 0 AND t1.degree = #{degree}