修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java

@@ -12,13 +12,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -68,7 +62,7 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		WordTemplateUtils instance = WordTemplateUtils.getInstance();
 		Map<String, Object> map = getWordMap(code, startDate, endDate);
 		try {
-			instance.exportMillCertificateWord(request, response, map, (String) map.get("document_number"),
+			instance.exportMillCertificateWord(request, response, map, (String) map.get("document_name"),
 					WordTemplateTypeEum.firePatrolReport.getTemplateFile());
 		} catch (IOException e) {
 			throw new CommonException(0, "下载装备巡查报表失败");
@@ -94,6 +88,8 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		String timeStr1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
 		String documentNumber = "ZD-XFSBXC" + timeStr1;
 		map.put("document_number", documentNumber);
+		// 设置文档文件名
+		map.put("document_name", "消防巡查报表" + timeStr1);
 		// 换流站名称
 		String stationName=(String) station.get("biz_org_name");
 		map.put("station_name", stationName);
@@ -111,7 +107,7 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		}
 		 NumberFormat nf = NumberFormat.getNumberInstance();
 		 nf.setMaximumFractionDigits(0);
-		SimpleDateFormat dateFm = new SimpleDateFormat("EEEE");
+		SimpleDateFormat dateFm = new SimpleDateFormat("EEEE", Locale.SIMPLIFIED_CHINESE);
 		String currSun = dateFm.format(new Date());
 		map.put("create_date", timeStr2 + currSun);
 		map.put("create_date2", timeStr2);

amos-boot-system-equip/src/main/resources/ftl/FirePatrolReport.ftl

@@ -668,7 +668,7 @@
                         <w:sz-cs w:val="44"/>
                         <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
                     </w:rPr>
-                    <w:t>${(station_name)!'XX'}换流站</w:t>
+                    <w:t>${(station_name)!'XX'}</w:t>
                 </w:r>
             </w:p>
             <w:p>
@@ -930,7 +930,7 @@
                         <w:sz-cs w:val="30"/>
                         <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>
                     </w:rPr>
-                    <w:t>${(station_name)!'XX'}换流站${(statistical_time2)!'XXXX年XX月XX日-XXXX年XX月XX日'}消防设施巡查工作执行情况如下</w:t>
+                    <w:t>${(station_name)!'XX'}${(statistical_time2)!'XXXX年XX月XX日-XXXX年XX月XX日'}消防设施巡查工作执行情况如下</w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -4996,7 +4996,7 @@
                         <w:sz-cs w:val="30"/>
                         <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
                     </w:rPr>
-                    <w:t>${(station_name)!'XX'}换流站</w:t>
+                    <w:t>${(station_name)!'XX'}</w:t>
                 </w:r>
             </w:p>
             <w:p>

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -18,7 +18,7 @@
 			wl_analysis_report_log,cb_org_usr
 		<where>
 			 cb_org_usr.biz_org_type = 'COMPANY' AND parent_id IS NOT NULL
-			 <if test="analysisReportLog.reportType != null and analysisReportLog.reportType != ''">
+			 <if test="analysisReportLog.reportType != null">
 			 AND wl_analysis_report_log.report_type = #{analysisReportLog.reportType}
 			 </if>
 			 <if test="analysisReportLog.startDate != null">
@@ -30,7 +30,9 @@
 			 <if test="analysisReportLog.stationCode != null">
 			 AND cb_org_usr.biz_org_code = #{analysisReportLog.stationCode} 
 			 </if>
-		</where>  
+		</where>
+		ORDER BY
+		report_date_desc DESC
     </select>
     
      <select id="getStation" resultType="Map">