修改详情和列表返回内容

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;
 
     /**
      * 网格名称

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;
 }

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;
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaKettleBaseDisputeProcessDao.xml

@@ -12,14 +12,15 @@
             griddingname,
             eventtitle,
             eventdate,
-            mainpartyid,
+            base_key_id,
-            responsibility_unit,
+            eventaddrdetail,
-            base_key_id
+            finishedmethod,
+            wgy
         from
             ca_kettle_base_dispute_process
         <where>
-            <if test="form.mainpartyid != null and form.mainpartyid != ''">
+            <if test="form.wgy != null and form.wgy != ''">
-                AND mainpartyid like '%${form.mainpartyid}%'
+                AND wgy like '%${form.wgy}%'
             </if>
             <if test="form.griddingname != null and form.griddingname != ''">
                 AND griddingname like '%${form.griddingname}%'
@@ -37,8 +38,8 @@
             eventdate,
             eventaddrdetail,
             eventtext,
-            responsibility_unit,
+            finishedmethod,
-            mainpartyid
+            wgy
         from
             ca_kettle_base_dispute_process
         where