From 02b47c39f633ea95d6a0ded6f62e54e1a7b69ecf Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 28 七月 2023 10:31:29 +0800
Subject: [PATCH] 班制班次下拉框接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java | 16 ++++++++++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java | 10 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java | 15 +++++++++++++++
4 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
index 31a4e8a..c41f551 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
@@ -112,7 +112,7 @@
*/
@AutoLog("鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」", notes = "鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」")
- @GetMapping("/deleteShift")
+ @GetMapping("/initShiftList")
public Result<List<Map<String, String>>> initShiftList() {
List<Map<String, String>> result = mdcShiftService.initShiftList();
return Result.OK(result);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
index b95a017..ab3474e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 鐝琛�(娆¤〃)
@@ -104,4 +106,17 @@
public Result<?> deleteMdcShiftSub(@RequestParam String id){
return mdcShiftSubService.deleteMdcShiftSub(id);
}
+
+ /**
+ * 鐝琛�(娆¤〃)-鏍规嵁id鍒犻櫎
+ * @param shiftId
+ * @return
+ */
+ @AutoLog(value = "鐝琛�(娆¤〃)-鏍规嵁鐝埗id鑾峰彇鐝涓嬫媺鍒楄〃")
+ @ApiOperation(value = "鐝琛�(娆¤〃)-鏍规嵁鐝埗id鑾峰彇鐝涓嬫媺鍒楄〃", notes = "鐝琛�(娆¤〃)-鏍规嵁鐝埗id鑾峰彇鐝涓嬫媺鍒楄〃")
+ @DeleteMapping("/initShiftSubList")
+ public Result<?> initShiftSubList(@RequestParam(name = "shiftId", required = true) String shiftId) {
+ List<Map<String, String>> result = mdcShiftSubService.initShiftSubList(shiftId);
+ return Result.OK(result);
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
index 49a37b1..4e56a58 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftSubService.java
@@ -8,6 +8,9 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.mdc.entity.MdcShiftSub;
+import java.util.List;
+import java.util.Map;
+
/**
* @Description: 鐝琛�(娆¤〃)
* @Author: Sake
@@ -58,4 +61,11 @@
* @return
*/
Result deleteMdcShiftSub(String id);
+
+ /**
+ * 鏍规嵁鐝埗id鑾峰彇鐝涓嬫媺鍒楄〃
+ * @param shiftId
+ * @return
+ */
+ List<Map<String, String>> initShiftSubList(String shiftId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
index ba7f3a4..c31db04 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
@@ -21,8 +21,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* @Description: 鐝琛�(娆¤〃)
@@ -95,5 +94,18 @@
return Result.error("褰撳墠鏃ユ湡宸茶璁惧鏃ュ巻寮曠敤鏃犳硶鍒犻櫎");
}
+ @Override
+ public List<Map<String, String>> initShiftSubList(String shiftId) {
+ List<MdcShiftSub> mdcShiftSubs = this.baseMapper.selectList(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getShiftSubStatus, "1").eq(MdcShiftSub::getShiftId, shiftId));
+ List<Map<String, String>> result = new ArrayList<>();
+ for (MdcShiftSub mdcShiftSub : mdcShiftSubs) {
+ Map<String, String> map = new HashMap<>();
+ map.put("label", mdcShiftSub.getShiftSubName());
+ map.put("value", mdcShiftSub.getId());
+ result.add(map);
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.3