修复排班bug
This commit is contained in:
parent
e4c21c831b
commit
8c4748c9a3
@ -1,106 +0,0 @@
|
||||
package org.dromara.property.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.property.domain.vo.AttendanceScheduleMemberVo;
|
||||
import org.dromara.property.domain.bo.AttendanceScheduleMemberBo;
|
||||
import org.dromara.property.service.IAttendanceScheduleMemberService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 排班人员
|
||||
* 前端访问路由地址为:/Property/scheduleMember
|
||||
*
|
||||
* @author mocheng
|
||||
* @date 2025-07-15
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/scheduleMember")
|
||||
public class AttendanceScheduleMemberController extends BaseController {
|
||||
|
||||
private final IAttendanceScheduleMemberService attendanceScheduleMemberService;
|
||||
|
||||
/**
|
||||
* 查询排班人员列表
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<AttendanceScheduleMemberVo> list(AttendanceScheduleMemberBo bo, PageQuery pageQuery) {
|
||||
return attendanceScheduleMemberService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出排班人员列表
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:export")
|
||||
@Log(title = "排班人员", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(AttendanceScheduleMemberBo bo, HttpServletResponse response) {
|
||||
List<AttendanceScheduleMemberVo> list = attendanceScheduleMemberService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "排班人员", AttendanceScheduleMemberVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取排班人员详细信息
|
||||
*
|
||||
* @param id 主键
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<AttendanceScheduleMemberVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
return R.ok(attendanceScheduleMemberService.queryById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增排班人员
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:add")
|
||||
@Log(title = "排班人员", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody AttendanceScheduleMemberBo bo) {
|
||||
return toAjax(attendanceScheduleMemberService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改排班人员
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:edit")
|
||||
@Log(title = "排班人员", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AttendanceScheduleMemberBo bo) {
|
||||
return toAjax(attendanceScheduleMemberService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除排班人员
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("Property:scheduleMember:remove")
|
||||
@Log(title = "排班人员", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("ids") Long[] ids) {
|
||||
return toAjax(attendanceScheduleMemberService.deleteWithValidByIds(List.of(ids), true));
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package org.dromara.property.mapper;
|
||||
|
||||
import org.dromara.property.domain.AttendanceScheduleMember;
|
||||
import org.dromara.property.domain.vo.AttendanceScheduleMemberVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 排班人员Mapper接口
|
||||
*
|
||||
* @author mocheng
|
||||
* @date 2025-07-15
|
||||
*/
|
||||
public interface AttendanceScheduleMemberMapper extends BaseMapperPlus<AttendanceScheduleMember, AttendanceScheduleMemberVo> {
|
||||
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package org.dromara.property.service;
|
||||
|
||||
import org.dromara.property.domain.AttendanceScheduleMember;
|
||||
import org.dromara.property.domain.vo.AttendanceScheduleMemberVo;
|
||||
import org.dromara.property.domain.bo.AttendanceScheduleMemberBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 排班人员Service接口
|
||||
*
|
||||
* @author mocheng
|
||||
* @date 2025-07-15
|
||||
*/
|
||||
public interface IAttendanceScheduleMemberService {
|
||||
|
||||
/**
|
||||
* 查询排班人员
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 排班人员
|
||||
*/
|
||||
AttendanceScheduleMemberVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询排班人员列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 排班人员分页列表
|
||||
*/
|
||||
TableDataInfo<AttendanceScheduleMemberVo> queryPageList(AttendanceScheduleMemberBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的排班人员列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 排班人员列表
|
||||
*/
|
||||
List<AttendanceScheduleMemberVo> queryList(AttendanceScheduleMemberBo bo);
|
||||
|
||||
/**
|
||||
* 新增排班人员
|
||||
*
|
||||
* @param bo 排班人员
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(AttendanceScheduleMemberBo bo);
|
||||
|
||||
/**
|
||||
* 修改排班人员
|
||||
*
|
||||
* @param bo 排班人员
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(AttendanceScheduleMemberBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除排班人员信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -1,135 +0,0 @@
|
||||
package org.dromara.property.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.property.domain.bo.AttendanceScheduleMemberBo;
|
||||
import org.dromara.property.domain.vo.AttendanceScheduleMemberVo;
|
||||
import org.dromara.property.domain.AttendanceScheduleMember;
|
||||
import org.dromara.property.mapper.AttendanceScheduleMemberMapper;
|
||||
import org.dromara.property.service.IAttendanceScheduleMemberService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 排班人员Service业务层处理
|
||||
*
|
||||
* @author mocheng
|
||||
* @date 2025-07-15
|
||||
*/
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class AttendanceScheduleMemberServiceImpl implements IAttendanceScheduleMemberService {
|
||||
|
||||
private final AttendanceScheduleMemberMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询排班人员
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 排班人员
|
||||
*/
|
||||
@Override
|
||||
public AttendanceScheduleMemberVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询排班人员列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 排班人员分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<AttendanceScheduleMemberVo> queryPageList(AttendanceScheduleMemberBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<AttendanceScheduleMember> lqw = buildQueryWrapper(bo);
|
||||
Page<AttendanceScheduleMemberVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的排班人员列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 排班人员列表
|
||||
*/
|
||||
@Override
|
||||
public List<AttendanceScheduleMemberVo> queryList(AttendanceScheduleMemberBo bo) {
|
||||
LambdaQueryWrapper<AttendanceScheduleMember> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<AttendanceScheduleMember> buildQueryWrapper(AttendanceScheduleMemberBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<AttendanceScheduleMember> lqw = Wrappers.lambdaQuery();
|
||||
lqw.orderByAsc(AttendanceScheduleMember::getId);
|
||||
lqw.eq(bo.getScheduleId() != null, AttendanceScheduleMember::getScheduleId, bo.getScheduleId());
|
||||
lqw.eq(bo.getUserId() != null, AttendanceScheduleMember::getUserId, bo.getUserId());
|
||||
lqw.eq(bo.getDeptId() != null, AttendanceScheduleMember::getDeptId, bo.getDeptId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AttendanceScheduleMember::getDeptName, bo.getDeptName());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增排班人员
|
||||
*
|
||||
* @param bo 排班人员
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(AttendanceScheduleMemberBo bo) {
|
||||
AttendanceScheduleMember add = MapstructUtils.convert(bo, AttendanceScheduleMember.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改排班人员
|
||||
*
|
||||
* @param bo 排班人员
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(AttendanceScheduleMemberBo bo) {
|
||||
AttendanceScheduleMember update = MapstructUtils.convert(bo, AttendanceScheduleMember.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(AttendanceScheduleMember entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除排班人员信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user