diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java index 33872e7596..eb8253cd65 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/KettleNewsFormDto.java @@ -10,9 +10,9 @@ public class KettleNewsFormDto implements Serializable { private static final long serialVersionUID = -6633389149995248497L; /** - * 主要当事人姓名 + * 上报人姓名 */ - private String mainpartyid; + private String wgy; /** * 网格名称 diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java index 1ea5d33227..e182fcaf07 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaKettleDetailsResultDTO.java @@ -36,12 +36,12 @@ public class CaKettleDetailsResultDTO implements Serializable { private String eventtext; /** - * 涉及单位 + * 办结方式 */ - private String responsibilityUnit; + private String finishedmethod; /** - * 主要当事人姓名 + * 上报人 */ - private String mainpartyid; + private String wgy; } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java index 0d10df3aeb..fb826342fb 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/KettleNewsResultDto.java @@ -25,18 +25,24 @@ public class KettleNewsResultDto implements Serializable { */ private Date eventdate; + /** - * 主要当事人 + * 主键 */ - private String mainpartyid; + private Integer baseKeyId; /** - * 涉及单位 + * 发生地点 */ - private String responsibilityUnit; + private String eventaddrdetail; /** - * 主键 + * 办结方式 */ - private Integer baseKeyId; + private String finishedmethod; + + /** + * 上报人(网格员名称) + */ + private String wgy; } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml index b251abcaf0..35e60e4fa7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml @@ -12,14 +12,15 @@ griddingname, eventtitle, eventdate, - mainpartyid, - responsibility_unit, - base_key_id + base_key_id, + eventaddrdetail, + finishedmethod, + wgy from ca_kettle_base_dispute_process - - AND mainpartyid like '%${form.mainpartyid}%' + + AND wgy like '%${form.wgy}%' AND griddingname like '%${form.griddingname}%' @@ -37,8 +38,8 @@ eventdate, eventaddrdetail, eventtext, - responsibility_unit, - mainpartyid + finishedmethod, + wgy from ca_kettle_base_dispute_process where