三个街道项目closed按结案算

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

@@ -206,4 +206,5 @@ public class ScreenProjectDataDTO implements Serializable {
 	private String orgIdPath;
 
 	private String finishOrgType;
+	private Date processTime;
 }

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

@@ -18,4 +18,8 @@ public interface PingYinConstant {
 
     String TEST_PING_YIN_CUSTOMER_ID = "78e2b2227c07de1fe54da14e2b2d9eb6";
     String PROD_PING_YIN_CUSTOMER_ID = "6f203e30de1a65aab7e69c058826cd80";
+
+    String KC = "2fe0065f70ca0e23ce4c26fca5f1d933";
+    String YS = "46c55cb862d6d5e6d05d2ab61a1cc07e";
+    String JS = "44876154d10d7cb7affd92000f84f833";
 }

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.OrgTypeConstant;
+import com.epmet.constant.PingYinConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
@@ -319,12 +320,16 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setHappenPlace(project.getProjectAddress());
 		dto.setEventDescription(project.getProjectContent());
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
-		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
+		dto.setStatus(getProjectStatus(project.getProjectStatusCode()));
+		dto.setCompleteTime(project.getCloseCaseTime());
+
+		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode()) ||
+				ProjectConstant.CLOSED.equals(project.getProjectStatusCode())) {
 			//办结组织是机关时，办结层级为机关的层级
 			if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) {
 				dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT);
 				//如果是孔村的项目办结层级需要降一级
-				if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
+				if(PingYinConstant.KC.equals(project.getCustomerId())) {
 					if (StringUtils.isNotBlank(project.getFinishOrgLevel())) {
 						switch (project.getFinishOrgLevel()) {
 							case OrgTypeConstant.DISTRICT:
@@ -355,9 +360,12 @@ public class DataReportingServiceImpl implements DataReportingService {
 				//办结组织是网格时，办结层级为网格
 				dto.setCompleteLevel("5");
 			}
+			if (ProjectConstant.CLOSED.equals(project.getProjectStatusCode()) &&(PingYinConstant.KC.equals(project.getCustomerId()) ||
+					PingYinConstant.YS.equals(project.getCustomerId()) || PingYinConstant.JS.equals(project.getCustomerId()))) {
+				dto.setCompleteTime(project.getProcessTime());
+			}
 		}
-		dto.setStatus(getProjectStatus(project.getProjectStatusCode()));
+
-		dto.setCompleteTime(project.getCloseCaseTime());
 		dto.setLat(project.getLatitude());
 		dto.setLng(project.getLongitude());
 		dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED);

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

@@ -300,7 +300,8 @@
             b.HANDLER_ID AS finishOrg,
             b.HANDLER_TYPE AS finishOrgType,
             b.ORG_ID_PATH AS orgIdPath,
-            c.`LEVEL` AS finishOrgLevel
+            c.`LEVEL` AS finishOrgLevel,
+            b.PROCESS_TIME
         FROM
             screen_project_data a
             LEFT JOIN (
@@ -309,12 +310,13 @@
                 PROJECT_ID,
                 HANDLER_ID,
                 HANDLER_TYPE,
-                ORG_ID_PATH
+                ORG_ID_PATH,
+				PROCESS_TIME
             FROM
                 screen_project_process spp
             WHERE
                 (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'closed_case')
+                AND (OPERATION = 'closed_case' OR OPERATION = 'close'))
                 OR
                 (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
                 AND OPERATION = 'close')