bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ContingencyRo.java

 package com.yeejoin.amos.fas.business.service.model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class ContingencyRo implements Serializable {
     private String batchNo;
@@ -59,6 +60,8 @@ public class ContingencyRo implements Serializable {
     private String buttonState;
 
     private String stepState;//步骤操作状态
+    
+    private Date createDate = new Date();
 
 	public String getFireEquipmentName() {
 		return fireEquipmentName;
@@ -252,6 +255,20 @@ public class ContingencyRo implements Serializable {
 		this.stepState = stepState;
 	}
 
+	/**
+	 * @return the createDate
+	 */
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	/**
+	 * @param createDate the createDate to set
+	 */
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
 
    
 }

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -291,4 +291,62 @@
         </sql>
     </changeSet>
     
+    <changeSet author="shanqiyun" id="1591672147780-1">
+        <preConditions onFail="MARK_RAN">
+             <viewExists viewName="toip_biz_message"/>
+        </preConditions>
+        <comment>create view toip_biz_message</comment>
+        <sql>
+            DROP VIEW IF EXISTS toip_biz_message;
+            CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `toip_biz_message` AS SELECT
+				`m`.`id` AS `id`,
+				`m`.`time` AS `time`,
+				`m`.`content` AS `content`,
+				`m`.`title` AS `title`,
+				`m`.`type` AS `type`,
+				`m`.`sender` AS `sender`,
+				`m`.`receiver` AS `receiver`,
+				`m`.`reader` AS `reader`,
+				`m`.`biz_id` AS `biz_id`,
+				`m`.`bizclass_name` AS `bizclass_name`,
+				`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `f_equipment` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo' ) ) UNION ALL
+				SELECT
+					`m`.`id` AS `id`,
+					`m`.`time` AS `time`,
+					`m`.`content` AS `content`,
+					`m`.`title` AS `title`,
+					`m`.`type` AS `type`,
+					`m`.`sender` AS `sender`,
+					`m`.`receiver` AS `receiver`,
+					`m`.`reader` AS `reader`,
+					`m`.`biz_id` AS `biz_id`,
+					`m`.`bizclass_name` AS `bizclass_name`,
+					`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `p_point` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.ProtalDataRo' ) ) UNION ALL
+				SELECT
+					`m`.`id` AS `id`,
+					`m`.`time` AS `time`,
+					`m`.`content` AS `content`,
+					`m`.`title` AS `title`,
+					`m`.`type` AS `type`,
+					`m`.`sender` AS `sender`,
+					`m`.`receiver` AS `receiver`,
+					`m`.`reader` AS `reader`,
+					`m`.`biz_id` AS `biz_id`,
+					`m`.`bizclass_name` AS `bizclass_name`,
+					`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `f_risk_source` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo' ) );
+       </sql>
+    </changeSet>
+    
 </databaseChangeLog>
\ No newline at end of file

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

@@ -397,7 +397,7 @@
 			where
 			a.task_no = b.id
 			and a.`status` in ('2','3')
-			and b.org_code = #{orgCode}
+			and (b.org_code = #{orgCode} OR  b.org_code like CONCAT(#{orgCode},'-%'))
 		) pt
 		where #{date} BETWEEN pt.begin_date and pt.end_date
 	</select>
@@ -477,7 +477,7 @@
 		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 = #{org_code}
+		AND (t.org_code like CONCAT(#{orgCode},'-%') OR t.org_code = #{orgCode}) 
 		GROUP BY d.status
 		]]>
 	</select>