From 4dbd6f3841ef92266492fabf8dfcfbd9ba21a4b2 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Thu, 19 Mar 2020 16:33:24 +0800
Subject: [PATCH] bug 修复

---
 pom.xml                                                                |  6 +++++-
 src/main/java/com/sincere/student/controller/AdminController.java      |  4 +---
 src/main/java/com/sincere/student/controller/AppController.java        | 14 +++++++-------
 src/main/java/com/sincere/student/controller/CommonController.java     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/com/sincere/student/dto/Province.java                    | 34 ++++++++++++++++++++++++++++++++++
 src/main/java/com/sincere/student/mapper/UniversityMajorMapper.java    |  3 ++-
 src/main/java/com/sincere/student/model/Major.java                     | 21 ++++++++++++++++-----
 src/main/java/com/sincere/student/model/Message.java                   |  9 +++++++++
 src/main/java/com/sincere/student/model/University.java                |  6 +++---
 src/main/java/com/sincere/student/model/Video.java                     | 10 ++++++++++
 src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java   |  6 +++---
 src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java | 10 +++++++++-
 src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java  |  2 +-
 src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java   | 10 +++++++++-
 src/main/java/com/sincere/student/utils/DateUtils.java                 | 32 ++++++++++++++++++++++++++++++++
 src/main/java/com/sincere/student/utils/ExcelUtils.java                | 46 ++++++++++++++++++++++++++++------------------
 src/main/resources/mapper/MajorMapper.xml                              | 15 ++++++---------
 src/main/resources/mapper/UniversityMajorMapper.xml                    | 17 ++++++++++++++---
 src/main/resources/mapper/UniversitySubmitFileMapper.xml               | 10 +++++-----
 19 files changed, 240 insertions(+), 61 deletions(-)
 create mode 100644 src/main/java/com/sincere/student/dto/Province.java
 create mode 100644 src/main/java/com/sincere/student/utils/DateUtils.java

diff --git a/pom.xml b/pom.xml
index e5c7e47..cbccbd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,11 @@
             <scope>test</scope>
         </dependency>
 
-
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>2.8.3</version>
+        </dependency>
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java
index d8fcbb5..068f7b5 100644
--- a/src/main/java/com/sincere/student/controller/AdminController.java
+++ b/src/main/java/com/sincere/student/controller/AdminController.java
@@ -112,6 +112,7 @@ public class AdminController {
             submitFile.setList(points);
             submitService.create(submitFile);
         }catch (ResultException e){
+            e.printStackTrace();
             result.setSuccess(false);
             result.setMessage(e.getMessage());
         }
