From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index 82403aa..a7713db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -2,9 +2,10 @@
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.*;
-import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
-import com.doumee.core.tms.model.response.TmsBasePageResponse;
-import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
+import com.doumee.dao.web.reqeust.CarsJobAndContractByJobIdDTO;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.response.TmsBasePageResponse;
+import com.doumee.service.business.third.model.response.TmsOrderNoFinishListResponse;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
@@ -74,7 +75,7 @@
List<AlarmEventDataVO> fightingAdminAlertList();
- AlarmDataVO alarmDataSumByCate();
+ AlarmDataVO alarmDataSumByCate(Integer type);
List<AlarmDataVO> fightingAlarmHandleData();
@@ -85,6 +86,7 @@
PlatformJobRunBoardNewVO platformJobCenterData();
CarsJobAndContractVO getCarsJobDetails(CarsJobAndContractDTO param);
+ CarsJobAndContractVO getJobDetailsById(CarsJobAndContractByJobIdDTO param);
List<TransportMeasureVO> transportMeasure(Integer queryType);
@@ -107,6 +109,7 @@
TotalOutQtyNumVO totalOutQtyNum(int queryType,String factoryId);
WholeProvinceBoardVO centerProvinceData(String factoryId);
+ WholeProvinceBoardVO centerProvinceDataNew(String factoryCode);
List<LastSevenDaysOrderVo> arriveGoodsList(String factoryid);
--
Gitblit v1.9.3