*）增加近30天条件

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -147,16 +147,13 @@
 				LEFT JOIN idx_biz_jg_use_info ibjuj ON tac.equipment_id = ibjuj.RECORD
 				LEFT JOIN cb_data_dictionary cdd ON ibjuj.USE_PLACE = cdd.sequence_nbr
 		WHERE
-			biz_org_code LIKE concat(#{regionCode}, '%')
+			tac.biz_org_code LIKE concat(#{regionCode}, '%')
 		  AND (tac.alarm_type_code = '960' or tac.alarm_type_code = '961')
 		  AND
 			ibjuj.USE_PLACE is NOT NULL
 		  AND cdd.NAME is NOT NULL
-			<if test="dto.beginDate !=null and dto.beginDate !=''">
-				and date_ge(CAST(tac.call_time as date),#{dto.beginDate})
-			</if>
-			<if test="dto.endDate !=null and dto.endDate !=''">
-				and date_le(CAST(tac.call_time as date),#{dto.endDate})
+			<if test="dto.beginDate !=null and dto.beginDate !='' and dto.endDate !=null and dto.endDate !=''">
+				AND tac.call_time BETWEEN #{dto.beginDate} AND #{dto.endDate}
 			</if>
 		GROUP BY
 			cdd.NAME

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -133,6 +133,9 @@ public class DPStatisticsServiceImpl {
 
     public JSONObject eventStatByLocation(DPFilterParamDto dpFilterParamDto) throws Exception {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto);
+        dpFilterParamDto.setBeginDate(DateUtil.formatDate(DateTimeUtil.getMinValueOfOneDay(DateTimeUtil.addMonths(new Date(), -1)), DateUtil.Y_M_D_HMS));
+        dpFilterParamDto.setEndDate(DateUtil.formatDate(DateTimeUtil.getMaxValueOfOneDay(new Date()), DateUtil.Y_M_D_HMS));
+
         List<Map<String, Object>> maps = alertCalledMapper.queryListByLocation(orgCode, dpFilterParamDto);
         List<Object> xdata = maps.stream().map(item -> item.get("name")).collect(Collectors.toList());
         List<Object> ydata = maps.stream().map(item -> item.get("majorAlertCount")).collect(Collectors.toList());