From af8b0ddeeb5fc71f5099e6be44dc9d3064a3b243 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 29 八月 2024 16:49:59 +0800
Subject: [PATCH] 优化查询全部工站(id以string格式传给前端)
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
index 32367ed..20ccf5f 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
@@ -1,11 +1,13 @@
package com.dy.pmsProduct.schedule;
+import cn.hutool.json.JSONObject;
import com.alibaba.excel.EasyExcel;
import com.dy.common.aop.SsoPowerAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
+import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoPr.PrSchedule;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
@@ -19,7 +21,6 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* 鎺掔彮
@@ -73,9 +74,9 @@
@PostMapping(path="selectPlan")
@SsoPowerAop(power = "-1")
@Log("鏌ヨ浠诲姟璁″垝鍒楄〃")
- public BaseResponse<List<Map<String,Object>>> selectPlan(@RequestBody QueryVo vo){
- List<Map<String,Object>> list = sv.selectPlan(vo) ;
- return BaseResponseUtils.buildSuccess(list);
+ public BaseResponse<List<JSONObject>> selectPlan(@RequestBody QueryVo vo){
+ List<JSONObject> array = sv.selectPlan(vo) ;
+ return BaseResponseUtils.buildSuccess(array);
}
/**
* 鏍规嵁ID鏌ヨ
@@ -101,6 +102,17 @@
QueryResultVo<List<PrSchedule>> list = sv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(list);
}
+ /**
+ * 鏍规嵁ID鏌ヨ
+ * @return
+ */
+ @GetMapping(path="getUserList")
+ @SsoPowerAop(power = "-1")
+ @Log("鏌ヨ绯荤粺涓搷浣滀汉鍛樹俊鎭�")
+ public BaseResponse<List<BaUser>> getUserList(){
+ List<BaUser> userList = sv.selectById();
+ return BaseResponseUtils.buildSuccess(userList);
+ }
@PostMapping(path="export")
--
Gitblit v1.8.0