抽取小组数据

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.project.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 项目最近进展结果DTO
+ * @ClassName ProjectLatestOperationResultDTO
+ * @Auth wangc
+ * @Date 2020-09-28 14:19
+ */
+@Data
+public class ProjectLatestOperationResultDTO implements Serializable {
+    private static final long serialVersionUID = 3295536551300176323L;
+
+    private String projectId;
+
+    private String operationName;
+}

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

@@ -36,6 +36,7 @@ import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollCommunityS
 import com.epmet.service.evaluationindex.extract.dataToIndex.IndexCollStreetService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectLogDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
+import com.epmet.service.evaluationindex.extract.todata.GroupExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.*;
 import com.epmet.service.stats.DimAgencyService;
@@ -106,6 +107,8 @@ public class DemoController {
     @Autowired
     private GovernRankDataExtractService governRankDataExtractService;
     @Autowired
+    private GroupExtractService groupExtractService;
+    @Autowired
     private OrgRankExtractService orgRankExtractService;
 
     @GetMapping("testAlarm")
@@ -708,5 +711,12 @@ public class DemoController {
         orgRankExtractService.extractStreetData(formDTO.getCustomerId(), formDTO.getDateId());
         return new Result();
     }
+    @PostMapping("extractgroup")
+    public Result extractGroup(@RequestBody ExtractOriginFormDTO param){
+
+        groupExtractService.extractGroupData(param);
+        return new Result();
+    }
+
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -128,12 +128,14 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         DifficultyIfExistedResultDTO existedMap = screenDifficultyDataService.selectExistedInfo(param.getCustomerId());
         //查询数据
         List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),existedMap.getClosedIds());
+
         if(existedMap.isIfExisted()){
             //查询全部项目的图片
 
         }else{
             //查询增量项目的图片
             List<String> newProjectIds = factOriginProjectMainDailyService.getNewProjectId(param.getCustomerId(),param.getDateId());
+
         }
     }
 }

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

@@ -44,11 +44,11 @@ public interface ScreenDifficultyDataService extends BaseService<ScreenDifficult
 
     /**
      * @Description 数据清洗
-     * @param difficulty
+     * @param difficulties
      * @return void
      * @author wangc
      * @date 2020.09.28 11:04
     */
-    void dataClean(List<ScreenDifficultyDataEntity> difficulty, List<ScreenDifficultyImgDataEntity> img);
+    void dataClean(List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs);
 
 }

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

@@ -53,7 +53,7 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
     }
 
     @Override
-    public void dataClean(List<ScreenDifficultyDataEntity> difficulty,List<ScreenDifficultyImgDataEntity> img) {
+    public void dataClean(List<ScreenDifficultyDataEntity> difficulties,List<ScreenDifficultyImgDataEntity> imgs) {
 
     }
 }

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

@@ -101,4 +101,6 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @return java.util.List<com.epmet.dto.project.FinishOrgDTO>
      */
     List<FinishOrgDTO> getFinishOrg(String customerId, String date);
+
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -188,4 +188,9 @@
                 GROUP BY PROJECT_ID
             ) b ON a.PROJECT_ID = b.PROJECT_ID
     </select>
+
+
+    <select id="selectLatestOperation" resultType="com.epmet.dto.project.result.ProjectLatestOperationResultDTO">
+
+    </select>
 </mapper>