From dd296baf6463522b0a534b2eb2bc920a3928cd54 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:27:26 +0800
Subject: [PATCH] 提交代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
index eb87d3f..4aa4a9e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
@@ -1,5 +1,7 @@
package com.ruoyi.web.controller.oa;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.DataDictClass;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -10,7 +12,9 @@
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.oa.domain.bo.BsSchoolBo;
import com.ruoyi.oa.domain.vo.BsSchoolVo;
import com.ruoyi.oa.service.IBsSchoolService;
@@ -56,14 +60,25 @@
}
/**
+ * 瀛︽牎涓嬫媺鍒楄〃
+ */
+ @ApiOperation("瀛︽牎涓嬫媺鍒楄〃")
+ @GetMapping("/select")
+ public AjaxResult selectList(BsSchoolBo bo) {
+ return AjaxResult.success(iBsSchoolService.list(new LambdaQueryWrapper<BsSchool>()
+ .ne(BsSchool::getCode, "0000")
+ .like(StringUtils.isNotBlank(bo.getName()), BsSchool::getName, bo.getName())));
+ }
+
+ /**
* 瀵煎嚭瀛︽牎鍒楄〃
*/
@ApiOperation("瀵煎嚭瀛︽牎鍒楄〃")
@PreAuthorize("@ss.hasPermi('oa:school:export')")
@Log(title = "瀛︽牎", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public void export(@Validated BsSchoolBo bo, HttpServletResponse response) {
- List<BsSchoolVo> list = iBsSchoolService.queryList(bo);
+ @PostMapping("/export")
+ public void export(BsSchoolBo bo, HttpServletResponse response) {
+ List<BsSchoolVo> list = iBsSchoolService.exportList(bo);
ExcelUtil.exportExcel(list, "瀛︽牎", BsSchoolVo.class, response);
}
@@ -74,8 +89,8 @@
@PreAuthorize("@ss.hasPermi('oa:school:query')")
@GetMapping("/{id}")
public AjaxResult<BsSchoolVo> getInfo(@ApiParam("涓婚敭")
- @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable("id") Long id) {
+ @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("id") Long id) {
return AjaxResult.success(iBsSchoolService.queryById(id));
}
@@ -108,11 +123,11 @@
*/
@ApiOperation("鍒犻櫎瀛︽牎")
@PreAuthorize("@ss.hasPermi('oa:school:remove')")
- @Log(title = "瀛︽牎" , businessType = BusinessType.DELETE)
+ @Log(title = "瀛︽牎", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@ApiParam("涓婚敭涓�")
- @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
+ @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ids) {
return toAjax(iBsSchoolService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}
--
Gitblit v1.9.1