From dd296baf6463522b0a534b2eb2bc920a3928cd54 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:27:26 +0800
Subject: [PATCH] 提交代码
---
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/BsSchoolVo.java | 2 --
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/BsSchoolMapper.java | 6 ++++++
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IBsSchoolService.java | 2 ++
ruoyi-oa/src/main/resources/mapper/oa/BsSchoolMapper.xml | 21 +++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java | 6 +++---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsSchoolServiceImpl.java | 5 +++++
6 files changed, 37 insertions(+), 5 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 b28c06f..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
@@ -76,9 +76,9 @@
@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);
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/BsSchoolVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/BsSchoolVo.java
index 1ca5c09..a192d46 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/BsSchoolVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/BsSchoolVo.java
@@ -28,7 +28,6 @@
/**
* id
*/
- @ExcelProperty(value = "id")
@ApiModelProperty("id")
private Long id;
@@ -81,7 +80,6 @@
/**
* 澶囨敞
*/
- @ExcelProperty(value = "澶囨敞")
@ApiModelProperty("澶囨敞")
private String remarks;
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/BsSchoolMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/BsSchoolMapper.java
index 35b5154..5e70469 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/BsSchoolMapper.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/BsSchoolMapper.java
@@ -2,7 +2,12 @@
import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.oa.domain.bo.BsSchoolBo;
+import com.ruoyi.oa.domain.vo.BsSchoolVo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 瀛︽牎Mapper鎺ュ彛
@@ -13,4 +18,5 @@
@Mapper
public interface BsSchoolMapper extends BaseMapperPlus<BsSchool> {
+ List<BsSchoolVo> exportList(@Param("p") BsSchoolBo bo);
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IBsSchoolService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IBsSchoolService.java
index 4e68569..e2a2765 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IBsSchoolService.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IBsSchoolService.java
@@ -53,4 +53,6 @@
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+ List<BsSchoolVo> exportList(BsSchoolBo bo);
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsSchoolServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsSchoolServiceImpl.java
index dd9dec9..ac8668c 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsSchoolServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsSchoolServiceImpl.java
@@ -110,4 +110,9 @@
}
return removeByIds(ids);
}
+
+ @Override
+ public List<BsSchoolVo> exportList(BsSchoolBo bo) {
+ return baseMapper.exportList(bo);
+ }
}
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/BsSchoolMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/BsSchoolMapper.xml
index c5b1e9a..2ed663d 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/BsSchoolMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/BsSchoolMapper.xml
@@ -22,5 +22,26 @@
<result property="version" column="version"/>
</resultMap>
+ <select id="exportList" resultType="com.ruoyi.oa.domain.vo.BsSchoolVo">
+ select
+ a.id,
+ a.code,
+ a.name,
+ (select b.PROVINCE_NAME from bs_province b where a.province_code = b.PROVINCE_CODE) as provinceCode,
+ (select c.CITY_NAME from bs_city c where a.city_code = c.CITY_CODE) as cityCode,
+ a.school_run_level as schoolRunLevel,
+ a.discipline_scope as disciplineScope
+ from bs_school a
+ where
+ 1=1
+ <if test="p.code != null and p.code != null">
+ and a.code like concat('%', #{p.code}, '%')
+ </if>
+ <if test="p.name != null and p.name != null">
+ and a.name like concat('%', #{p.name}, '%')
+ </if>
+ order by a.update_time desc
+ </select>
+
</mapper>
--
Gitblit v1.9.1