Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -740,13 +740,4 @@ public class DemoController {
         log.info("影响行数="+updateNum);
         return new Result();
     }
-
-    @Autowired
-    private ScreenGrassrootsGovernDataAbsorptionService wc;
-
-    @PostMapping("wc")
-    public Result wc(@RequestBody ScreenCentralZoneDataFormDTO param){
-        wc.difficultyDataHub(param);
-        return new Result();
-    }
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyShiftIssueTopicsResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,12 @@ public class MyShiftIssueTopicsResultDTO implements Serializable {
      */
     private String releaseGridName;
 
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    @JsonIgnore
     private String gridId;
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -425,6 +425,7 @@
     <!-- 个人中心-我发表的话题列表-已转议题列表 -->
     <select id="myShiftIssueTopics" resultType="com.epmet.dto.result.MyShiftIssueTopicsResultDTO">
         SELECT
+            ID AS issueId,
             SOURCE_ID AS topicId,
             UNIX_TIMESTAMP(CREATED_TIME) AS shiftIssueTime,
             SUGGESTION,

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java

@@ -9,6 +9,7 @@ public class ProjectOfCreateTopicUserResultDTO {
 
     private String topicId;
     private String projectId;
+    private String issueId;
     private String gridId;
     private Long shiftProjectTime;
     private List<String> departmentNameList;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -234,13 +234,15 @@
             p.id as projectId,
             rp.GRID_ID gridId,
             p.TITLE as projectTitle,
-            rp.GRID_ID releaseGridId
+            rp.GRID_ID releaseGridId,
+            rp2.SOURCE_ID  as issueId
         from project_related_personnel rp
                  inner join project p on (rp.PROJECT_ID = p.ID and p.DEL_FLAG = 0)
-        where USER_ID = #{userId}
+                 left join project_related_personnel rp2 on (rp.PROJECT_ID = rp2.PROJECT_ID and rp2.SOURCE_TYPE = 'issue')
+        where rp.USER_ID = #{userId}
             and p.CUSTOMER_ID=#{customerId}
             and p.DEL_FLAG=0
-            and SOURCE_TYPE = 'topic'
+            and rp.SOURCE_TYPE = 'topic'
         order by p.CREATED_TIME desc
     </select>
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class MyCreateTopicsResultDTO {
 
     private String topicId;
+    private String groupId;
     private Long releaseTime;
     private String topicContent;
     private String releaseGroupName;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ParticipatedTopicUnitResultDTO.java

@@ -16,6 +16,8 @@ public class ParticipatedTopicUnitResultDTO implements Serializable {
 
     private String topicId;
 
+    private String groupId;
+
     private String topicReleaseGridName;
 
     private String topicContent;

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -452,7 +452,8 @@
                t.topic_content as topicContent,
                unix_timestamp(t.created_time) as releaseTime,
                g.GROUP_NAME    as releaseGroupName,
-               g.GRID_ID       as releaseGridId
+               g.GRID_ID       as releaseGridId,
+               t.GROUP_ID      as groupId
         from resi_topic t
                  inner join resi_group g on (t.GROUP_ID = g.ID and g.CUSTOMER_ID = #{customerId})
         where t.CREATED_BY = #{userId}
@@ -481,8 +482,8 @@
         topic.topic_content,
         UNIX_TIMESTAMP(topic.created_time) AS releaseTime,
         groupp.group_name AS topicReleaseGroupName,
-        groupp.grid_id AS topicReleaseGridName
-
+        groupp.grid_id AS topicReleaseGridName,
+        topic.GROUP_ID
         FROM
         resi_topic topic LEFT JOIN resi_group groupp ON topic.group_id = groupp.ID AND groupp.del_flag = '0' AND groupp.customer_id = #{customerId}
         WHERE

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class MyCreateTopicsResultDTO {
     private String topicId;
+    private String groupId;
     private Long releaseTime;
     private String topicContent;
     private String releaseGroupName;

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java

@@ -8,6 +8,7 @@ import java.util.List;
 public class MyShiftProjectTopicsResultDTO {
     private String topicId;
     private String gridId;
+    private String issueId;
     private Long shiftProjectTime;
     private List<String> departmentNameList;
     private String projectTitle;