办结组织和办结层级设定

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java

@@ -201,4 +201,7 @@ public class ScreenProjectDataDTO implements Serializable {
 
 	private String finishOrgLevel;
 
+	private String orgIdPath;
+
+	private String finishOrgType;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/OrgTypeConstant.java

@@ -46,4 +46,14 @@ public interface OrgTypeConstant {
      */
     String COMMUNITY = "community";
 
+    /**
+     * 省级
+     */
+    String PROVINCE = "province";
+
+    /**
+     * 市级
+     */
+    String CITY = "city";
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -82,4 +82,12 @@ public interface ProjectConstant {
      */
     String PROJECT_ORIGIN_AGENCY="agency";
     String PROJECT_ORIGIN_EVENT="resi_event";
+    /**
+     * 自办
+     */
+    String PROJECT_SELF_CLOSED="01";
+    /**
+     * 上报
+     */
+    String PROJECT_REPORT="02";
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java

@@ -66,4 +66,6 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
 	void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List<String> list);
 
 	int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
+
+    List<ScreenProjectDataDTO> selectProjectList(@Param("customerId") String customerId, @Param("projectId") String projectId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -292,13 +291,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     @Override
     public List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId, Integer pageNo, Integer pageSize) {
         PageHelper.startPage(pageNo, pageSize);
-        LambdaQueryWrapper<ScreenProjectDataEntity> wrapper = new LambdaQueryWrapper<>();
+        return baseDao.selectProjectList(customerId, projectId);
-        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenProjectDataEntity::getCustomerId, customerId);
-        wrapper.eq(StringUtils.isNotBlank(projectId), ScreenProjectDataEntity::getProjectId, projectId);
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, null);
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, "");
-        List<ScreenProjectDataEntity> list = baseDao.selectList(wrapper);
-        return ConvertUtils.sourceToTarget(list, ScreenProjectDataDTO.class);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -210,18 +210,61 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setReportTime(project.getProjectCreateTime());
 		dto.setHappenDate(DateUtils.parseDate(DateUtils.format(project.getProjectCreateTime()), DateUtils.DATE_PATTERN));
 		dto.setEventDescription(project.getProjectContent());
-		//TODO 办结方式
-		dto.setWaysOfResolving("01");
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
-		//TODO 办结层级
+		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
-		dto.setCompleteLevel("01");
+			dto.setWaysOfResolving(project.getOrgId().equals(project.getFinishOrg())?ProjectConstant.PROJECT_SELF_CLOSED:ProjectConstant.PROJECT_REPORT);
+			//办结组织是机关时，办结层级为机关的层级
+			if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) {
+				//如果是孔村的项目办结层级需要降一级
+				if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
+					switch (project.getFinishOrgLevel()) {
+						case OrgTypeConstant.DISTRICT:
+							dto.setCompleteLevel("04");
+							break;
+						case OrgTypeConstant.STREET:
+						case OrgTypeConstant.COMMUNITY:
+							dto.setCompleteLevel("06");
+							break;
+						default:
+							break;
+					}
+				} else {
+					dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel()));
+				}
+			} else if (OrgTypeConstant.DEPARTMENT.equals(project.getFinishOrgType())) {
+				//办结组织是部门时，办结层级为部门所在组织的曾经
+				String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON);
+				int size = orgIds.length;
+				ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(orgIds[size - 1]);
+				dto.setCompleteLevel(getCompleteLevel(agency.getLevel()));
+			} else {
+				//办结组织是网格时，办结层级为网格
+				dto.setCompleteLevel("07");
+			}
+		}
+
 		dto.setCompleteTime(project.getCloseCaseTime());
 		dto.setLat(project.getLatitude());
 		dto.setLng(project.getLongitude());
 		return dto;
 	}
 
-
+	private String getCompleteLevel(String level) {
+		switch (level) {
+			case OrgTypeConstant.PROVINCE:
+				return "01";
+			case OrgTypeConstant.CITY:
+				return "02";
+			case OrgTypeConstant.DISTRICT:
+				return "03";
+			case OrgTypeConstant.STREET:
+				return "04";
+			case OrgTypeConstant.COMMUNITY:
+				return "06";
+			default:
+				return null;
+		}
+	}
 
     @Override
     public List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO) {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -191,4 +191,82 @@
         update screen_project_data set SATISFACTION_SCORE=#{score}
         where PROJECT_ID=#{projectId}
     </update>
+
+
+    <select id="selectProjectList" resultType="com.epmet.dto.screen.ScreenProjectDataDTO">
+        SELECT
+            a.ID,
+            a.CUSTOMER_ID,
+            a.ORG_TYPE,
+            a.ORG_ID,
+            a.PARENT_ID,
+            a.ORG_NAME,
+            a.PROJECT_ID,
+            a.PROJECT_TITLE,
+            a.PROJECT_CREATE_TIME,
+            a.LINK_USER_ID,
+            a.LINK_NAME,
+            a.LINK_MOBILE,
+            a.PROJECT_CONTENT,
+            a.PROJECT_LEVEL,
+            a.PROJECT_ADDRESS,
+            a.ALL_CATEGORY_NAME,
+            a.LONGITUDE,
+            a.LATITUDE,
+            a.SATISFACTION_SCORE,
+            a.PROJECT_STATUS_CODE,
+            a.CLOSE_CASE_TIME,
+            a.DATA_END_TIME,
+            a.ALL_PARENT_IDS,
+            a.ORIGIN,
+            a.CATEGORY_CODE,
+            b.HANDLER_ID AS finishOrg,
+            b.HANDLER_TYPE AS finishOrgType,
+            b.ORG_ID_PATH AS orgIdPath,
+            c.`LEVEL` AS finishOrgLevel
+        FROM
+            screen_project_data a
+            LEFT JOIN (
+            SELECT
+                spp.CUSTOMER_ID,
+                PROJECT_ID,
+                HANDLER_ID,
+                HANDLER_TYPE,
+                ORG_ID_PATH
+            FROM
+                screen_project_process spp
+            WHERE
+                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'closed_case' UNION ALL
+            SELECT
+                spp.CUSTOMER_ID,
+                PROJECT_ID,
+                HANDLER_ID,
+                HANDLER_TYPE,
+                ORG_ID_PATH
+            FROM
+                screen_project_process spp
+            WHERE
+                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'close'
+            ) b ON a.PROJECT_ID = b.PROJECT_ID
+            <if test='null != customerId and "" != customerId'>
+                AND b.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != projectId and "" != projectId'>
+                AND b.PROJECT_ID = #{projectId}
+            </if>
+            LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
+            WHERE a.DEL_FLAG = '0'
+            AND a.CATEGORY_CODE IS NOT NULL
+            AND a.CATEGORY_CODE != ''
+            <if test='null != customerId and "" != customerId'>
+                AND a.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != projectId and "" != projectId'>
+                AND a.PROJECT_ID = #{projectId}
+            </if>
+        ORDER BY
+            a.CREATED_TIME ASC
+    </select>
 </mapper>