From 36d702002699a2cc06200ad6fa781deab33f343a Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 21 七月 2023 14:08:56 +0800
Subject: [PATCH] 默认班制功能修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java | 33 ++++++++++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java | 29 ++++++++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftService.java | 14 +++++++
4 files changed, 64 insertions(+), 14 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..bea1b7c 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);
}
@@ -112,4 +117,18 @@
List<Map<String, String>> result = mdcShiftService.initShiftList();
return Result.OK(result);
}
+
+ /**
+ * 璁剧疆榛樿鐝埗
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog("鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
+ @ApiOperation(value = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗", notes = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
+ @GetMapping("/changeDefaultShift")
+ public Result<?> changeDefaultShift(@RequestParam(name = "id", required = true) String id) {
+ boolean result = mdcShiftService.changeDefaultShift(id);
+ return result ? Result.OK("璁剧疆鎴愬姛锛�") : Result.error("璁剧疆澶辫触锛�");
+ }
}
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 f2871ac..b95a017 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
@@ -50,7 +50,7 @@
/**
* 鐝琛�(娆¤〃)-鏂板
- * @param mdcShiftSub
+ * @param jsonbject
* @return
*/
@AutoLog(value = "鐝琛�(娆¤〃)-鏂板")
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftService.java
index f5eb849..c8200b0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcShiftService.java
@@ -22,6 +22,7 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param page
* @param mdcShift
* @return
@@ -30,6 +31,7 @@
/**
* 鏂板鐝埗
+ *
* @param mdcShift
* @return
*/
@@ -37,6 +39,7 @@
/**
* 鏂板鏃舵煡璇㈡槸鍚︽湁閲嶅鏁版嵁
+ *
* @param mdcShift
* @return
*/
@@ -44,6 +47,7 @@
/**
* 淇敼
+ *
* @param mdcShift
* @return
*/
@@ -51,6 +55,7 @@
/**
* 鏍规嵁id淇敼鐘舵��
+ *
* @param jsonObject
* @return
*/
@@ -58,6 +63,7 @@
/**
* 鍒犻櫎
+ *
* @param id
* @return
*/
@@ -65,8 +71,16 @@
/**
* 鍔犺浇鐝埗涓嬫媺閫夐」
+ *
* @return
*/
List<Map<String, String>> initShiftList();
+ /**
+ * 璁剧疆榛樿鐝埗
+ *
+ * @param id
+ * @return
+ */
+ boolean changeDefaultShift(String id);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
index a0ee2f6..50d84c6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
@@ -12,7 +12,9 @@
import org.jeecg.modules.mdc.mapper.MdcShiftMapper;
import org.jeecg.modules.mdc.service.IMdcShiftService;
import org.jeecg.modules.mdc.service.IMdcShiftSubService;
+import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -32,14 +34,11 @@
@Resource
private IMdcShiftSubService mdcShiftSubService;
- @Resource
- private MdcShiftMapper mdcShiftMapper;
-
@Override
public IPage<MdcShift> queryPageList(Page page, MdcShift mdcShift) {
LambdaQueryWrapper<MdcShift> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//鍒ゆ柇鍓嶇杩斿洖鐨勫�间腑shiftName鏄惁涓嶄负绌�,涓嶄负绌哄垯灏唖hiftName娣诲姞鍒版ā绯婃煡璇腑
- if(StringUtils.isNotBlank(mdcShift.getShiftName())){
+ if (StringUtils.isNotBlank(mdcShift.getShiftName())) {
lambdaQueryWrapper.like(MdcShift::getShiftName, mdcShift.getShiftName());
}
return this.page(page, lambdaQueryWrapper);
@@ -48,12 +47,12 @@
@Override
public Boolean addShift(MdcShift mdcShift) {
//鐘舵�侀粯璁や负鍚敤
- if (StringUtils.isEmpty(mdcShift.getShiftStatus())){
+ if (StringUtils.isEmpty(mdcShift.getShiftStatus())) {
mdcShift.setShiftStatus("1");
}
List<MdcShift> mdcShifts = listMdcName(mdcShift);
//鏌ヨ鏈夐噸澶嶆暟鎹繑鍥瀎alse
- if (null != mdcShifts && !mdcShifts.isEmpty()){
+ if (null != mdcShifts && !mdcShifts.isEmpty()) {
return false;
}
return this.save(mdcShift);
@@ -82,8 +81,8 @@
public Result<MdcShift> deleteShift(String id) {
//杩斿洖true鏈煡鍒版暟鎹�
Boolean flag = mdcShiftSubService.selectMdcShiftSub(id);
- if (flag){
- if (removeById(id)){
+ if (flag) {
+ if (removeById(id)) {
return Result.OK("鍒犻櫎鎴愬姛");
}
return Result.error("鏁版嵁搴撴棤璇ユ暟鎹�,鏃犳硶鍒犻櫎");
@@ -103,4 +102,22 @@
}
return result;
}
+
+ /**
+ * 璁剧疆榛樿鐝埗
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean changeDefaultShift(String id) {
+ MdcShift mdcShift = this.baseMapper.selectOne(new LambdaQueryWrapper<MdcShift>().eq(MdcShift::getDefaultShift, "true"));
+ mdcShift.setDefaultShift("false");
+ this.baseMapper.updateById(mdcShift);
+ MdcShift defaultShift = this.baseMapper.selectById(id);
+ defaultShift.setDefaultShift("true");
+ this.baseMapper.updateById(defaultShift);
+ return true;
+ }
}
--
Gitblit v1.9.3