From 800036680fd0b88c1afdd47619e930a39db53d02 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 23 Apr 2025 16:57:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BA=BF=E4=B8=8A=E6=96=87=E4=BB=B6=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E8=B7=AF=E5=BE=84=202.=E5=BB=B6=E5=90=8E7=E5=A4=A9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=203.=E5=8F=AF=E9=89=B4=E5=88=AB,=E4=BB=85?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=AA=8C=E6=94=B6=E5=AE=8C=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UploadController.java | 3 ++- src/main/resources/mapper/FxfxdxMapper.xml | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/hxjt/dataupload/controller/UploadController.java b/src/main/java/com/hxjt/dataupload/controller/UploadController.java index 75660e4..2fe1027 100644 --- a/src/main/java/com/hxjt/dataupload/controller/UploadController.java +++ b/src/main/java/com/hxjt/dataupload/controller/UploadController.java @@ -120,7 +120,8 @@ private ZypSingleQueryMapper zypSingleQueryMapper; @RequestParam("ticketNumber") String ticketNumber, @RequestParam("zypTypeId") String zypTypeId) { //上线 - String uploadDir = "F://dataUpload/zypPdfs/"; + String uploadDir = "/www/wwwroot/liwenxuan/data-upload/zypPdfs/"; + //String uploadDir = "F://dataUpload/zypPdfs/"; // 1. 验证文件类型和大小 if (file.isEmpty()) { return ResponseEntity.badRequest().body("文件不能为空"); diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index ca33fb3..2f3e0c1 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -706,10 +706,12 @@ a.isdelete = 'N' and d.showflag = '1' and c.id in('e3dbc4258dae4f21961dbb0e83701929','626e96e90760406a98c20f2f1f9d014f') + and OTM_OPERATICK.FSTATECODE='End' + - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -804,10 +806,11 @@ --and a.APPLYTIME >= '2025-01-01 00:00:00.000' and c.id in('4babbbd0f1714289bd0b70222998834c', 'c72815d306314dca864414c7ea4a80c7') --AND OTBILLID='DH20250213197' + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -930,10 +933,11 @@ --and a.APPLYTIME >= '2024-01-01 00:00:00.000' and c.id in('457abb402d9b42ad8b8fd601d24fcece', '7314a6809e66452e9e5e51dfab9a2b3d') --AND OTBILLID='DH20250213197' + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -1033,10 +1037,11 @@ and d.showflag = '1' --and a.APPLYTIME >= '2025-01-01 00:00:00.000' and c.id in('0dc5370dda5248e69db924de402b6639', 'e05c6ca6921f4900af3d6d85cdd9337c') + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -1144,10 +1149,11 @@ and d.showflag = '1' --and a.APPLYTIME >= '2024-01-01 00:00:00.000' and c.id in('e7671c99bca845e49aad9baab1084331', '2ce56e004e114f5a9c4b010392780abe') + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -1247,10 +1253,11 @@ where a.isdelete = 'N' and d.showflag = '1' + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -1340,10 +1347,11 @@ where a.isdelete = 'N' and d.showflag = '1' + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0) @@ -1435,10 +1443,11 @@ where a.isdelete = 'N' and d.showflag = '1' + and OTM_OPERATICK.FSTATECODE='End' - AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0) + AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)