fix 高校

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
@@ -15,7 +14,7 @@ import java.util.Date;
  * 高校添加对象 school
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("高校添加对象")
@@ -23,13 +22,12 @@ public class SchoolAddBo {
 
     /** 学校类型 */
     @ApiModelProperty("学校类型")
-    @Min(value = 1, message = "学校类型Id必须为正整数")
-    private Integer schoolTypeId;
+    private Long schoolTypeId;
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
     @NotBlank(message = "高校名称不能为空")
     private String schoolName;
-    /** 状态 */
+    /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
     /** 创建时间 */
@@ -44,4 +42,19 @@ public class SchoolAddBo {
     /** 学校城市 */
     @ApiModelProperty("学校城市")
     private String schoolCity;
+    /** 优势专业 */
+    @ApiModelProperty("优势专业")
+    private String advantageSpecialty;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String contact;
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String phone;
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+    /** 学校等级字典ID */
+    @ApiModelProperty("学校等级字典ID")
+    private Long dictCode;
 }

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
@@ -14,7 +13,7 @@ import java.util.Date;
  * 高校编辑对象 school
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("高校编辑对象")
@@ -27,22 +26,17 @@ public class SchoolEditBo {
 
     /** 学校类型 */
     @ApiModelProperty("学校类型")
-    @Min(value = 1, message = "学校类型Id必须为正整数")
-    private Integer schoolTypeId;
+    private Long schoolTypeId;
 
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
     @NotBlank(message = "高校名称不能为空")
     private String schoolName;
 
-    /** 状态 */
+    /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
@@ -54,4 +48,24 @@ public class SchoolEditBo {
     /** 学校城市 */
     @ApiModelProperty("学校城市")
     private String schoolCity;
+
+    /** 优势专业 */
+    @ApiModelProperty("优势专业")
+    private String advantageSpecialty;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String contact;
+
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String phone;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+
+    /** 学校等级字典ID */
+    @ApiModelProperty("学校等级字典ID")
+    private Long dictCode;
 }

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

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 高校分页查询对象 school
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,12 +38,12 @@ public class SchoolQueryBo extends BaseEntity {
 
 	/** 学校类型 */
 	@ApiModelProperty("学校类型")
-	private Integer schoolTypeId;
+	private Long schoolTypeId;
 	/**  高校名称 */
 	@ApiModelProperty(" 高校名称")
 	private String schoolName;
-	/** $column.columnComment */
-	@ApiModelProperty("$column.columnComment")
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
 	/** 简介 */
 	@ApiModelProperty("简介")
@@ -51,5 +51,20 @@ public class SchoolQueryBo extends BaseEntity {
 	/** 学校城市 */
 	@ApiModelProperty("学校城市")
 	private String schoolCity;
+	/** 优势专业 */
+	@ApiModelProperty("优势专业")
+	private String advantageSpecialty;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String contact;
+	/** 联系电话 */
+	@ApiModelProperty("联系电话")
+	private String phone;
+	/** 地址 */
+	@ApiModelProperty("地址")
+	private String address;
+	/** 学校等级字典ID */
+	@ApiModelProperty("学校等级字典ID")
+	private Long dictCode;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/School.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 高校对象 school
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @NoArgsConstructor
@@ -29,15 +29,16 @@ private static final long serialVersionUID=1L;
     private Long id;
 
     /** 学校类型 */
-    private Integer schoolTypeId;
+    private Long schoolTypeId;
 
     /**  高校名称 */
     private String schoolName;
 
-    /** $column.columnComment */
+    /** 状态 1正常 0关闭 */
     private Integer status;
 
     /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
     private Long createTime;
 
     /** $column.columnComment */
@@ -50,4 +51,19 @@ private static final long serialVersionUID=1L;
     /** 学校城市 */
     private String schoolCity;
 
+    /** 优势专业 */
+    private String advantageSpecialty;
+
+    /** 联系人 */
+    private String contact;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 地址 */
+    private String address;
+
+    /** 学校等级字典ID */
+    private Long dictCode;
+
 }

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

@@ -7,7 +7,7 @@ import com.zhongzheng.modules.user.domain.School;
  * 高校Mapper接口
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 public interface SchoolMapper extends BaseMapper<School> {
 

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

@@ -14,7 +14,7 @@ import java.util.List;
  * 高校Service接口
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 public interface ISchoolService extends IService<School> {
 	/**

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

@@ -1,15 +1,12 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 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.domain.SchoolType;
 import com.zhongzheng.modules.user.mapper.SchoolMapper;
 import com.zhongzheng.modules.user.service.ISchoolService;
 import com.zhongzheng.modules.user.vo.SchoolVo;
@@ -28,7 +25,7 @@ import java.util.stream.Collectors;
  * 高校Service业务层处理
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Service
 public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> implements ISchoolService {
@@ -47,6 +44,11 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         lqw.eq(bo.getStatus() != null, School::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), School::getIntroduction, bo.getIntroduction());
         lqw.eq(StrUtil.isNotBlank(bo.getSchoolCity()), School::getSchoolCity, bo.getSchoolCity());
+        lqw.eq(StrUtil.isNotBlank(bo.getAdvantageSpecialty()), School::getAdvantageSpecialty, bo.getAdvantageSpecialty());
+        lqw.eq(StrUtil.isNotBlank(bo.getContact()), School::getContact, bo.getContact());
+        lqw.eq(StrUtil.isNotBlank(bo.getPhone()), School::getPhone, bo.getPhone());
+        lqw.eq(StrUtil.isNotBlank(bo.getAddress()), School::getAddress, bo.getAddress());
+        lqw.eq(bo.getDictCode() != null, School::getDictCode, bo.getDictCode());
         return entity2Vo(this.list(lqw));
     }
 
@@ -83,6 +85,7 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     public Boolean updateByEditBo(SchoolEditBo bo) {
         School update = BeanUtil.toBean(bo, School.class);
         validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
     }
 
@@ -93,9 +96,6 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
      */
     private void validEntityBeforeSave(School entity){
         //TODO 做一些数据校验,如唯一约束
-        if(checkNameUnique(entity)){
-            throw new CustomException("名称已存在");
-        }
     }
 
     @Override
@@ -105,14 +105,4 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         }
         return this.removeByIds(ids);
     }
-
-    private boolean checkNameUnique(School entity) {
-        School info = getOne(new LambdaQueryWrapper<School>()
-                .eq(School::getSchoolName,entity.getSchoolName())
-                .last("limit 1"));
-        if (Validator.isNotNull(info)) {
-            return true;
-        }
-        return false;
-    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SchoolVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * 高校视图对象 mall_package
  *
  * @author hjl
- * @date 2021-05-19
+ * @date 2021-05-21
  */
 @Data
 @ApiModel("高校视图对象")
@@ -27,19 +27,15 @@ public class SchoolVo {
 	/** 学校类型 */
 	@Excel(name = "学校类型")
 	@ApiModelProperty("学校类型")
-	private Integer schoolTypeId;
+	private Long schoolTypeId;
 	/**  高校名称 */
 	@Excel(name = " 高校名称")
 	@ApiModelProperty(" 高校名称")
 	private String schoolName;
-	/** $column.columnComment */
-	@Excel(name = " 高校名称")
-	@ApiModelProperty("$column.columnComment")
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-	/** 创建时间 */
-	@Excel(name = "创建时间")
-	@ApiModelProperty("创建时间")
-	private Long createtime;
 	/** 简介 */
 	@Excel(name = "简介")
 	@ApiModelProperty("简介")
@@ -48,5 +44,25 @@ public class SchoolVo {
 	@Excel(name = "学校城市")
 	@ApiModelProperty("学校城市")
 	private String schoolCity;
+	/** 优势专业 */
+	@Excel(name = "优势专业")
+	@ApiModelProperty("优势专业")
+	private String advantageSpecialty;
+	/** 联系人 */
+	@Excel(name = "联系人")
+	@ApiModelProperty("联系人")
+	private String contact;
+	/** 联系电话 */
+	@Excel(name = "联系电话")
+	@ApiModelProperty("联系电话")
+	private String phone;
+	/** 地址 */
+	@Excel(name = "地址")
+	@ApiModelProperty("地址")
+	private String address;
+	/** 学校等级字典ID */
+	@Excel(name = "学校等级字典ID")
+	@ApiModelProperty("学校等级字典ID")
+	private Long dictCode;
 
 }

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

@@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="introduction" column="introduction"/>
         <result property="schoolCity" column="school_city"/>
+        <result property="advantageSpecialty" column="advantage_specialty"/>
+        <result property="contact" column="contact"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="dictCode" column="dict_code"/>
     </resultMap>