Skip to content

R
ruoyi
提交 ef7a7673 作者: dingtalk_nnkplh
操作

学校页面去掉两个字段

上级 f3a9b4a0
正在显示 包含 106 行增加 和 110 行删除
ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/TbSchoolController.java
......@@ -210,8 +210,8 @@ public class TbSchoolController extends BaseController
tbSchool.setSchoolEnName(request.getParameter("schoolEnName"));
tbSchool.setSchoolCnCountry(request.getParameter("schoolCnCountry"));
tbSchool.setSchoolCnCity(request.getParameter("schoolCnCity"));
tbSchool.setSchoolEnCountry(request.getParameter("schoolEnCountry"));
tbSchool.setSchoolEnCity(request.getParameter("schoolEnCity"));
// tbSchool.setSchoolEnCountry(request.getParameter("schoolEnCountry"));
// tbSchool.setSchoolEnCity(request.getParameter("schoolEnCity"));
tbSchool.setSchoolType(Integer.parseInt(request.getParameter("schoolType")));
tbSchool.setSchoolCampus(request.getParameter("schoolCampus"));
tbSchool.setQsWorld(request.getParameter("qsWorld"));
......
ruoyi-admin/src/main/resources/templates/system/major/add.html
......@@ -117,7 +117,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否需要学历</label>
<label class="col-sm-3 control-label is-required">是否需要前置学历：</label>
<div class="col-sm-8">
<select id="needEducation" class="form-control select2-multiple">
<option value="0">不需要</option>
......
ruoyi-admin/src/main/resources/templates/system/major/edit.html
......@@ -125,7 +125,7 @@
</div>
<input id="needEducationDesc" th:field="*{needEducationDesc}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否需要学历：</label>
<label class="col-sm-3 control-label is-required">是否需要前置学历：</label>
<div class="col-sm-8">
<!-- <input name="needEducation" th:field="*{needEducation}" class="form-control" type="text" required>-->
<select id="needEducation" class="form-control select2-multiple" required>
......
ruoyi-admin/src/main/resources/templates/system/major/editCheckStatus.html
......@@ -115,7 +115,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否需要学历：</label>
<label class="col-sm-3 control-label is-required">是否需要前置学历：</label>
<div class="col-sm-8">
<!-- <select id="needEducation" class="form-control select2-multiple" required>-->
<!-- </select>-->
......
ruoyi-admin/src/main/resources/templates/system/school/add.html
......@@ -33,18 +33,18 @@
<input name="schoolCnCity" id="schoolCnCity" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>
<div class="col-sm-8">
<input name="schoolEnCountry" id="schoolEnCountry" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>
<div class="col-sm-8">
<input name="schoolEnCity" id="schoolEnCity" class="form-control" type="text" required>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCountry" id="schoolEnCountry" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCity" id="schoolEnCity" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校详细地址(英文)：</label>
<div class="col-sm-8">
......
ruoyi-admin/src/main/resources/templates/system/school/edit.html
......@@ -34,18 +34,18 @@
<input name="schoolCnCity" id="schoolCnCity" th:field="*{schoolCnCity}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>
<div class="col-sm-8">
<input name="schoolEnCountry" id="schoolEnCountry" th:field="*{schoolEnCountry}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>
<div class="col-sm-8">
<input name="schoolEnCity" id="schoolEnCity" th:field="*{schoolEnCity}" class="form-control" type="text" required>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCountry" id="schoolEnCountry" th:field="*{schoolEnCountry}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCity" id="schoolEnCity" th:field="*{schoolEnCity}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校详细地址(英文)：</label>
<div class="col-sm-8">
......@@ -92,7 +92,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校面积：</label>
<label class="col-sm-3 control-label is-required">学校面积(单位公顷)：</label>
<div class="col-sm-8">
<input name="schoolArea" id="schoolArea" th:field="*{schoolArea}" class="form-control" type="text" required>
</div>
......
ruoyi-admin/src/main/resources/templates/system/school/editCheckStatus.html
......@@ -34,18 +34,18 @@
<input id="schoolCnCity" th:field="*{schoolCnCity}" class="form-control" type="text" disabled="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>
<div class="col-sm-8">
<input id="schoolEnCountry" th:field="*{schoolEnCountry}" class="form-control" type="text" disabled="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>
<div class="col-sm-8">
<input id="schoolEnCity" th:field="*{schoolEnCity}" class="form-control" type="text" disabled="true">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input id="schoolEnCountry" th:field="*{schoolEnCountry}" class="form-control" type="text" disabled="true">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input id="schoolEnCity" th:field="*{schoolEnCity}" class="form-control" type="text" disabled="true">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校详细地址(英文)：</label>
<div class="col-sm-8">
......
ruoyi-admin/src/main/resources/templates/system/school/school.html
......@@ -26,14 +26,14 @@
<label>学校所在城市中文名称：</label>
<input type="text" name="schoolCnCity"/>
</li>
<li>
<label>学校所属国家英文名称：</label>
<input type="text" name="schoolEnCountry"/>
</li>
<li>
<label>学校所属城市英文名称：</label>
<input type="text" name="schoolEnCity"/>
</li>
<!-- <li>-->
<!-- <label>学校所属国家英文名称：</label>-->
<!-- <input type="text" name="schoolEnCountry"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>学校所属城市英文名称：</label>-->
<!-- <input type="text" name="schoolEnCity"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>学校logo：</label>-->
<!-- <input type="text" name="schoolLogo"/>-->
......@@ -105,14 +105,6 @@
title: '学校所在城市中文名称'
},
{
field: 'schoolEnCountry',
title: '学校所属国家英文名称'
},
{
field: 'schoolEnCity',
title: '学校所属城市英文名称'
},
{
field: 'schoolTypeDesc',
title: '学校类型'
},
......@@ -125,6 +117,13 @@
return $.table.imageView(row.schoolLogo);
}
}, {
field: 'creatorDesc',
title: '创建者'
},
{
field: 'createTime',
title: '创建时间'
},
{
field: 'checkerDesc',
......
ruoyi-admin/src/main/resources/templates/system/school/schoolCheck.html
......@@ -26,14 +26,14 @@
<label>学校所在城市中文名称：</label>
<input type="text" name="schoolCnCity"/>
</li>
<li>
<label>学校所属国家英文名称：</label>
<input type="text" name="schoolEnCountry"/>
</li>
<li>
<label>学校所属城市英文名称：</label>
<input type="text" name="schoolEnCity"/>
</li>
<!-- <li>-->
<!-- <label>学校所属国家英文名称：</label>-->
<!-- <input type="text" name="schoolEnCountry"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>学校所属城市英文名称：</label>-->
<!-- <input type="text" name="schoolEnCity"/>-->
<!-- </li>-->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
......@@ -88,14 +88,6 @@
title: '学校所在城市中文名称'
},
{
field: 'schoolEnCountry',
title: '学校所属国家英文名称'
},
{
field: 'schoolEnCity',
title: '学校所属城市英文名称'
},
{
field: 'schoolTypeDesc',
title: '学校类型'
},
......@@ -118,6 +110,14 @@
}
},
{
field: 'creatorDesc',
title: '创建者'
},
{
field: 'createTime',
title: '创建时间'
},
{
field: 'checker',
title: '审核人员'
},
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbSchool.java
......@@ -38,12 +38,12 @@ public class TbSchool extends BaseEntity
private String schoolCnCity;
/** 学校所属国家英文名称 */
@Excel(name = "学校所属国家英文名称")
private String schoolEnCountry;
// @Excel(name = "学校所属国家英文名称")
// private String schoolEnCountry;
/** 学校所属城市英文名称 */
@Excel(name = "学校所属城市英文名称")
private String schoolEnCity;
// @Excel(name = "学校所属城市英文名称")
// private String schoolEnCity;
/**学校类型：1 公立，2 私立*/
private Integer schoolType;
......@@ -263,24 +263,24 @@ public class TbSchool extends BaseEntity
{
return schoolCnCity;
}
public void setSchoolEnCountry(String schoolEnCountry)
{
this.schoolEnCountry = schoolEnCountry;
}
public String getSchoolEnCountry()
{
return schoolEnCountry;
}
public void setSchoolEnCity(String schoolEnCity)
{
this.schoolEnCity = schoolEnCity;
}
public String getSchoolEnCity()
{
return schoolEnCity;
}
// public void setSchoolEnCountry(String schoolEnCountry)
// {
// this.schoolEnCountry = schoolEnCountry;
// }
//
// public String getSchoolEnCountry()
// {
// return schoolEnCountry;
// }
// public void setSchoolEnCity(String schoolEnCity)
// {
// this.schoolEnCity = schoolEnCity;
// }
//
// public String getSchoolEnCity()
// {
// return schoolEnCity;
// }
public void setSchoolLogo(String schoolLogo)
{
this.schoolLogo = schoolLogo;
......@@ -427,8 +427,8 @@ public class TbSchool extends BaseEntity
.append("schoolEnName", getSchoolEnName())
.append("schoolCnCountry", getSchoolCnCountry())
.append("schoolCnCity", getSchoolCnCity())
.append("schoolEnCountry", getSchoolEnCountry())
.append("schoolEnCity", getSchoolEnCity())
// .append("schoolEnCountry", getSchoolEnCountry())
// .append("schoolEnCity", getSchoolEnCity())
.append("schoolLogo", getSchoolLogo())
.toString();
}
......
ruoyi-system/src/main/resources/mapper/system/TbSchoolMapper.xml
......@@ -10,8 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="schoolEnName" column="school_en_name" />
<result property="schoolCnCountry" column="school_cn_country" />
<result property="schoolCnCity" column="school_cn_city" />
<result property="schoolEnCountry" column="school_en_country" />
<result property="schoolEnCity" column="school_en_city" />
<!-- <result property="schoolEnCountry" column="school_en_country" />-->
<!-- <result property="schoolEnCity" column="school_en_city" />-->
<result property="schoolType" column="school_type" />
<result property="schoolLogo" column="school_logo" />
<result property="schoolCover" column="school_cover" />
......@@ -44,8 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTbSchoolVo">
select id, school_cn_name, school_en_name, school_cn_country, school_cn_city, school_en_country,
school_en_city, school_type, school_logo, school_cover, school_campus,creator, create_time,modified_by,
select id, school_cn_name, school_en_name, school_cn_country, school_cn_city, school_type, school_logo, school_cover, school_campus,creator, create_time,modified_by,
update_time, checker,check_time,check_status,check_result,background_image,qs_world,
school_introduction,qs_area,school_area,live_type,airport_pickup,employment_rate,qs_employability,
teaching_language,internship,gov_auth,lng,lat,address,phone,website
......@@ -59,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="schoolEnName != null and schoolEnName != ''"> and school_en_name like concat('%', #{schoolEnName}, '%')</if>
<if test="schoolCnCountry != null and schoolCnCountry != ''"> and school_cn_country = #{schoolCnCountry}</if>
<if test="schoolCnCity != null and schoolCnCity != ''"> and school_cn_city = #{schoolCnCity}</if>
<if test="schoolEnCountry != null and schoolEnCountry != ''"> and school_en_country = #{schoolEnCountry}</if>
<if test="schoolEnCity != null and schoolEnCity != ''"> and school_en_city = #{schoolEnCity}</if>
<!-- <if test="schoolEnCountry != null and schoolEnCountry != ''"> and school_en_country = #{schoolEnCountry}</if>-->
<!-- <if test="schoolEnCity != null and schoolEnCity != ''"> and school_en_city = #{schoolEnCity}</if>-->
<if test="schoolType != null and schoolType != ''"> and school_type = #{schoolType}</if>
</where>
</select>
......@@ -85,14 +84,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTbSchool" parameterType="TbSchool" useGeneratedKeys="true" keyProperty="id">
insert into tb_school (
school_cn_name,school_en_name,school_cn_country,school_cn_city,school_en_country,
school_en_city,school_logo,school_cover,school_type,school_campus,creator,qs_world,background_image,
school_cn_name,school_en_name,school_cn_country,school_cn_city,school_logo,school_cover,school_type,school_campus,creator,qs_world,background_image,
school_introduction,qs_area,school_area,live_type,airport_pickup, create_time, check_status,
employment_rate,qs_employability,teaching_language,internship,gov_auth,lng,lat,address,phone,website
)
values (
#{schoolCnName},#{schoolEnName},#{schoolCnCountry},#{schoolCnCity},#{schoolEnCountry},
#{schoolEnCity},#{schoolLogo},#{schoolCover},#{schoolType},#{schoolCampus},#{creator},#{qsWorld},
#{schoolCnName},#{schoolEnName},#{schoolCnCountry},#{schoolCnCity},#{schoolLogo},#{schoolCover},#{schoolType},#{schoolCampus},#{creator},#{qsWorld},
#{backgroundImage},#{schoolIntroduction},#{qsArea},#{schoolArea},#{liveType},#{airportPickup},
sysdate(),1,#{employmentRate},#{qsEmployability},#{teachingLanguage},#{internship},#{govAuth},
#{lng},#{lat},#{address},#{phone},#{website}
......@@ -106,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="schoolEnName != null and schoolEnName != ''">school_en_name = #{schoolEnName},</if>
<if test="schoolCnCountry != null and schoolCnCountry != ''">school_cn_country = #{schoolCnCountry},</if>
<if test="schoolCnCity != null and schoolCnCity != ''">school_cn_city = #{schoolCnCity},</if>
<if test="schoolEnCountry != null and schoolEnCountry != ''">school_en_country = #{schoolEnCountry},</if>
<if test="schoolEnCity != null and schoolEnCity != ''">school_en_city = #{schoolEnCity},</if>
<!-- <if test="schoolEnCountry != null and schoolEnCountry != ''">school_en_country = #{schoolEnCountry},</if>-->
<!-- <if test="schoolEnCity != null and schoolEnCity != ''">school_en_city = #{schoolEnCity},</if>-->
<if test="schoolLogo != null and schoolLogo != ''">school_logo = #{schoolLogo},</if>
<if test="schoolCover != null and schoolCover != ''">school_cover = #{schoolCover},</if>
<if test="schoolType != null and schoolType != ''">school_type=#{schoolType},</if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论