提交代码

唐耀东

2022-05-23 dd296baf6463522b0a534b2eb2bc920a3928cd54

提交代码

 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);
    }


 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;


 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);
}

 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);
}

 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);
    }
}

 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>