代码提交

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/mapper/xml/ZsReportArchieveMapper.xml

@@ -42,7 +42,7 @@
         left join sys_user su on a.archieve_resever = su.id and su.del_flag = '0'
         left join sys_office so on a.office_name = so.name and so.del_flag = '0'
         ${ew.customSqlSegment}
-        ORDER BY a.update_time DESC
+        ORDER BY a.report_no asc, a.update_time DESC
     </select>
 
     <select id="exportList" resultType="com.jeeplus.centrecareful.reportArchieve.service.dto.ZsReportArchieveExport">
@@ -53,7 +53,7 @@
         left join sys_user su on a.archieve_resever = su.id and su.del_flag = '0'
         left join sys_office so on a.office_name = so.name and so.del_flag = '0'
         ${ew.customSqlSegment}
-        ORDER BY a.update_time DESC
+        ORDER BY a.report_no asc
     </select>
 
     <select id="getOfficeNameList" resultType="com.jeeplus.centrecareful.reportArchieve.domain.ZsReportArchieve">

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/ZsReportArchieveService.java

@@ -232,6 +232,9 @@ public class ZsReportArchieveService {
      */
     public String importDecide(List<ZsReportArchieveExport> list, ArrayList<ZsReportArchieveExport> arrayList) throws Exception {
         for (ZsReportArchieveExport reportArchieveDTO : list) {
+            reportArchieveDTO.setReportNo(reportArchieveDTO.getReportNo().replace(" ", ""));
+            reportArchieveDTO.setReportNo(reportArchieveDTO.getReportNo().replace("（", "("));
+            reportArchieveDTO.setReportNo(reportArchieveDTO.getReportNo().replace("）", ")"));
             if(ObjectUtil.isEmpty(reportArchieveDTO)){
                 continue;
             }