Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueApplicationDTO.java

@@ -73,6 +73,8 @@ public class IssueApplicationDTO implements Serializable {
      * 网格ID 居民端议题对应一个网格Id
      */
 	private String gridId;
+    private String orgId;
+    private String orgIdPath;
 
     /**
      * 审核通过后对应的 议题id

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govissue/IssueApplicationEntity.java

@@ -70,6 +70,9 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	private String orgId;
+	private String orgIdPath;
+
     /**
      * 审核通过后对应的 议题id
      */

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

@@ -73,6 +73,8 @@ public class IssueApplicationDTO implements Serializable {
      * 网格ID 居民端议题对应一个网格Id
      */
 	private String gridId;
+	private String orgId;
+	private String orgIdPath;
 
     /**
      * 审核通过后对应的 议题id

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java

@@ -19,8 +19,10 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.form.AuditListFormDTO;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
 import com.epmet.dto.form.UserPubAuditingIssueFormDTO;
+import com.epmet.dto.result.AuditListResultDTO;
 import com.epmet.dto.result.IssueApplicationResDTO;
 import com.epmet.dto.result.UserPubAuditingIssueResDTO;
 import com.epmet.entity.IssueApplicationEntity;
@@ -74,4 +76,6 @@ public interface IssueApplicationDao extends BaseDao<IssueApplicationEntity> {
      */
     List<String> selectTopicIdList(@Param("topicIdList") List<String> topicIdList);
 
+    List<AuditListResultDTO> auditList(AuditListFormDTO formDTO);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java

@@ -70,6 +70,9 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	private String orgId;
+	private String orgIdPath;
+
     /**
      * 审核通过后对应的 议题id
      */

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -379,7 +379,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         result.setAuditSwitch(ifOpen ? ModuleConstants.AUDIT_SWITCH_OPEN : ModuleConstants.AUDIT_SWITCH_CLOSE);
 
         //2.居民端组长提交议题审核
-
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(param.getGridId());
+        if (null == gridInfo){
+            throw new EpmetException("查询网格信息失败："+param.getGridId());
+        }
         //默认打开
                 //2.1查询是否存在application记录
                 Map<String, Object> applicationParam = new HashMap<>();
@@ -393,6 +396,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     if(ifOpen) {
                         //首次提交 新增application
                         IssueApplicationDTO newApplication = ConvertUtils.sourceToTarget(param, IssueApplicationDTO.class);
+                        newApplication.setOrgId(gridInfo.getPid());
+                        newApplication.setOrgIdPath(gridInfo.getPids());
                         newApplication.setApplyStatus(defaultStatusUnderAuditing);
                         newApplication.setId(UUID.randomUUID().toString().replace("-", ""));
                         applicationService.save(newApplication);

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.19__alter_issue_application.sql

@@ -0,0 +1,2 @@
+alter table issue_application add COLUMN ORG_ID VARCHAR(64) DEFAULT'' COMMENT '组织ID' AFTER GRID_ID;
+alter table issue_application add COLUMN ORG_ID_PATH VARCHAR(1024) DEFAULT'' COMMENT '组织ID全路径，包括ORG_ID' AFTER ORG_ID;

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

@@ -86,4 +86,45 @@
         </foreach>
     </select>
 
+    <!-- 查询议题审核列表 -->
+    <select id="auditList" resultType="com.epmet.dto.result.AuditListResultDTO">
+        SELECT * FROM (
+                          SELECT
+                              h.CREATED_TIME,
+                              ia.ID AS issueApplicationId,
+                              ia.ISSUE_TITLE,
+                              ia.SUGGESTION,
+                              ia.APPLY_STATUS,
+                              (CASE WHEN ia.APPLY_STATUS = 'under_auditing' THEN '待审核'
+                                    WHEN ia.APPLY_STATUS = 'rejected' THEN '已驳回'
+                                    ELSE '已驳回' END) AS applyStatusName,
+                              ia.GRID_ID
+                          FROM issue_application ia
+                          LEFT JOIN issue_application_history h ON h.ISSUE_APPLICATION_ID = ia.ID AND h.DEL_FLAG = '0'
+                          WHERE ia.DEL_FLAG = '0'
+                                <if test='null == applyStatus or applyStatus == "" '>
+                                    AND ia.apply_status in ('rejected','under_auditing')
+                                </if>
+                                <if test='null != applyStatus or applyStatus != "" '>
+                                    AND ia.apply_status = #{applyStatus}
+                                </if>
+                                <if test='null != startTime and startTime = "" '>
+                                    AND DATE_FORMAT(h.CREATED_TIME,'%Y%m%d') <![CDATA[ >= ]]> #{startTime}
+                                </if>
+                                <if test='null != endTime and endTime = "" '>
+                                    AND DATE_FORMAT(h.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+                                </if>
+                                <if test='null != issueTitle and issueTitle = "" '></if>
+                                <choose>
+                                    <when test='orgType == "agency"'>
+                                        AND ia.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
+                                    </when>
+                                    <otherwise>
+                                        AND ia.GRID_ID = #{orgId}
+                                    </otherwise>
+                                </choose>
+                          ORDER BY h.CREATED_TIME DESC)t
+        GROUP BY issueApplicationId
+    </select>
+
 </mapper>