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("设置失败！"); } } lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
@@ -50,7 +50,7 @@ /** * 班次表(次表)-新增 * @param mdcShiftSub * @param jsonbject * @return */ @AutoLog(value = "班次表(次表)-新增") 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); } 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是否不为空,不为空则将shiftName添加到模糊查询中 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); //查询有重复数据返回false 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; } }
