From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 49f08c6..4b4f355 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -3,7 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.web.reqeust.CarsJobAndContractByJobIdDTO;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.model.Platform;
@@ -23,7 +24,6 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -53,8 +53,6 @@
return ApiResponse.success(data);
}
-
-
@LoginNoRequired
@ApiOperation("杩愯緭浠诲姟鍒嗘瀽")
@GetMapping("/transportMeasure")
@@ -65,6 +63,7 @@
List<TransportMeasureVO> list = boardService.transportMeasure(queryType);
return ApiResponse.success(list);
}
+
@LoginNoRequired
@ApiOperation("姹借溅鐘舵�併�佺粡绾害闆嗗悎鏁版嵁")
@GetMapping("/carsList")
@@ -72,6 +71,7 @@
BoardCarsListVO data = boardService.platformJobCarsList();
return ApiResponse.success(data);
}
+
@LoginNoRequired
@ApiOperation("姹借溅鍛婅浜嬩欢闆嗗悎鏁版嵁")
@GetMapping("/carsEventList")
@@ -85,6 +85,13 @@
@PostMapping("/getCarsJobDetails")
public ApiResponse<CarsJobAndContractVO> getCarsJobDetails(@RequestBody CarsJobAndContractDTO param) {
CarsJobAndContractVO data = boardService.getCarsJobDetails(param);
+ return ApiResponse.success(data);
+ }
+ @LoginNoRequired
+ @ApiOperation("鏍规嵁浣滀笟缂栫爜鏌ヨ浣滀笟淇℃伅鍜屽悎鍚屼俊鎭泦鍚�")
+ @PostMapping("/getJobDetailsById")
+ public ApiResponse<CarsJobAndContractVO> getJobDetailsById(@RequestBody CarsJobAndContractByJobIdDTO param) {
+ CarsJobAndContractVO data = boardService.getJobDetailsById(param);
return ApiResponse.success(data);
}
@LoginNoRequired
@@ -113,7 +120,7 @@
// ,Constants.PlatformJobStatus.DONE.getKey()
)
.orderByDesc(PlatformJob::getSignNum)
- .last(" limit 20 ")
+// .last(" limit 20 ")
);
return ApiResponse.success(list);
}
--
Gitblit v1.9.3