diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
index c477ef4..0694225 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
@@ -6,10 +6,7 @@ import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.modules.screen.service.EpdcScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -267,4 +264,32 @@ public class EpdcScreenController {
         ValidatorUtils.validateEntity(formDto);
         return epdcScreenService.vaccinationPersonVaccinationStatistics(formDto);
     }
+
+    /**
+     * 网格治理项目详情
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.EpdcScreenItemDetailResultDTO>
+     * @author lc
+     * @since 2021/8/20 19:35
+     */
+    @GetMapping("gridGovernance/itemDetail")
+    public Result<EpdcScreenItemDetailResultDTO> itemDetail(@RequestBody EpdcScreenItemDetailFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.itemDetail(formDto);
+    }
+
+    /**
+     * 网格治理-议题详情
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO>>
+     * @author lc
+     * @since 2021/8/21 17:36
+     */
+    @GetMapping("gridGovernance/issueProgress")
+    public Result<List<EpdcScreenIssueProgressResultDTO>> issueProgress(@RequestBody EpdcScreenIssueProgressFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.issueProgress(formDto);
+    }
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
index 8b44cec..44509cf 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
@@ -188,4 +188,36 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      */
     EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
 
+    /**
+     * 获取项目详情和网格员
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemDetailResultDTO
+     * @author lc
+     * @since 2021/8/20 20:38
+     */
+    EpdcScreenItemDetailResultDTO itemDetailAndGridMan(EpdcScreenItemDetailFormDTO formDto);
+
+    /**
+     * 项目处理进展
+     *
+     * @param id
+     * @return
+     * @author lc
+     * @since 2021/8/20 20:59
+     */
+    List<EpdcScreenItemHandleProgressResultDTO> screenItemHandleProgress(String id);
+
+    /**
+     * 项目信息
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemInfoResultDTO
+     * @author lc
+     * @since 2021/8/21 17:44
+     */
+    EpdcScreenItemInfoResultDTO selectItemInfo(EpdcScreenIssueProgressFormDTO formDto);
+
+    List<EpdcScreenIssueProgressResultDTO> issueProgress(String issueId);
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
index e2a7f0a..53ff909 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
@@ -187,4 +187,24 @@ public interface EpdcScreenService {
      * @since 2021/8/12 15:30
      */
     Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO> vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 网格治理项目详情
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.EpdcScreenItemDetailResultDTO>
+     * @author lc
+     * @since 2021/8/20 19:35
+     */
+    Result<EpdcScreenItemDetailResultDTO> itemDetail(EpdcScreenItemDetailFormDTO formDto);
+
+    /**
+     * 网格治理-议题详情
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO>>
+     * @author lc
+     * @since 2021/8/21 17:36
+     */
+    Result<List<EpdcScreenIssueProgressResultDTO>> issueProgress(EpdcScreenIssueProgressFormDTO formDto);
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
index b97fcbc..4ebdfb5 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.screen.service.impl;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.analysis.pc.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
@@ -150,5 +151,23 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
         return new Result<EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO>().ok(data);
     }
 
+    @Override
+    public Result<EpdcScreenItemDetailResultDTO> itemDetail(EpdcScreenItemDetailFormDTO formDto) {
+        // 获取项目信息、网格员信息
+        EpdcScreenItemDetailResultDTO data = baseDao.itemDetailAndGridMan(formDto);
+        // 获取处理进展
+        List<EpdcScreenItemHandleProgressResultDTO> list = baseDao.screenItemHandleProgress(data.getId());
+        data.setHandleProgress(list);
+        return new Result<EpdcScreenItemDetailResultDTO>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenIssueProgressResultDTO>> issueProgress(EpdcScreenIssueProgressFormDTO formDto) {
+        // 获取议题ID
+        EpdcScreenItemInfoResultDTO item = baseDao.selectItemInfo(formDto);
+        List<EpdcScreenIssueProgressResultDTO> data = baseDao.issueProgress(item.getIssueId());
+
+        return new Result<List<EpdcScreenIssueProgressResultDTO>>().ok(data);
+    }
 
 }
diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
index 8d08c92..842e9de 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
@@ -182,6 +182,8 @@
         SELECT
             ot.ID,
             ot.TYPE_NAME,
+            ot.TYPE_CODE,
+            ot.IMG_URL,
             COUNT( po.ID ) AS partyOrgNum
         FROM
             esua_epdc_admin.epdc_party_org_type ot
@@ -198,17 +200,22 @@
 
     <select id="partyOrgList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingPartyOrgResultDTO">
         SELECT
-            ID,
-            PARTY_ORG_NAME,
-            INTRODUCTION,
-            TWO_COMMITTEES,
-            PARTY_MEMBER_NUM,
-            LONGITUDE,
-            LATITUDE
+            po.ID,
+            po.PARTY_ORG_NAME,
+            po.INTRODUCTION,
+            po.TWO_COMMITTEES,
+            po.PARTY_MEMBER_NUM,
+            po.LONGITUDE,
+            po.LATITUDE,
+            po.TYPE_CODE,
+            pot.IMG_URL
         FROM
