院校

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolQueryBo.java

@@ -37,6 +37,10 @@ public class SchoolQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+
+	/**  id */
+	@ApiModelProperty(" id")
+	private Long id;
 	/**  高校名称 */
 	@ApiModelProperty(" 高校名称")
 	private String schoolName;

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

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.user.domain.School;
 import com.zhongzheng.modules.user.mapper.SchoolMapper;
 import com.zhongzheng.modules.user.vo.SchoolVo;
 import com.zhongzheng.modules.user.service.ISchoolService;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,17 +46,13 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
 
     @Override
     public SchoolVo queryById(Long id){
-        School db = this.baseMapper.selectById(id);
-        SchoolVo schoolVo = BeanUtil.toBean(db, SchoolVo.class);
-
-        CourseProjectTypeQueryBo courseProjectTypeQueryBo = new CourseProjectTypeQueryBo();
-        courseProjectTypeQueryBo.setId(schoolVo.getId());
-        List<Integer> status = new ArrayList<>();
-        status.add(1);
-        courseProjectTypeQueryBo.setStatus(status);
-        List<CourseProjectTypeVo> courseProjectTypeVos = baseMapper.selectProject(courseProjectTypeQueryBo);
-        schoolVo.setCourseProjectTypes(courseProjectTypeVos);
-        return schoolVo;
+        SchoolQueryBo schoolQueryBo = new SchoolQueryBo();
+        schoolQueryBo.setId(id);
+        List<SchoolVo> schoolVos = baseMapper.queryList(schoolQueryBo);
+        if (CollectionUtils.isEmpty(schoolVos)) {
+            throw new IllegalArgumentException("错误ID");
+        }
+        return entity2Vo(schoolVos).get(0);
     }
 
     @Override

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

@@ -80,6 +80,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="id != null and id != ''">
+            and s.id = #{id}
+        </if>
+        <if test="schoolProvinceId != null and schoolProvinceId != ''">
+            and s.school_province_id = #{schoolProvinceId}
+        </if>
+        <if test="schoolCityId != null and schoolCityId != ''">
+            and s.school_city_id = #{schoolCityId}
+        </if>
+
+        <if test="encoder != null and encoder != ''">
+            and s.encoder = #{encoder}
+        </if>
+
+        <if test="schoolName != null and schoolName != ''">
+            and s.school_name like concat('%', #{schoolName}, '%')
+        </if>
 
     </select>
 </mapper>