修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -23,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -44,6 +45,7 @@ public class PlanVisual3dController extends BaseController {
     @Autowired
     private IPlanVisual3dService planVisual3dService;
 
+    @Lazy
     @Autowired
     private IEmergencyTaskService emergencyTaskService;
 

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -127,25 +127,25 @@
 	</select>
 
     <select id="getStatisticsCheck" resultType="java.util.HashMap">
-		<![CDATA[
         SELECT IFNULL(d.STATUS,'') AS type, count(1) as value
-		FROM p_plan_task_detail d
-		left JOIN p_plan_task t on t.id=d.task_no
-		WHERE
-		DATEDIFF(t.begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(t.end_time,CURRENT_DATE) >= 0
-		AND (t.org_code like CONCAT(#{orgCode},'-%') OR t.org_code = #{orgCode})
-		AND d.status = 0
-		UNION ALL
-			select
-				is_ok as type,count(1) as value
-			from p_check a
-			where
-				TO_DAYS(a.check_time) = TO_DAYS(CURRENT_DATE)
-				<if test="orgCode != null and orgCode != ''">
-			  		AND (a.org_code like CONCAT(#{orgCode},'%') OR a.org_code = #{orgCode})
-				</if>
+			FROM p_plan_task_detail d
+			left JOIN p_plan_task t on t.id=d.task_no
+			WHERE
+			DATEDIFF(t.begin_time,CURRENT_DATE) <![CDATA[<=]]> 0 AND DATEDIFF(t.end_time,CURRENT_DATE) <![CDATA[>=]]> 0
+			<if test="orgCode != null and orgCode != ''">
+				AND (t.org_code like CONCAT(#{orgCode},'%') OR t.org_code = #{orgCode})
+			</if>
+			AND d.status = 0
+			UNION ALL
+				select
+					is_ok as type,count(1) as value
+				from p_check a
+				where
+					TO_DAYS(a.check_time) = TO_DAYS(CURRENT_DATE)
+					<if test="orgCode != null and orgCode != ''">
+			  			AND (a.org_code like CONCAT(#{orgCode},'%') OR a.org_code = #{orgCode})
+					</if>
 			GROUP BY a.is_ok
-		]]>
 	</select>
 
     <select id="getRiskErrorTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">