Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -32,7 +32,7 @@ public class ScreenProjectController {
      * @date 2020/8/19 4:36 下午
      */
     @ExternalAppRequestAuth
-    @PostMapping("deatil")
+    @PostMapping("detail")
     public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){
         ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class);
         return new Result<ProjectDetailResultDTO>().ok(screenProjectService.projectDetail(projectDetailFormDTO));

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -21,5 +21,7 @@
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
+            ORDER BY data_end_time DESC
+            LIMIT 1
     </select>
 </mapper>