事件上报修改

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java

@@ -14,11 +14,20 @@ import java.util.Date;
 @Data
 public class EventInfoResultDTO implements Serializable {
     private static final long serialVersionUID = -6483163020737762044L;
+    /**
+     * 主键
+     */
+    private String id;
+
     /**
      * 客户Id
      */
     private String customerId;
 
+    private Integer detpId;
+
+    private String reporterId;
+
     /**
      * 网格编码
      */
@@ -70,7 +79,15 @@ public class EventInfoResultDTO implements Serializable {
     private String successfulOrNo;
 
     /**
-     * 办结层级01省、自治区、直辖市02地、市、州、盟03县、市、区、旗04乡镇、街道05片区06村、社区07网格
+     * 办结层级
+     01省、自治区、直辖市
+     02地、市、州、盟
+     03县、市、区、旗
+     04乡镇、街道
+     05片区
+     06村、社区
+     07网格
+
      */
     private String completeLevel;
 
@@ -140,4 +157,34 @@ public class EventInfoResultDTO implements Serializable {
      * 重点人员现状
      */
     private String keypeopleStatus;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    private Long delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.extract.form.BizDataFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -340,5 +341,5 @@ public interface DataStatisticalOpenFeignClient {
      * @Date 2021/10/15 16:50
      */
     @PostMapping("/data/stats/datareporting/eventinfo")
-    Result<List<BaseDisputeProcessDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
+    Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.extract.form.BizDataFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -20,7 +21,6 @@ import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 
@@ -326,12 +326,12 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      *
      * @param formDTO
      * @Param formDTO
-     * @Return {@link Result<List< BaseDisputeProcessDTO >>}
+     * @Return {@link Result<List< EventInfoResultDTO >>}
      * @Author zhaoqifeng
      * @Date 2021/10/15 16:50
      */
     @Override
-    public Result<List<BaseDisputeProcessDTO>> getEventInfo(EventInfoFormDTO formDTO) {
+    public Result<List<EventInfoResultDTO>> getEventInfo(EventInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO);
     }
 }

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

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
@@ -98,8 +99,8 @@ public class DataReportingController {
 	 * @Date 2021/10/15 14:09
 	 */
 	@PostMapping("eventinfo")
-	public Result<List<BaseDisputeProcessDTO>> getEventInfo(@RequestBody(required = false) EventInfoFormDTO formDTO) {
-		return new Result<List<BaseDisputeProcessDTO>>().ok(dataReportingService.getEventInfo(formDTO));
+	public Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody(required = false) EventInfoFormDTO formDTO) {
+		return new Result<List<EventInfoResultDTO>>().ok(dataReportingService.getEventInfo(formDTO));
 	}
 
 }

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

@@ -8,7 +8,6 @@ import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 
@@ -68,6 +67,6 @@ public interface DataReportingService {
 	  * @Author zhaoqifeng
 	  * @Date 2021/10/15 14:10
 	  */
-	List<BaseDisputeProcessDTO> getEventInfo(EventInfoFormDTO formDTO);
+	List<EventInfoResultDTO> getEventInfo(EventInfoFormDTO formDTO);
 
 }

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.utils.DateUtils;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.ScreenCustomerGridDTO;
@@ -16,7 +17,6 @@ import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.service.DataReportingService;
@@ -140,13 +140,13 @@ public class DataReportingServiceImpl implements DataReportingService {
 	 *
 	 * @param formDTO
 	 * @Param formDTO
-	 * @Return {@link List<BaseDisputeProcessDTO>}
+	 * @Return {@link List<EventInfoResultDTO>}
 	 * @Author zhaoqifeng
 	 * @Date 2021/10/15 14:10
 	 */
 	@Override
-	public List<BaseDisputeProcessDTO> getEventInfo(EventInfoFormDTO formDTO) {
-		List<BaseDisputeProcessDTO> list;
+	public List<EventInfoResultDTO> getEventInfo(EventInfoFormDTO formDTO) {
+		List<EventInfoResultDTO> list;
 		//根据入参，获取项目
 		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
 		//项目列表为空，返回空数组
@@ -156,7 +156,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		//项目ID不为空时，因为只有一条，可以直接处理
 		if (StringUtils.isNotEmpty(formDTO.getProjectId())) {
 			list = projectList.stream().map(project -> {
-				BaseDisputeProcessDTO dto = getBaseDisputeProcessDTO(project);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId());
 					dto.setOrgCode(agency.getCode());
@@ -173,7 +173,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 			Map<String, ScreenCustomerAgencyEntity> agencyMap = screenCustomerAgencyService.getAgencyList(formDTO.getCustomerId());
 			Map<String, ScreenCustomerGridDTO> gridMap = screenCustomerGridService.getGridList(formDTO.getCustomerId());
 			list = projectList.stream().map(project -> {
-				BaseDisputeProcessDTO dto = getBaseDisputeProcessDTO(project);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = agencyMap.get(project.getOrgId());
 					dto.setOrgCode(agency.getCode());
@@ -189,8 +189,8 @@ public class DataReportingServiceImpl implements DataReportingService {
 		return list.stream().filter(item -> StringUtils.isNotBlank(item.getEventCategory())).collect(Collectors.toList());
 	}
 
-	private BaseDisputeProcessDTO getBaseDisputeProcessDTO(ScreenProjectDataDTO project) {
-		BaseDisputeProcessDTO dto = new BaseDisputeProcessDTO();
+	private EventInfoResultDTO getEventInfoResultDTO(ScreenProjectDataDTO project) {
+		EventInfoResultDTO dto = new EventInfoResultDTO();
 		dto.setId(project.getProjectId());
 		dto.setCustomerId(project.getCustomerId());
 		dto.setEventName(project.getProjectTitle());

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.24__add_categoryOriginCustomerId.sql

@@ -1 +1,3 @@
 alter table `epmet_evaluation_index`.screen_project_category_org_daily add COLUMN  `CATEGORY_ORIGIN_CUSTOMER_ID` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '分类来源客户ID' AFTER CUSTOMER_ID;
+ALTER TABLE `epmet_evaluation_index`.`screen_project_data`
+    ADD COLUMN `PROJECT_CREATOR` varchar(64) NULL COMMENT '项目创建人' AFTER `SATISFACTION_SCORE`;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -24,9 +24,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.BaseDisputeProcessDao;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.entity.BaseDisputeProcessEntity;
 import com.epmet.opendata.service.BaseDisputeProcessService;
 import com.epmet.opendata.service.ExDeptService;
@@ -61,12 +61,12 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
      */
     @Override
     public void getEventinfo(EventInfoFormDTO formDTO) {
-        Result<List<BaseDisputeProcessDTO>> result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
+        Result<List<EventInfoResultDTO>> result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
         Map<String, Integer> deptMap = exDeptService.getDeptMap();
-        List<BaseDisputeProcessDTO> list = result.getData();
+        List<EventInfoResultDTO> list = result.getData();
         if (CollectionUtils.isNotEmpty(list)) {
             List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
             entityList.forEach(item -> {