fix 订单查找

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolController.java

@@ -4,9 +4,11 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.user.bo.SchoolAddBo;
 import com.zhongzheng.modules.user.bo.SchoolEditBo;
 import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.domain.School;
 import com.zhongzheng.modules.user.service.ISchoolService;
 import com.zhongzheng.modules.user.vo.SchoolVo;
 import lombok.RequiredArgsConstructor;
@@ -51,10 +53,9 @@ public class SchoolController extends BaseController {
     @ApiOperation("查询高校列表")
     @PreAuthorize("@ss.hasPermi('user:school:list')")
     @GetMapping("/list")
-    public TableDataInfo<SchoolVo> list(SchoolQueryBo bo) {
-        startPage();
-        List<SchoolVo> list = iSchoolService.queryList(bo);
-        return getDataTable(list);
+    public AjaxResult<List<School>> list(SchoolQueryBo bo) {
+        List<School> list = iSchoolService.selectList(bo);
+        return AjaxResult.success(list);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/SchoolMapper.java

@@ -1,7 +1,12 @@
 package com.zhongzheng.modules.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.bo.UserSchoolInfoQueryBo;
 import com.zhongzheng.modules.user.domain.School;
+import com.zhongzheng.modules.user.domain.UserSchoolInfo;
+
+import java.util.List;
 
 /**
  * 高校Mapper接口
@@ -10,5 +15,6 @@ import com.zhongzheng.modules.user.domain.School;
  * @date 2021-05-21
  */
 public interface SchoolMapper extends BaseMapper<School> {
+    List<School> selectList(SchoolQueryBo bo);
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSchoolInfoMapper.java

@@ -2,7 +2,11 @@ package com.zhongzheng.modules.user.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.bo.UserSchoolInfoQueryBo;
 import com.zhongzheng.modules.user.domain.UserSchoolInfo;
+import com.zhongzheng.modules.user.vo.UserSchoolInfoVo;
+
+import java.util.List;
 
 /**
  * 用户学校信息Mapper接口
@@ -12,4 +16,5 @@ import com.zhongzheng.modules.user.domain.UserSchoolInfo;
  */
 public interface UserSchoolInfoMapper extends BaseMapper<UserSchoolInfo> {
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/ISchoolService.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.user.bo.SchoolAddBo;
 import com.zhongzheng.modules.user.bo.SchoolEditBo;
 import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.bo.UserSchoolInfoQueryBo;
 import com.zhongzheng.modules.user.domain.School;
+import com.zhongzheng.modules.user.domain.UserSchoolInfo;
 import com.zhongzheng.modules.user.vo.SchoolVo;
 
 import java.util.Collection;
@@ -28,6 +30,8 @@ public interface ISchoolService extends IService<School> {
 	 */
 	List<SchoolVo> queryList(SchoolQueryBo bo);
 
+	List<School> selectList(SchoolQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入高校
 	 * @param bo 高校新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSchoolInfoService.java

@@ -30,6 +30,8 @@ public interface IUserSchoolInfoService extends IService<UserSchoolInfo> {
 	 */
 	List<UserSchoolInfoVo> queryList(UserSchoolInfoQueryBo bo);
 
+
+
 	/**
 	 * 根据新增业务对象插入用户学校信息
 	 * @param bo 用户学校信息新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolServiceImpl.java

@@ -8,8 +8,10 @@ import com.zhongzheng.modules.user.bo.SchoolEditBo;
 import com.zhongzheng.modules.user.bo.SchoolQueryBo;
 import com.zhongzheng.modules.user.domain.School;
 import com.zhongzheng.modules.user.mapper.SchoolMapper;
+import com.zhongzheng.modules.user.mapper.UserSchoolInfoMapper;
 import com.zhongzheng.modules.user.service.ISchoolService;
 import com.zhongzheng.modules.user.vo.SchoolVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +32,9 @@ import java.util.stream.Collectors;
 @Service
 public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
 
+    @Autowired
+    private SchoolMapper schoolMapper;
+
     @Override
     public SchoolVo queryById(Long id){
         School db = this.baseMapper.selectById(id);
@@ -52,6 +57,11 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<School> selectList(SchoolQueryBo bo) {
+        return schoolMapper.selectList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSchoolInfoServiceImpl.java

@@ -62,6 +62,8 @@ public class UserSchoolInfoServiceImpl extends ServiceImpl<UserSchoolInfoMapper,
     @Autowired
     private IActivityGradeService activityGradeService;
 
+
+
     @Override
     public UserSchoolInfoVo queryById(Long userSchoolId){
         UserSchoolInfo db = this.baseMapper.selectById(userSchoolId);
@@ -94,6 +96,8 @@ public class UserSchoolInfoServiceImpl extends ServiceImpl<UserSchoolInfoMapper,
         return entity2Vo(this.list(lqw));
     }
 
+
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -20,5 +20,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dictCode" column="dict_code"/>
     </resultMap>
 
-
+    <select id="selectList" resultMap="SchoolResult">
+        SELECT
+        s.*,
+        dd.dict_label
+        FROM
+        school s
+        LEFT JOIN sys_dict_data dd ON s.dict_code = dd.dict_code
+        WHERE
+        1 = 1
+        <if test="status != null and status != ''" >
+            AND s.status = #{status}
+        </if>
+        <if test="schoolName != null and schoolName != ''" >
+            AND s.school_name like concat('%', #{schoolName}, '%')
+        </if>
+        <if test="contact != null and contact != ''" >
+            AND s.contact like concat('%', #{contact}, '%')
+        </if>
+        <if test="phone != null and phone != ''" >
+            AND s.phone = #{phone}
+        </if>
+        <if test="dictCode != null and dictCode != ''" >
+            AND s.dict_code = #{dictCode}
+        </if>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserSchoolInfoMapper.xml

@@ -24,4 +24,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+
 </mapper>