From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 5c02507..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
@@ -35,6 +35,7 @@
/**
* 鐝埗琛�(涓昏〃)-鍒嗛〉鏌ヨ
+ *
* @param mdcShift
* @param pageNo
* @param pageSize
@@ -45,7 +46,7 @@
@GetMapping("/queryPageList")
public Result<?> queryPageList(MdcShift mdcShift,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page page = new Page(pageNo, pageSize);
IPage<MdcShift> mdcShiftIPage = mdcShiftService.queryPageList(page, mdcShift);
return Result.OK(mdcShiftIPage);
@@ -53,52 +54,56 @@
/**
* 鐝埗琛�(涓昏〃)-鏂板(鐝埗鍚嶉噸澶嶆牎楠�/鐘舵�侀粯璁や负鍚敤)
+ *
* @param mdcShift
* @return
*/
@AutoLog("鐝埗琛�(涓昏〃)-鏂板")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-鏂板(鐝埗鍚嶉噸澶嶆牎楠�/鐘舵�侀粯璁や负鍚敤)", notes = "鐝埗琛�(涓昏〃)-鏂板(鐝埗鍚嶉噸澶嶆牎楠�/鐘舵�侀粯璁や负鍚敤)")
@PostMapping("/addShift")
- public Result<?> addShift(@RequestBody MdcShift mdcShift){
+ public Result<?> addShift(@RequestBody MdcShift mdcShift) {
Boolean flag = mdcShiftService.addShift(mdcShift);
return flag ? Result.OK("鏂板鎴愬姛") : Result.error("鐝埗鍚嶉噸澶�");
}
/**
* 鐝埗琛�(涓昏〃)-淇敼
+ *
* @param mdcShift
* @return
*/
@AutoLog("鐝埗琛�(涓昏〃)-淇敼")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-淇敼", notes = "鐝埗琛�(涓昏〃)-淇敼")
@PutMapping("/editShift")
- public Result<?> editShift(@RequestBody MdcShift mdcShift){
+ public Result<?> editShift(@RequestBody MdcShift mdcShift) {
Boolean flag = mdcShiftService.editShift(mdcShift);
return flag ? Result.OK("淇敼鎴愬姛") : Result.error("鏁版嵁搴撴棤璇ユ暟鎹�");
}
/**
* 鏍规嵁id淇敼
+ *
* @param
* @return
*/
@AutoLog("鐝埗琛�(涓昏〃)-鏍规嵁id淇敼鐘舵��")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-鏍规嵁id淇敼鐘舵��", notes = "鐝埗琛�(涓昏〃)-鏍规嵁id淇敼鐘舵��")
@PutMapping("/changeStatus")
- public Result<?> changeStatus(@RequestBody JSONObject jsonObject){
+ public Result<?> changeStatus(@RequestBody JSONObject jsonObject) {
Boolean flag = mdcShiftService.changeStatus(jsonObject);
return flag ? Result.OK("淇敼鎴愬姛") : Result.error("鏁版嵁搴撴棤璇ユ暟鎹�");
}
/**
* 鐝埗琛�(涓昏〃)-鏍规嵁id鍒犻櫎
+ *
* @param id
* @return
*/
@AutoLog("鐝埗琛�(涓昏〃)-鏍规嵁id鍒犻櫎")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-鏍规嵁id鍒犻櫎", notes = "鐝埗琛�(涓昏〃)-鏍规嵁id鍒犻櫎")
@DeleteMapping("/deleteShift")
- public Result<?> deleteShift(@RequestParam(name = "id", required = true) String id){
+ public Result<?> deleteShift(@RequestParam(name = "id", required = true) String id) {
return mdcShiftService.deleteShift(id);
}
@@ -107,9 +112,23 @@
*/
@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);
}
+
+ /**
+ * 璁剧疆榛樿鐝埗
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog("鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
+ @ApiOperation(value = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗", notes = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
+ @PostMapping("/changeDefaultShift")
+ public Result<?> changeDefaultShift(@RequestParam(name = "id", required = true) String id) {
+ boolean result = mdcShiftService.changeDefaultShift(id);
+ return result ? Result.OK("璁剧疆鎴愬姛锛�") : Result.error("璁剧疆澶辫触锛�");
+ }
}
--
Gitblit v1.9.3