diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java
index d8fb079..fce304b 100644
--- a/src/main/java/com/sincere/student/controller/AdminController.java
+++ b/src/main/java/com/sincere/student/controller/AdminController.java
@@ -97,21 +97,7 @@ public class AdminController {
                 submitFile.setFileUrl(null);
             }else {
                 List<Point> list = ExcelUtils.analysisExcel(submitFile.getFileUrl());
-                List<Point> points = new ArrayList<>();
-                for(Point point : list){
-                    Integer universityId = universityService.selectByName(point.getUniversityName());
-                    if(universityId == null){
-                        throw new ResultException(902,point.getUniversityName()+"不存在");
-                    }
-                    point.setUniversityId(universityId);
-                    Integer majorId = universityService.selectIdByMajor(point.getMajor(),universityId);
-                    if(majorId == null){
-                        throw new ResultException(902,point.getUniversityName()+"-"+point.getMajor()+"关系不存在");
-                    }
-                    point.setMajorId(majorId);
-                    points.add(point);
-                }
-                submitFile.setList(points);
+                submitFile.setList(list);
             }
             submitService.update(submitFile);
         }catch (ResultException e){
@@ -133,21 +119,7 @@ public class AdminController {
         }
         try{
             List<Point> list = ExcelUtils.analysisExcel(submitFile.getFileUrl());
-            List<Point> points = new ArrayList<>();
-            for(Point point : list){
-                Integer universityId = universityService.selectByName(point.getUniversityName());
-                if(universityId == null){
-                    throw new ResultException(902,point.getUniversityName()+"不存在");
-                }
-                point.setUniversityId(universityId);
-                Integer majorId = universityService.selectIdByMajor(point.getMajor(),universityId);
-                if(majorId == null){
-                    throw new ResultException(902,point.getUniversityName()+"-"+point.getMajor()+"关系不存在");
-                }
-                point.setMajorId(majorId);
-                points.add(point);
-            }
-            submitFile.setList(points);
+            submitFile.setList(list);
             submitService.create(submitFile);
         }catch (ResultException e){
             e.printStackTrace();
@@ -268,9 +240,13 @@ public class AdminController {
             result.setMessage("同一栏目下，已有该学校招生咨询");
         }else {
             int id = consultService.create(universityConsult);
-            String name = universityService.getById(universityConsult.getUniversityId()).getName();
+            try{
+                String name = universityService.getById(universityConsult.getUniversityId()).getName();
+                dto.setName(name);
+            }catch (Exception e){
+
+            }
             dto.setId(id);
-            dto.setName(name);
             result.setData(dto);
         }
         return result ;
@@ -315,8 +291,12 @@ public class AdminController {
         BaseDto<ReturnDto> result = new BaseDto() ;
         ReturnDto dto = new ReturnDto();
         int id = videoService.create(video);
-        String name = universityService.getById(video.getUniversityId()).getName();
-        dto.setName(name);
+        try{
+            String name = universityService.getById(video.getUniversityId()).getName();
+            dto.setName(name);
+        }catch (Exception e){
+
+        }
         dto.setId(id);
         result.setData(dto);
         return result ;
diff --git a/src/main/java/com/sincere/student/mapper/UniversityPointMapper.java b/src/main/java/com/sincere/student/mapper/UniversityPointMapper.java
index ddc88c3..10792d8 100644
--- a/src/main/java/com/sincere/student/mapper/UniversityPointMapper.java
+++ b/src/main/java/com/sincere/student/mapper/UniversityPointMapper.java
@@ -7,15 +7,5 @@ import java.util.List;
 public interface UniversityPointMapper {
     int deleteBySubmit(Integer id);
 
-    int insert(Point record);
-
     int insertBatch(List<Point> list);
-
-    int insertSelective(Point record);
-
-    Point selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(Point record);
-
-    int updateByPrimaryKey(Point record);
 }
\ No newline at end of file
diff --git a/src/main/java/com/sincere/student/model/Point.java b/src/main/java/com/sincere/student/model/Point.java
index 99069ce..5631ac8 100644
--- a/src/main/java/com/sincere/student/model/Point.java
+++ b/src/main/java/com/sincere/student/model/Point.java
@@ -7,9 +7,7 @@ public class Point {
 
     private Integer submitId;
     private String universityName;
-    private Integer universityId;
     private String major ;
-    private Integer majorId;
 
     private Integer grade;
 
@@ -18,22 +16,8 @@ public class Point {
     private Integer rank;
 
     private Date createTime;
-
-    public String getUniversityName() {
-        return universityName;
-    }
-
-    public void setUniversityName(String universityName) {
-        this.universityName = universityName;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
+    private String province;
+    private String city ;
 
     public Integer getId() {
         return id;
@@ -51,20 +35,20 @@ public class Point {
         this.submitId = submitId;
     }
 
-    public Integer getUniversityId() {
-        return universityId;
+    public String getUniversityName() {
+        return universityName;
     }
 
-    public void setUniversityId(Integer universityId) {
-        this.universityId = universityId;
+    public void setUniversityName(String universityName) {
+        this.universityName = universityName;
     }
 
-    public Integer getMajorId() {
-        return majorId;
+    public String getMajor() {
+        return major;
     }
 
-    public void setMajorId(Integer majorId) {
-        this.majorId = majorId;
+    public void setMajor(String major) {
+        this.major = major;
     }
 
     public Integer getGrade() {
@@ -98,4 +82,20 @@ public class Point {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/sincere/student/utils/ExcelUtils.java b/src/main/java/com/sincere/student/utils/ExcelUtils.java
index 9483ae6..b865513 100644
--- a/src/main/java/com/sincere/student/utils/ExcelUtils.java
+++ b/src/main/java/com/sincere/student/utils/ExcelUtils.java
@@ -85,11 +85,22 @@ public class ExcelUtils {
                         cell5.setCellType(CellType.STRING);
                         point.setRank(Integer.valueOf(cell5.getStringCellValue().trim()));
                     }
+                    Cell cell6 = sheetRow.getCell(5);
+                    if(cell6 != null){
+                        cell6.setCellType(CellType.STRING);
+                        point.setProvince(cell6.getStringCellValue().trim());
+                    }
+                    Cell cell7 = sheetRow.getCell(6);
+                    if(cell7 != null){
+                        cell7.setCellType(CellType.STRING);
+                        point.setCity(cell7.getStringCellValue());
+                    }
                     list.add(point);
                 }
             }
             return list ;
         }catch (Exception e){
+            e.printStackTrace();
             throw new ResultException(999,"系统错误");
         }finally {
             try{
diff --git a/src/main/resources/mapper/UniversityPointMapper.xml b/src/main/resources/mapper/UniversityPointMapper.xml
index 35398ce..3182e8a 100644
--- a/src/main/resources/mapper/UniversityPointMapper.xml
+++ b/src/main/resources/mapper/UniversityPointMapper.xml
@@ -4,134 +4,27 @@
   <resultMap id="BaseResultMap" type="com.sincere.student.model.Point">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="submit_id" jdbcType="INTEGER" property="submitId" />
-    <result column="university_id" jdbcType="INTEGER" property="universityId" />
-    <result column="major_id" jdbcType="INTEGER" property="majorId" />
+    <result column="university" jdbcType="VARCHAR" property="universityName" />
+    <result column="major" jdbcType="VARCHAR" property="major" />
     <result column="grade" jdbcType="VARCHAR" property="grade" />
     <result column="enroll_number" jdbcType="INTEGER" property="enrollNumber" />
     <result column="rank" jdbcType="INTEGER" property="rank" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="province" jdbcType="VARCHAR" property="province" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
   </resultMap>
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into university_point (submit_id, university_id , major_id ,grade ,enroll_number ,rank,create_time)
+    insert into university_point (submit_id, university , major ,grade ,enroll_number ,rank,create_time,province,city)
     values
     <foreach collection="list" item="emp" separator=",">
-      (#{emp.submitId}, #{emp.universityId}, #{emp.majorId}, #{emp.grade}, #{emp.enrollNumber}, #{emp.rank},GETDATE())
+      (#{emp.submitId}, #{emp.universityName}, #{emp.major}, #{emp.grade}, #{emp.enrollNumber}, #{emp.rank},GETDATE(),#{emp.province},#{emp.city})
     </foreach>
   </insert>
 
-  <sql id="Base_Column_List">
-    id, submit_id, university_id, major_id, grade, enroll_number, rank, create_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from university_point
-    where id = #{id,jdbcType=INTEGER}
-  </select>
   <delete id="deleteBySubmit" parameterType="java.lang.Integer">
     delete from university_point
     where submit_id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.Point">
-    insert into university_point (id, submit_id, university_id, 
-      major_id, grade, enroll_number, 
-      rank, create_time)
-    values (#{id,jdbcType=INTEGER}, #{submitId,jdbcType=INTEGER}, #{universityId,jdbcType=INTEGER}, 
-      #{majorId,jdbcType=INTEGER}, #{grade,jdbcType=VARCHAR}, #{enrollNumber,jdbcType=INTEGER}, 
-      #{rank,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.Point">
-    insert into university_point
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="submitId != null">
-        submit_id,
-      </if>
-      <if test="universityId != null">
-        university_id,
-      </if>
-      <if test="majorId != null">
-        major_id,
-      </if>
-      <if test="grade != null">
-        grade,
-      </if>
-      <if test="enrollNumber != null">
-        enroll_number,
-      </if>
-      <if test="rank != null">
-        rank,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="submitId != null">
-        #{submitId,jdbcType=INTEGER},
-      </if>
-      <if test="universityId != null">
-        #{universityId,jdbcType=INTEGER},
-      </if>
-      <if test="majorId != null">
-        #{majorId,jdbcType=INTEGER},
-      </if>
-      <if test="grade != null">
-        #{grade,jdbcType=VARCHAR},
-      </if>
-      <if test="enrollNumber != null">
-        #{enrollNumber,jdbcType=INTEGER},
-      </if>
-      <if test="rank != null">
-        #{rank,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.Point">
-    update university_point
-    <set>
-      <if test="submitId != null">
-        submit_id = #{submitId,jdbcType=INTEGER},
-      </if>
-      <if test="universityId != null">
-        university_id = #{universityId,jdbcType=INTEGER},
-      </if>
-      <if test="majorId != null">
-        major_id = #{majorId,jdbcType=INTEGER},
-      </if>
-      <if test="grade != null">
-        grade = #{grade,jdbcType=VARCHAR},
-      </if>
-      <if test="enrollNumber != null">
-        enroll_number = #{enrollNumber,jdbcType=INTEGER},
-      </if>
-      <if test="rank != null">
-        rank = #{rank,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.Point">
-    update university_point
-    set submit_id = #{submitId,jdbcType=INTEGER},
-      university_id = #{universityId,jdbcType=INTEGER},
-      major_id = #{majorId,jdbcType=INTEGER},
-      grade = #{grade,jdbcType=VARCHAR},
-      enroll_number = #{enrollNumber,jdbcType=INTEGER},
-      rank = #{rank,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/UniversityReplyMapper.xml b/src/main/resources/mapper/UniversityReplyMapper.xml
index cb931fe..ed19828 100644
--- a/src/main/resources/mapper/UniversityReplyMapper.xml
+++ b/src/main/resources/mapper/UniversityReplyMapper.xml
@@ -15,7 +15,7 @@
     <include refid="Base_Column_List" />
     from university_reply
     where message_id = #{id,jdbcType=INTEGER}
-    order by create_time
+    order by create_time desc
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from university_reply
diff --git a/src/main/resources/mapper/UniversitySubmitFileMapper.xml b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
index d40b543..44a8277 100644
--- a/src/main/resources/mapper/UniversitySubmitFileMapper.xml
+++ b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
@@ -18,23 +18,15 @@
   <select id="getAppListCount" parameterType="com.sincere.student.dto.PointSearchDto" resultType="java.lang.Integer">
     select count(DISTINCT(sf.id))
     from university_submit_file sf join university_point p on sf.id = p.submit_id
-    join university_info info on p.university_id = info.id
-    join university_major m on p.major_id = m.id
     <where>
       <if test="submitId != 0">
         and sf.id = #{submitId}
       </if>
-      <if test="universityName != null and universityName != '' ">
-        and info.name like #{universityName}
-      </if>
-      <if test="province != null and province != '' ">
-        and info.province = #{province}
-      </if>
-      <if test="city != null and city != '' ">
-        and info.city = #{city}
-      </if>
       <if test="majorName != null and majorName != '' ">
-        and m.major like #{majorName}
+        and p.major like #{majorName}
+      </if>
+      <if test="universityName != null and universityName != '' ">
+        and p.university like #{universityName}
       </if>
       <if test="point != 0 ">
         <![CDATA[ and p.grade > #{point}-5 and p.grade < #{point} +5  ]]>
@@ -46,32 +38,24 @@
   </select>
 
   <select id="getAppList" parameterType="com.sincere.student.dto.PointSearchDto" resultMap="LineMap">
-    select sf.id , sf.title ,info.id as universityId , info.name , m.major , p.enroll_number , p.rank , p.grade
+    select sf.id , sf.title , p.university as name , p.major , p.enroll_number , p.rank , p.grade
     from university_submit_file sf join university_point p on sf.id = p.submit_id
-    join university_info info on p.university_id = info.id
-    join university_major m on p.major_id = m.id
     <where>
         <if test="submitId != 0">
           and sf.id = #{submitId}
         </if>
-        <if test="universityName != null and universityName != '' ">
-          and info.name like #{universityName}
-        </if>
-        <if test="province != null and province != '' ">
-          and info.province = #{province}
-        </if>
-        <if test="city != null and city != '' ">
-          and info.city = #{city}
-        </if>
         <if test="majorName != null and majorName != '' ">
-          and m.major like #{majorName}
+          and p.major like #{majorName}
         </if>
-      <if test="point != 0 ">
-        <![CDATA[ and p.grade >= #{point}-5 and p.grade <= #{point} +5  ]]>
-      </if>
-      <if test="rank != 0 ">
-        <![CDATA[ and p.rank >= #{rank}-100 and p.rank <= #{rank} +100  ]]>
+      <if test="universityName != null and universityName != '' ">
+        and p.university like #{universityName}
       </if>
+        <if test="point != 0 ">
+          <![CDATA[ and p.grade >= #{point}-5 and p.grade <= #{point} +5  ]]>
+        </if>
+        <if test="rank != 0 ">
+          <![CDATA[ and p.rank >= #{rank}-100 and p.rank <= #{rank} +100  ]]>
+        </if>
     </where>
     order by sf.id
   </select>
--
libgit2 0.21.0