@@ -383,9 +384,6 @@ public class AdminController {
     @ApiOperation("新增专业相关接口")
     @RequestMapping(value = "/major/createMajor" , method = RequestMethod.POST)
     public BaseDto createMajor(@RequestBody Major major){
-        if(major.getpId() == 0){
-            major.setpId(-1);
-        }
         majorService.create(major);
         return new BaseDto() ;
     }
diff --git a/src/main/java/com/sincere/student/controller/AppController.java b/src/main/java/com/sincere/student/controller/AppController.java
index 432f7ff..690d9f5 100644
--- a/src/main/java/com/sincere/student/controller/AppController.java
+++ b/src/main/java/com/sincere/student/controller/AppController.java
@@ -255,13 +255,13 @@ public class AppController {
         return result ;
     }
 
-    @ApiOperation("留言板详情，管理回复 接口")
-    @RequestMapping(value = "/message/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto){
-        BaseDto<Message> result = new BaseDto<>();
-        result.setData(messageService.getDetail(idDto.getId()));
-        return result ;
-    }
+//    @ApiOperation("留言板详情，管理回复 接口")
+//    @RequestMapping(value = "/message/getDetail" , method = RequestMethod.POST)
+//    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto){
+//        BaseDto<Message> result = new BaseDto<>();
+//        result.setData(messageService.getDetail(idDto.getId()));
+//        return result ;
+//    }
 
     @ApiOperation("留言")
     @RequestMapping(value = "/message/create" , method = RequestMethod.POST)
diff --git a/src/main/java/com/sincere/student/controller/CommonController.java b/src/main/java/com/sincere/student/controller/CommonController.java
index 566af54..f0cc533 100644
--- a/src/main/java/com/sincere/student/controller/CommonController.java
+++ b/src/main/java/com/sincere/student/controller/CommonController.java
@@ -1,5 +1,7 @@
 package com.sincere.student.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.sincere.student.dto.Province;
 import com.sincere.student.model.Area;
 import com.sincere.student.service.CommonService;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +23,8 @@ public class CommonController {
 
     private static List<Area> list = new ArrayList<>();
 
+    private static List<Province> provinces = new ArrayList<>();
+
     @ApiOperation("省份")
     @RequestMapping(value = "getProvince",method = RequestMethod.GET)
     public List<Area> getProvince(){
@@ -47,6 +51,48 @@ public class CommonController {
         return list ;
     }
 
+    @ApiOperation("省份")
+    @RequestMapping(value = "getProvince2",method = RequestMethod.GET)
+    public List<Province> getProvince2(){
+        if(provinces.size() == 0){
+            if(list.size() == 0){
+                List<Area> areas = commonService.getProvince();
+                for(Area area : areas){
+                    List<Area> cityList = commonService.getCity(area.getCode());
+                    if(area.getName().contains("市")){
+                        //获取全部
+                        area.setList(cityList);
+                    }else {
+                        //获取4位的市
+                        List<Area> trueCityList = new ArrayList<>();
+                        for(Area city : cityList){
+                            if(city.getCode().length() < 6){
+                                trueCityList.add(city);
+                            }
+                        }
+                        area.setList(trueCityList);
+                    }
+                }
+                list = areas ;
+            }
+            for(Area area : list){
+                Province province = new Province() ;
+                province.setValue(area.getName());
+                province.setLabel(area.getName());
+                List<Province> cityList = new ArrayList<>();
+                for(Area city : area.getList()){
+                    Province newCity = new Province();
+                    newCity.setLabel(city.getName());
+                    newCity.setValue(city.getName());
+                    cityList.add(newCity);
+                }
+                province.setChildren(cityList);
+                provinces.add(province);
+            }
+        }
+        return provinces ;
+    }
+
     @ApiOperation("市")
     @RequestMapping(value = "getCity",method = RequestMethod.GET)
     public List<Area> getCity(String code){
diff --git a/src/main/java/com/sincere/student/dto/Province.java b/src/main/java/com/sincere/student/dto/Province.java
new file mode 100644
index 0000000..b8613ad
--- /dev/null
+++ b/src/main/java/com/sincere/student/dto/Province.java
@@ -0,0 +1,34 @@
+package com.sincere.student.dto;
+
+import java.util.List;
+
+public class Province {
+
+    private String value ;
+    private String label ;
+    private List<Province> children ;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public List<Province> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<Province> children) {
+        this.children = children;
+    }
+}
diff --git a/src/main/java/com/sincere/student/mapper/UniversityMajorMapper.java b/src/main/java/com/sincere/student/mapper/UniversityMajorMapper.java
index b595889..24830ee 100644
--- a/src/main/java/com/sincere/student/mapper/UniversityMajorMapper.java
+++ b/src/main/java/com/sincere/student/mapper/UniversityMajorMapper.java
@@ -1,5 +1,6 @@
 package com.sincere.student.mapper;
 
+import com.sincere.student.model.Major;
 import com.sincere.student.model.UniversityMajor;
 
 import java.util.List;
@@ -11,7 +12,7 @@ public interface UniversityMajorMapper {
 
     int deleteByUniversityId(int universityId);
 
-    List<String> selectUniversityMajor(int universityId);
+    List<Major> selectUniversityMajor(int universityId);
 
     Integer selectIdByMajor(Map<String,String> map);
 }
diff --git a/src/main/java/com/sincere/student/model/Major.java b/src/main/java/com/sincere/student/model/Major.java
index f3b8795..5249aa7 100644
--- a/src/main/java/com/sincere/student/model/Major.java
+++ b/src/main/java/com/sincere/student/model/Major.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
 @ApiModel
 public class Major {
@@ -15,10 +16,20 @@ public class Major {
     @ApiModelProperty(value = "必传 专业编码")
     private String majorCode ;
     @ApiModelProperty(value = "父级专业id") //-1 说明是一级专业
-    private int pId ;
+    private int pid ;
     @ApiModelProperty(value = "创建时间")
     private Date createTime ;
 
+    private List<Major> children ;
+
+    public List<Major> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<Major> children) {
+        this.children = children;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -51,11 +62,11 @@ public class Major {
         this.majorCode = majorCode;
     }
 
-    public int getpId() {
-        return pId;
+    public int getPid() {
+        return pid;
     }
 
-    public void setpId(int pId) {
-        this.pId = pId;
+    public void setPid(int pid) {
+        this.pid = pid;
     }
 }
diff --git a/src/main/java/com/sincere/student/model/Message.java b/src/main/java/com/sincere/student/model/Message.java
index 53feee3..79da53a 100644
--- a/src/main/java/com/sincere/student/model/Message.java
+++ b/src/main/java/com/sincere/student/model/Message.java
@@ -18,7 +18,16 @@ public class Message {
     private String phone;
     @ApiModelProperty(value = "不用传")
     private Date createTime;
+    @ApiModelProperty(value = "相差的时间")
+    private Long[] distanceTimes ;
 
+    public Long[] getDistanceTimes() {
+        return distanceTimes;
+    }
+
+    public void setDistanceTimes(Long[] distanceTimes) {
+        this.distanceTimes = distanceTimes;
+    }
 
     private List<Reply> list ;
 
diff --git a/src/main/java/com/sincere/student/model/University.java b/src/main/java/com/sincere/student/model/University.java
index 6b5fd54..5fa6788 100644
--- a/src/main/java/com/sincere/student/model/University.java
+++ b/src/main/java/com/sincere/student/model/University.java
@@ -32,7 +32,7 @@ public class University {
     @ApiModelProperty(value = "创建时间")
     private Date createTime ;
     @ApiModelProperty(value = "专业列表,展示用")
-    private List<String> majorList ;
+    private List<Major> majorList ;
 
     public String getLogoUrl() {
         return logoUrl;
@@ -122,11 +122,11 @@ public class University {
         this.createTime = createTime;
     }
 
-    public List<String> getMajorList() {
+    public List<Major> getMajorList() {
         return majorList;
     }
 
-    public void setMajorList(List<String> majorList) {
+    public void setMajorList(List<Major> majorList) {
         this.majorList = majorList;
     }
 }
diff --git a/src/main/java/com/sincere/student/model/Video.java b/src/main/java/com/sincere/student/model/Video.java
index c3fc1c6..170eaec 100644
--- a/src/main/java/com/sincere/student/model/Video.java
+++ b/src/main/java/com/sincere/student/model/Video.java
@@ -30,6 +30,16 @@ public class Video {
     private String imgUrl ;
     @ApiModelProperty(value = "视频时长")
     private String duration ;
+    @ApiModelProperty(value = "视频名称 展示用")
+    private String videoName ;
+
+    public String getVideoName() {
+        return videoName;
+    }
+
+    public void setVideoName(String videoName) {
+        this.videoName = videoName;
+    }
 
     public String getDuration() {
         return duration;
diff --git a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java
index e16a764..808c353 100644
--- a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java
@@ -26,7 +26,7 @@ public class MajorServiceImpl implements MajorService {
             major.setMajor("%"+majorSearchDto.getSearch()+"%");
         }
         if(majorSearchDto.getPid() != 0){
-            major.setpId(majorSearchDto.getPid());
+            major.setPid(majorSearchDto.getPid());
         }
         PageHelper.startPage(majorSearchDto.getPage(),majorSearchDto.getPageSize());
         List<Major> list = majorMapper.getList(major);
@@ -37,8 +37,8 @@ public class MajorServiceImpl implements MajorService {
 
     @Override
     public int create(Major major) {
-        if(major.getpId() == 0){ //说明是一级专业
-            major.setpId(-1);
+        if(major.getPid() == 0){ //说明是一级专业
+            major.setPid(-1);
         }
         return majorMapper.create(major);
     }
diff --git a/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java b/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java
index 0ff0108..d38349a 100644
--- a/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java
@@ -7,11 +7,15 @@ import com.sincere.student.mapper.UniversityReplyMapper;
 import com.sincere.student.model.Message;
 import com.sincere.student.model.Reply;
 import com.sincere.student.service.MessageService;
+import com.sincere.student.utils.DateUtils;
 import com.sincere.student.utils.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class MessageServiceImpl implements MessageService {
 
@@ -28,7 +32,11 @@ public class MessageServiceImpl implements MessageService {
             messageSearchDto.setSearch("%"+messageSearchDto.getSearch()+"%");
         }
         PageHelper.startPage(messageSearchDto.getPage(),messageSearchDto.getPageSize());
-        page.setList(messageMapper.getList(messageSearchDto));
+        List<Message> list = messageMapper.getList(messageSearchDto) ;
+        for(Message message : list){
+            message.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),message.getCreateTime()));
+        }
+        page.setList(list);
         page.setCount(messageMapper.getListCount(messageSearchDto));
         return page;
     }
diff --git a/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java b/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
index 76fca4c..b58212d 100644
--- a/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
@@ -101,6 +101,6 @@ public class SubmitServiceImpl implements SubmitService {
                 pointMapper.insertBatch(list);
             }
         }
-        return submitFileMapper.updateByPrimaryKey(submitFile);
+        return submitFileMapper.updateByPrimaryKeySelective(submitFile);
     }
 }
diff --git a/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java b/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
index 9f435df..e2ebe07 100644
--- a/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
@@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class VideoServiceImpl implements VideoService {
 
@@ -35,8 +37,14 @@ public class VideoServiceImpl implements VideoService {
         if(StringUtils.isNotBlank(dto.getUniversityName())){
             dto.setUniversityName("%"+dto.getUniversityName()+"%");
         }
+
         PageHelper.startPage(dto.getPage(),dto.getPageSize());
-        page.setList(videoMapper.getList(dto));
+        List<Video> list = videoMapper.getList(dto);
+        for(Video video : list){
+            String fileName = video.getVideoUrl().substring(video.getVideoUrl().lastIndexOf("/")+1);
+            video.setVideoName(fileName);
+        }
+        page.setList(list);
         page.setCount(videoMapper.getListCount(dto));
         return page;
     }
diff --git a/src/main/java/com/sincere/student/utils/DateUtils.java b/src/main/java/com/sincere/student/utils/DateUtils.java
new file mode 100644
index 0000000..6c90d2c
--- /dev/null
+++ b/src/main/java/com/sincere/student/utils/DateUtils.java
@@ -0,0 +1,32 @@
+package com.sincere.student.utils;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtils {
+
+    public static Long[] getDistanceTimes(Date one, Date two) {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long day = 0;
+        long hour = 0;
+        long min = 0;
+        long sec = 0;
+        long time1 = one.getTime();
+        long time2 = two.getTime();
+        long diff;
+        if (time1 < time2) {
+            diff = time2 - time1;
+        } else {
+            diff = time1 - time2;
+        }
+        day = diff / (24 * 60 * 60 * 1000);
+        hour = (diff / (60 * 60 * 1000) - day * 24);
+        min = ((diff / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        sec = (diff / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+        Long[] times = { day, hour, min, sec };
+        return times;
+    }
+
+}
diff --git a/src/main/java/com/sincere/student/utils/ExcelUtils.java b/src/main/java/com/sincere/student/utils/ExcelUtils.java
index dce36ff..9483ae6 100644
--- a/src/main/java/com/sincere/student/utils/ExcelUtils.java
+++ b/src/main/java/com/sincere/student/utils/ExcelUtils.java
@@ -1,45 +1,48 @@
 package com.sincere.student.utils;
 
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.OSSObject;
 import com.sincere.student.model.Point;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
 public class ExcelUtils {
 
+    public static OSSClient ossClient = null ;
 
-    public static InputStream GetFileInputStream(String fileUrl){
-        try{
-            URL url = new URL(fileUrl);
-            HttpURLConnection conn = (HttpURLConnection)url.openConnection();
-            //设置超时间为3秒
-            conn.setConnectTimeout(8*1000);
-            //得到输入流
-            InputStream inputStream = conn.getInputStream();
-
-            return inputStream ;
-        }catch (Exception e){
+    private static final String key = "QiuM3PwHTnVotcGy" ;
+    private static final String secret = "Yqs7RlaC1MioZu2YYJ6u0TdeO13VFC" ;
+    private static final String endPoint = "http://oss-cn-hangzhou.aliyuncs.com" ;
+    private static final String bucketName = "szyundisk" ;
+    private static final String domain = "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/" ;
 
+    public static synchronized OSSClient getInstance() {
+        if (ossClient == null) {
+            synchronized (ExcelUtils.class) {
+                if (ossClient == null) {
+                    ossClient = new OSSClient(endPoint, key, secret);
+                }
+            }
         }
-        return null ;
+        return ossClient;
     }
 
     public static List<Point> analysisExcel(String url) throws ResultException{
+        InputStream inputStream = null ;
+        OSSClient ossClient = getInstance();
+        OSSObject object = ossClient.getObject(bucketName,url.replace(domain,""));
         try{
             File excelFile = new File(url);
             // 获得工作簿
             String file = excelFile.getName();
             Workbook workbook = null;
-            InputStream inputStream = GetFileInputStream(url);
-            //InputStream inputStream = new FileInputStream(url);
+            inputStream = object.getObjectContent();
             if(inputStream == null){
                 throw new ResultException(901,"路径错误");
             }
@@ -87,8 +90,15 @@ public class ExcelUtils {
             }
             return list ;
         }catch (Exception e){
-            e.printStackTrace();
             throw new ResultException(999,"系统错误");
+        }finally {
+            try{
+                inputStream.close();
+                object.close();
+            }catch (Exception e){
+
+            }
+
         }
     }
 }
diff --git a/src/main/resources/mapper/MajorMapper.xml b/src/main/resources/mapper/MajorMapper.xml
index 6548646..79fc53c 100644
--- a/src/main/resources/mapper/MajorMapper.xml
+++ b/src/main/resources/mapper/MajorMapper.xml
@@ -6,15 +6,15 @@
         <id column="id" property="id"/>
         <result column="major" property="major"/>
         <result column="major_code" property="majorCode"/>
-        <result column="p_id" property="pId"/>
+        <result column="p_id" property="pid"/>
         <result column="create_time" property="createTime"/>
     </resultMap>
 
     <select id="getList" parameterType="com.sincere.student.model.Major" resultMap="MajorMap">
         select * from university_major
          <where>
-             <if test="pId != 0">
-                and p_id = #{pId}
+             <if test="pid != 0">
+                and p_id = #{pid}
              </if>
              <if test="major != null and major != ''">
                 and major like #{major}
@@ -25,21 +25,18 @@
     <select id="getListCount" parameterType="com.sincere.student.model.Major" resultType="java.lang.Integer">
         select count(0) from university_major
         <where>
-            <if test="pId >= 0">
-                and p_id = #{pId}
+            <if test="pid != 0">
+                and p_id = #{pid}
             </if>
             <if test="major != null and major != ''">
                 and major like #{major}
             </if>
-            <if test="majorCode != null">
-                and major_code like #{majorCode}
-            </if>
         </where>
     </select>
 
     <insert id="create" parameterType="com.sincere.student.model.Major" >
         insert into university_major (major,major_code,p_id,create_time)
-        values (#{major},#{majorCode},#{pId},GETDATE())
+        values (#{major},#{majorCode},#{pid},GETDATE())
     </insert>
 
     <delete id="delete" parameterType="java.lang.Integer">
diff --git a/src/main/resources/mapper/UniversityMajorMapper.xml b/src/main/resources/mapper/UniversityMajorMapper.xml
index 06b98c0..438444f 100644
--- a/src/main/resources/mapper/UniversityMajorMapper.xml
+++ b/src/main/resources/mapper/UniversityMajorMapper.xml
@@ -7,6 +7,15 @@
         <result column="major_id" property="majorId"/>
     </resultMap>
 
+    <resultMap id="MajorMap" type="com.sincere.student.model.Major">
+        <result column="f_id" property="id"/>
+        <result column="f_major" property="major"/>
+        <collection property="children" ofType="com.sincere.student.model.Major">
+            <result column="s_id" property="id"/>
+            <result column="s_major" property="major"/>
+        </collection>
+    </resultMap>
+
     <insert id="insertBatch" parameterType="java.util.List">
         insert into university_relate_major ( university_id , major_id)
         values
@@ -19,9 +28,11 @@
         delete university_relate_major where university_id = #{universityId}
     </delete>
 
-    <select id="selectUniversityMajor" parameterType="java.lang.Integer" resultType="java.lang.String" >
-        select m.major from  university_relate_major r
-        join university_major m on m.id = r.major_id
+    <select id="selectUniversityMajor" parameterType="java.lang.Integer" resultMap="MajorMap" >
+                select f.id as f_id , f.major as f_major , s.id as s_id  , s.major as s_major from
+         university_major s
+				join university_major f on f.id = s.p_id
+				join university_relate_major r on s.id = r.major_id
         where r.university_id = #{id}
     </select>
     
diff --git a/src/main/resources/mapper/UniversitySubmitFileMapper.xml b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
index d30a85b..92ab88c 100644
--- a/src/main/resources/mapper/UniversitySubmitFileMapper.xml
+++ b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
@@ -165,17 +165,17 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.SubmitFile">
     update university_submit_file
     <set>
-      <if test="title != null">
+      <if test="title != null and title != ''">
         title = #{title,jdbcType=VARCHAR},
       </if>
-      <if test="year != null">
+      <if test="year != null and year != ''">
         year = #{year,jdbcType=VARCHAR},
       </if>
-      <if test="sort != null">
+      <if test="sort != 0">
         sort = #{sort,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+      <if test="fileUrl != null and fileUrl != ''">
+        file_url = #{fileUrl,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
--
libgit2 0.21.0