From 6626ce3a11e9afcaa629c08159b640e0592b33d6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Aug 2020 14:38:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?screen=5Fpioneer=5Fdata=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2data=5Fend=5Ftime=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/screen/ScreenPioneerDataDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml index 58247ff1e3..5e509c8329 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml +++ b/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 \ No newline at end of file From 60a45cbc1ea8c8306f15a38861a36abcc7df654b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Aug 2020 16:17:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?detail=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datareport/controller/screen/ScreenProjectController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 2718fcca1e..8c508e5eda 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/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 projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){ ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class); return new Result().ok(screenProjectService.projectDetail(projectDetailFormDTO));