-            esua_epdc_admin.epdc_party_org
+            esua_epdc_admin.epdc_party_org po
+            LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE
         WHERE
-            DEL_FLAG = '0'
+            po.DEL_FLAG = '0'
+        AND
+            pot.DEL_FLAG = '0'
     </select>
 
     <select id="brightIdentity" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyBuildingBrightIdentityResultDTO">
@@ -372,4 +379,117 @@
         WHERE DEL_FLAG = '0'
         AND STATISTIC_TYPE = #{statisticType}
     </select>
+
+    <select id="itemDetailAndGridMan" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemDetailResultDTO">
+        SELECT
+            i.ID,
+            i.ITEM_CONTENT,
+            i.GRID,
+            (SELECT
+                 GROUP_CONCAT(r.STAFF_NAME)
+             FROM
+                 esua_epdc_admin.sys_user u
+                     LEFT JOIN esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0'
+             WHERE
+                 u.del_flag = 0
+               AND u.dept_id = i.GRID_ID
+             ORDER BY r.CREATED_TIME) AS gridMan
+        FROM
+            esua_epdc_events.epdc_item i
+        WHERE
+            i.DEL_FLAG = '0'
+        <if test="idFlag == 0">
+            AND i.ID = #{id}
+        </if>
+        <if test="idFlag == 1">
+            AND i.EVENT_ID = #{id}
+        </if>
+    </select>
+
+    <resultMap id="itemHandleMap" type="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemHandleProgressResultDTO">
+        <result property="id" column="ID"/>
+        <result property="createdTime" column="createdTime"/>
+        <result property="advice" column="advice"/>
+        <result property="handlerDept" column="handlerDept"/>
+        <result property="state" column="STATE"/>
+        <collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemDeptDTO">
+            <result property="deptName" column="DEPT_NAME"/>
+        </collection>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="screenItemHandleProgress" resultMap="itemHandleMap">
+        SELECT
+            hp.ID,
+            hp.CREATED_TIME AS createdTime,
+            hp.OUT_HANDLE_ADVICE AS advice,
+            hp.HANDLER_DEPT AS handlerDept,
+            hp.STATE,
+            itemDept.DEPT_NAME,
+            img.IMG_URL
+        FROM
+            esua_epdc_events.epdc_item_handle_process hp
+                LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID
+                LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID
+                AND IMG_TYPE = 'itemHandle'
+                AND img.DEL_FLAG = '0'
+        WHERE
+            hp.DEL_FLAG = '0'
+          AND hp.ITEM_ID = #{id} UNION ALL
+        SELECT
+            item.ID,
+            item.EVALUATION_TIME AS createdTime,
+            item.EVALUATION_CONTENT AS advice,
+            item.NICK_NAME AS handlerDept,
+            CASE
+                item.EVALUATION_SCORE
+                WHEN 0 THEN
+                    11
+                WHEN 1 THEN
+                    12 ELSE 13
+                END AS STATE,
+            NULL AS DEPT_NAME,
+            NULL AS IMG_URL
+        FROM
+            esua_epdc_events.epdc_item item
+        WHERE
+            item.DEL_FLAG = '0'
+          AND item.ID = #{id}
+          AND item.EVALUATION_SCORE IS NOT NULL
+        ORDER BY
+            createdTime DESC
+    </select>
+
+    <select id="selectItemInfo" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemInfoResultDTO">
+        SELECT ID, ISSUE_ID, EVENT_ID FROM esua_epdc_events.epdc_item WHERE DEL_FLAG = '0'
+        <if test="idFlag == 0">
+            AND ID = #{id}
+        </if>
+        <if test="idFlag == 1">
+            AND EVENT_ID = #{id}
+        </if>
+    </select>
+
+    <select id="issueProgress" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueProgressResultDTO">
+        SELECT
+            hd.ID,
+            hd.STATE,
+            hd.CREATED_TIME,
+            hd.ADVICE,
+            hd.HANDLER_DEPT,
+            hd.MOBILE,
+            hd.GROUP_NAME,
+            img.IMG_URL
+        FROM
+            esua_epdc_events.epdc_issue_handle hd
+                LEFT JOIN esua_epdc_events.epdc_img img ON hd.ID = img.REFERENCE_ID
+                AND img.DEL_FLAG = '0'
+                AND img.IMG_TYPE = 'issueHandle'
+        WHERE
+            hd.DEL_FLAG = '0'
+          AND hd.ISSUE_ID = #{issueId}
+        ORDER BY
+            hd.CREATED_TIME DESC
+    </select>
 </mapper>
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index c660ca3..7495db0 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit c660ca360356218f48dbdb987f4fba70f7642435
+Subproject commit 7495db02282ff4f08b1135658c54c20b573ef79f