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/service/impl/MdcShiftServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
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..b2a49d6 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,13 @@
@Override
public Boolean addShift(MdcShift mdcShift) {
//鐘舵�侀粯璁や负鍚敤
- if (StringUtils.isEmpty(mdcShift.getShiftStatus())){
+ if (StringUtils.isEmpty(mdcShift.getShiftStatus())) {
mdcShift.setShiftStatus("1");
}
+ mdcShift.setDefaultShift("false");
List<MdcShift> mdcShifts = listMdcName(mdcShift);
//鏌ヨ鏈夐噸澶嶆暟鎹繑鍥瀎alse
- if (null != mdcShifts && !mdcShifts.isEmpty()){
+ if (null != mdcShifts && !mdcShifts.isEmpty()) {
return false;
}
return this.save(mdcShift);
@@ -82,8 +82,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 +103,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