1.线上文件保存路径

2.延后7天上传
3.可鉴别,仅上传验收完成的作业票

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("文件不能为空");

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'
+
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -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'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -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'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -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'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -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'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -1247,10 +1253,11 @@
 		where
 			a.isdelete = 'N'
 			and d.showflag = '1'
+		and OTM_OPERATICK.FSTATECODE='End'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -1340,10 +1347,11 @@
 		where
 			a.isdelete = 'N'
 			and d.showflag = '1'
+		and OTM_OPERATICK.FSTATECODE='End'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>
 
@@ -1435,10 +1443,11 @@
 		where
 			a.isdelete = 'N'
 			and d.showflag = '1'
+		and OTM_OPERATICK.FSTATECODE='End'
 			<choose>
 				<when test='isSingleDay == "Y"'>
 
-					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 1) = 0)
+					AND (DATEDIFF(dd, a.APPLYTIME, GETDATE() - 7) = 0)
 				</when>
 				<otherwise>