修改模板

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -712,16 +712,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
 		// 统计参与人员
 		List<KeyValueLabel> listdate = new ArrayList<>();
-		if(al.getAlertStatus()){
-			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
-		}
+//		if(al.getAlertStatus()){
+//			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
+//		}
 		if(list!=null&&list.size()>0){
 			listdate.add(new KeyValueLabel("调动人力", "useNum", list.size(), "人"));
 		}else{
 			listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
 		}
 
-		listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
+//		listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
 		// 统计参与车辆
 		listdate.add(new KeyValueLabel("调派车辆", "carNum", map.get("carNum"), "辆/次"));
 		// 统计参与队伍

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -1242,11 +1242,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             int listLength = dangerList.size();
             for (int i = 0; i < fSizs; i++) {
                 if(i == 0) {
+
+                    TableStyle tableStyle = new TableStyle();
+                    tableStyle.setAlign(Enum.forString("center"));
+                    reverseList.get(i).getCellDatas().get(0).setCellStyle(tableStyle);
                     Style style = new Style();
                     style.setFontFamily("宋体");
                     style.setFontSize(12);
                     style.setBold(true);
                     reverseList.get(i).getCellDatas().get(0).getRenderData().setStyle(style);
+                    reverseList.get(i).getCellDatas().get(0).getRenderData().setText("增\n援\n力\n量");
                 } else {
                     reverseList.get(i).getCellDatas().forEach(cellRenderData -> {
                         Style style = new Style();
@@ -1265,13 +1270,15 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             for (int i = fSizs; i < listLength  ; i++) {
 
                 TableStyle tableStyle = new TableStyle();
-                tableStyle.setAlign(Enum.forInt(2));
+                tableStyle.setAlign(Enum.forString("center"));
+
                 reverseList.get(i).getCellDatas().get(0).setCellStyle(tableStyle);
                 reverseList.get(i).getCellDatas().get(0).getRenderData().setText("增\n援\n力\n量");
                 Style style = new Style();
                 style.setFontFamily("宋体");
                 style.setFontSize(12);
                 style.setBold(true);
+
                 reverseList.get(i).getCellDatas().get(0).getRenderData().setStyle(style);
 //                  reverseList.get(i).getCellDatas().forEach(cellRenderData -> {
 //                            Style style = new Style();

amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -199,9 +199,29 @@
 	        <if test="equipmentName!=null">
 	            AND d.equipmentName LIKE '%${equipmentName}%'
 	        </if>
-	        <if test="startTime!=null">
-	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
-	        </if>
+
+<!--	        <if test="startTime!=null and endTime!=null ">-->
+<!--	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'-->
+<!--	        </if>-->
+
+          <choose>
+              <when test="startTime!=null and endTime!=null ">
+                  AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
+              </when>
+              <otherwise>
+                  <if test="startTime!=null">
+                      AND d.create_date &gt;= '${startTime}'
+                   </if>
+                  <if test="endTime!=null ">
+                      AND d.create_date  &lt;= '${endTime}'
+                  </if>
+
+              </otherwise>
+          </choose>
+
+
+
+
             <if test="buildId!=null">
                 AND d.buildId in (#{buildId})
                 <!--        AND d.buildId in