submit

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -68,6 +69,8 @@ public class BusinessFileController extends BaseController {
             List<BusinessFileVo> allFileName = FileUtils.getAllFileNames(filePath.getFilePath());
             allFiles = allFileName.stream().filter(p -> p.getFilePath().contains(filePath.getKeyword())).collect(Collectors.toList());
         }
+        //文件按照时间倒序
+        allFiles = allFiles.stream().sorted(Comparator.comparing(BusinessFileVo::getCreatTime).reversed()).collect(Collectors.toList());
         return getDataTable(allFiles);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFileVo.java

@@ -15,6 +15,6 @@ public class BusinessFileVo {
 
     public BusinessFileVo(String filePath, String creatTime) {
         this.filePath = filePath;
-        this.creatTime = creatTime;
+        this.creatTime = creatTime == null ? "" : creatTime;
     }
 }

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -337,12 +337,12 @@
             <if test="buildProperty != null">build_property = #{buildProperty},</if>
             <if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if>
             <if test="projectDetails != null">project_details = #{projectDetails},</if>
-            <if test="provinceName != null">province_name = #{provinceName},</if>
-            <if test="provinceId != null">province_id = #{provinceId},</if>
-            <if test="cityName != null">city_name = #{cityName},</if>
-            <if test="cityId != null">city_id = #{cityId},</if>
-            <if test="districtName != null">district_name = #{districtName},</if>
-            <if test="districtId != null">district_id = #{districtId},</if>
+            province_name = #{provinceName},
+            province_id = #{provinceId},
+            city_name = #{cityName},
+            city_id = #{cityId},
+            district_name = #{districtName},
+            district_id = #{districtId},
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectCategory != null">project_category = #{projectCategory},</if>
             <if test="isPrivate != null">is_private = #{isPrivate},</if>