From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
index 2cd9eba..a1533a7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
@@ -1,5 +1,6 @@
package com.doumee.cloud.board;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelColumn;
@@ -17,6 +18,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -35,13 +37,13 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鍥尯鐗╂祦杩愯璋冨害鐪嬫澘")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunController extends BaseController {
- @ApiModelProperty
+ @Autowired
private PlatformJobJoinMapper platformJobJoinMapper;
@LoginNoRequired
@@ -63,7 +65,8 @@
data.setTodayOutRata(new BigDecimal(random.nextInt(100)));
data.setMonthOutRata(data.getTodayOutRata().multiply(new BigDecimal(30)));
-
+ data.setStockMax(new BigDecimal(random.nextInt(1000)));
+ data.setStockTotal(new BigDecimal(data.getStockMax().intValue()));
return ApiResponse.success(data);
}
@@ -85,16 +88,14 @@
}
for (String str:dayList) {
TransportMeasureVO data = new TransportMeasureVO();
- data.setPlanTimes(str);
+ data.setPlanDateStr(str);
+ data.setPlanTimes(random.nextInt(200));
data.setPlanTaskNum(new BigDecimal(random.nextInt(1000)));
data.setFinishTaskNum(new BigDecimal(data.getPlanTaskNum().intValue()));
list.add(data);
}
return ApiResponse.success(list);
}
-
-
-
@LoginNoRequired
--
Gitblit v1.9.3