wwl hace 4 años
padre
commit
facf9bda20

+ 7 - 7
hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachEvaluateController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/coach/evaluate")
+@RequestMapping("/coach/evaluate")
 @Api(tags={"【pc-教练评价】"})
 public class PcCoachEvaluateController extends BaseController{
 
@@ -32,7 +32,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 查询教练评价列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:list')")
+    //@PreAuthorize("@ss.hasPermi('coach:evaluate:list')")
     @GetMapping("/list")
     @ApiOperation("查询教练评价列表")
     @ApiImplicitParams({
@@ -48,7 +48,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 导出教练评价列表
      */
-   // @PreAuthorize("@ss.hasPermi('system:evaluate:export')")
+   // @PreAuthorize("@ss.hasPermi('coach:evaluate:export')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出教练评价列表Excel")
@@ -61,7 +61,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 获取教练评价详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    //@PreAuthorize("@ss.hasPermi('coach:evaluate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取教练评价详细信息")
     public Response<CoachEvaluate> getInfo(
@@ -74,7 +74,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 新增教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    //@PreAuthorize("@ss.hasPermi('coach:evaluate:add')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增教练评价")
@@ -85,7 +85,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 修改教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    //@PreAuthorize("@ss.hasPermi('coach:evaluate:edit')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改教练评价")
@@ -96,7 +96,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 删除教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:remove')")
+    //@PreAuthorize("@ss.hasPermi('coach:evaluate:remove')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除教练评价")

+ 8 - 7
hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachInfoController.java

@@ -11,6 +11,7 @@ import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -31,7 +32,7 @@ import com.miaxis.common.enums.BusinessTypeEnum;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/coach")
+@RequestMapping("/coach/info")
 @Api(tags={"【pc-教练】"})
 public class PcCoachInfoController extends BaseController{
 
@@ -41,7 +42,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 查询教练列表
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:list')")
+    @PreAuthorize("@ss.hasPermi('coach:info:list')")
     @GetMapping("/list")
     @ApiOperation("查询教练列表")
     @ApiImplicitParams({
@@ -57,7 +58,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 导出教练列表
      */
-   // @PreAuthorize("@ss.hasPermi('open-api/coach:info:export')")
+    @PreAuthorize("@ss.hasPermi('coach:info:export')")
     @Log(title = "教练", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出教练列表Excel")
@@ -70,7 +71,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 获取教练详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:query')")
+    @PreAuthorize("@ss.hasPermi('coach:info:query')")
     @GetMapping(value = "/{coachnum}")
     @ApiOperation("获取教练详细信息")
     public Response<CoachInfo> getInfo(
@@ -83,7 +84,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 新增教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:add')")
+    @PreAuthorize("@ss.hasPermi('coach:info:add')")
     @Log(title = "教练", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增教练")
@@ -94,7 +95,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 修改教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:edit')")
+    @PreAuthorize("@ss.hasPermi('coach:info:edit')")
     @Log(title = "教练", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改教练")
@@ -105,7 +106,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 删除教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:remove')")
+    @PreAuthorize("@ss.hasPermi('coach:info:remove')")
     @Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{coachnums}")
     @ApiOperation("删除教练")

+ 8 - 7
hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolClassTypeController.java

@@ -10,6 +10,7 @@ import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -23,7 +24,7 @@ import java.util.List;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/school/type")
+@RequestMapping("/school/class/type")
 @Api(tags={"【pc-驾校班型】"})
 public class PcSchoolClassTypeController extends BaseController{
 
@@ -33,7 +34,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 查询驾校班型列表
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:list')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校班型列表")
     @ApiImplicitParams({
@@ -49,7 +50,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 导出驾校班型列表
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:export')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:export')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出驾校班型列表Excel")
@@ -62,7 +63,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 获取驾校班型详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:query')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校班型详细信息")
     public Response<SchoolClassType> getInfo(
@@ -75,7 +76,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 新增驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:add')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:add')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校班型")
@@ -86,7 +87,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 修改驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:edit')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:edit')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校班型")
@@ -97,7 +98,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 删除驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:remove')")
+    @PreAuthorize("@ss.hasPermi('school:class/type:remove')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校班型")

+ 8 - 7
hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolEvaluateController.java

@@ -8,6 +8,7 @@ import java.util.Arrays;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -30,7 +31,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/system/evaluate")
+@RequestMapping("/school/evaluate")
 @Api(tags={"【pc-驾校评价】"})
 public class PcSchoolEvaluateController extends BaseController{
 
@@ -40,7 +41,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 查询驾校评价列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:list')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校评价列表")
     @ApiImplicitParams({
@@ -56,7 +57,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 导出驾校评价列表
      */
-   // @PreAuthorize("@ss.hasPermi('system:evaluate:export')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:export')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出驾校评价列表Excel")
@@ -69,7 +70,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 获取驾校评价详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校评价详细信息")
     public Response<SchoolEvaluate> getInfo(
@@ -82,7 +83,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 新增驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:add')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校评价")
@@ -93,7 +94,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 修改驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:edit')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校评价")
@@ -104,7 +105,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 删除驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:remove')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:remove')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校评价")

+ 118 - 0
hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolInfoController.java

@@ -0,0 +1,118 @@
+package com.miaxis.pc.controller.school;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.school.domain.SchoolInfo;
+import com.miaxis.school.service.ISchoolInfoService;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+
+/**
+ * 【驾校】Controller
+ *
+ * @author wwl
+ * @date 2021-01-18
+ */
+@RestController
+@RequestMapping("/school/info")
+@Api(tags={"【pc-驾校】"})
+public class PcSchoolInfoController extends BaseController{
+
+    @Autowired
+    private ISchoolInfoService schoolInfoService;
+
+    /**
+     * 查询驾校列表
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询驾校列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolInfo> list(@ModelAttribute SchoolInfo schoolInfo){
+        startPage();
+        List<SchoolInfo> list = schoolInfoService.queryList(schoolInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出驾校列表
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:export')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出驾校列表Excel")
+    public Response<String> export(@ModelAttribute SchoolInfo schoolInfo){
+        List<SchoolInfo> list = schoolInfoService.queryList(schoolInfo);
+        ExcelUtil<SchoolInfo> util = new ExcelUtil<>(SchoolInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取驾校详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:query')")
+    @GetMapping(value = "/{inscode}")
+    @ApiOperation("获取驾校详细信息")
+    public Response<SchoolInfo> getInfo(
+            @ApiParam(name = "inscode", value = "驾校参数", required = true)
+            @PathVariable("inscode") String inscode
+    ){
+        return Response.success(schoolInfoService.getById(inscode));
+    }
+
+    /**
+     * 新增驾校
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:add')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校")
+    public Response<Integer> add(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.save(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改驾校
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:edit')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校")
+    public Response<Integer> edit(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.updateById(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除驾校
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:remove')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{inscodes}")
+    @ApiOperation("删除驾校")
+    public  Response<Integer> remove(
+            @ApiParam(name = "inscodes", value = "驾校ids参数", required = true)
+            @PathVariable String[] inscodes
+    ){
+        return toResponse(schoolInfoService.removeByIds(Arrays.asList(inscodes)) ? 1 : 0);
+    }
+}

+ 4 - 1
hzgzpt-service/src/main/java/com/miaxis/coach/service/impl/CoachInfoServiceImpl.java

@@ -15,6 +15,8 @@ import com.miaxis.coach.mapper.CoachInfoMapper;
 import com.miaxis.coach.domain.CoachInfo;
 import com.miaxis.coach.service.ICoachInfoService;
 
+import javax.annotation.Resource;
+
 /**
  * 教练Service业务层处理
  *
@@ -23,7 +25,8 @@ import com.miaxis.coach.service.ICoachInfoService;
  */
 @Service
 public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo> implements ICoachInfoService {
-    @Autowired
+
+    @Resource
     private CoachInfoMapper coachInfoMapper;
 
     /**

+ 6 - 0
hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolInfoService.java

@@ -80,4 +80,10 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
      * @return 结果
      */
     public int deleteSchoolInfoById(String inscode);
+
+
+    /**
+     * pc查询列表
+     */
+    List<SchoolInfo> queryList(SchoolInfo schoolInfo);
 }

+ 4 - 0
hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolClassTypeServiceImpl.java

@@ -10,6 +10,7 @@ import com.miaxis.school.service.ISchoolClassTypeService;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -22,6 +23,9 @@ import java.util.List;
 @Service
 public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMapper, SchoolClassType> implements ISchoolClassTypeService {
 
+    @Resource
+    private SchoolClassTypeMapper schoolClassTypeMapper;
+
     /**
      * 班型查询列表
      */

+ 98 - 1
hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolInfoServiceImpl.java

@@ -2,18 +2,23 @@ package com.miaxis.school.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
 import com.miaxis.school.dto.SchoolInfoEvalVO;
 import com.miaxis.school.dto.SchoolInfoVO;
 import com.miaxis.common.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.school.mapper.SchoolInfoMapper;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.service.ISchoolInfoService;
 
+import javax.annotation.Resource;
+
 /**
  * 驾校Service业务层处理
  *
@@ -22,7 +27,8 @@ import com.miaxis.school.service.ISchoolInfoService;
  */
 @Service
 public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolInfo> implements ISchoolInfoService {
-    @Autowired
+
+    @Resource
     private SchoolInfoMapper schoolInfoMapper;
 
     /**
@@ -116,4 +122,95 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
     public int deleteSchoolInfoById(String inscode){
         return schoolInfoMapper.deleteSchoolInfoById(inscode);
     }
+
+    /**
+     * pc查询列表
+     */
+    @Override
+    public List<SchoolInfo> queryList(SchoolInfo schoolInfo) {
+        LambdaQueryWrapper<SchoolInfo> lqw = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(schoolInfo.getName())){
+            lqw.like(SchoolInfo::getName ,schoolInfo.getName());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getSname())){
+            lqw.like(SchoolInfo::getSname ,schoolInfo.getSname());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getAddress())){
+            lqw.eq(SchoolInfo::getAddress ,schoolInfo.getAddress());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getLegalPersonIdNumber())){
+            lqw.eq(SchoolInfo::getLegalPersonIdNumber ,schoolInfo.getLegalPersonIdNumber());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getResponsiblePerson())){
+            lqw.eq(SchoolInfo::getResponsiblePerson ,schoolInfo.getResponsiblePerson());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getLegalPersonName())){
+            lqw.like(SchoolInfo::getLegalPersonName ,schoolInfo.getLegalPersonName());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getAreaName())){
+            lqw.like(SchoolInfo::getAreaName ,schoolInfo.getAreaName());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getAreaCode())){
+            lqw.eq(SchoolInfo::getAreaCode ,schoolInfo.getAreaCode());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getTel())){
+            lqw.eq(SchoolInfo::getTel ,schoolInfo.getTel());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getWechar())){
+            lqw.eq(SchoolInfo::getWechar ,schoolInfo.getWechar());
+        }
+        if (schoolInfo.getRegistrationDate() != null){
+            lqw.eq(SchoolInfo::getRegistrationDate ,schoolInfo.getRegistrationDate());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getLicenseNumber())){
+            lqw.eq(SchoolInfo::getLicenseNumber ,schoolInfo.getLicenseNumber());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getLicenseWord())){
+            lqw.eq(SchoolInfo::getLicenseWord ,schoolInfo.getLicenseWord());
+        }
+        if (schoolInfo.getLicenseValidPeriodFrom() != null){
+            lqw.eq(SchoolInfo::getLicenseValidPeriodFrom ,schoolInfo.getLicenseValidPeriodFrom());
+        }
+        if (schoolInfo.getLicenseValidPeriodEnd() != null){
+            lqw.eq(SchoolInfo::getLicenseValidPeriodEnd ,schoolInfo.getLicenseValidPeriodEnd());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getCredibilityGrade())){
+            lqw.eq(SchoolInfo::getCredibilityGrade ,schoolInfo.getCredibilityGrade());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getCredibilityScore())){
+            lqw.eq(SchoolInfo::getCredibilityScore ,schoolInfo.getCredibilityScore());
+        }
+        if (schoolInfo.getVehicleSum() != null){
+            lqw.eq(SchoolInfo::getVehicleSum ,schoolInfo.getVehicleSum());
+        }
+        if (schoolInfo.getRegcapital() != null){
+            lqw.eq(SchoolInfo::getRegcapital ,schoolInfo.getRegcapital());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getBizlicense())){
+            lqw.eq(SchoolInfo::getBizlicense ,schoolInfo.getBizlicense());
+        }
+        if (schoolInfo.getPoiLon() != null){
+            lqw.eq(SchoolInfo::getPoiLon ,schoolInfo.getPoiLon());
+        }
+        if (schoolInfo.getPoiLat() != null){
+            lqw.eq(SchoolInfo::getPoiLat ,schoolInfo.getPoiLat());
+        }
+        if (schoolInfo.getRemoved() != null){
+            lqw.eq(SchoolInfo::getRemoved ,schoolInfo.getRemoved());
+        }
+        if (schoolInfo.getInitialReceiptDate() != null){
+            lqw.eq(SchoolInfo::getInitialReceiptDate ,schoolInfo.getInitialReceiptDate());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getBusinessStatusName())){
+            lqw.like(SchoolInfo::getBusinessStatusName ,schoolInfo.getBusinessStatusName());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getPxcx())){
+            lqw.eq(SchoolInfo::getPxcx ,schoolInfo.getPxcx());
+        }
+        if (StringUtils.isNotBlank(schoolInfo.getYzCode())){
+            lqw.eq(SchoolInfo::getYzCode ,schoolInfo.getYzCode());
+        }
+        return this.list(lqw);
+    }
+
 }