Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into CSFAS_V3.0.1.5

YeeAmosFireAutoSysCommon/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>3.0.1.5</version>
+		<version>3.0.1.7</version>
 	</parent>
 
 	<!-- <dependencies>

YeeAmosFireAutoSysService/pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>3.0.1.5</version>
+		<version>3.0.1.7</version>
 	</parent>
 
 	<dependencies>
 	    <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
-            <version>3.0.1.5</version>
+            <version>3.0.1.7</version>
         </dependency>
         
       <dependency>

YeeAmosFireAutoSysStart/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yeejoin.amos</groupId>
         <artifactId>YeeAmosFireAutoSysRoot</artifactId>
-        <version>3.0.1.5</version>
+        <version>3.0.1.7</version>
     </parent>
 
     <dependencies>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysService</artifactId>
-            <version>3.0.1.5</version>
+            <version>3.0.1.7</version>
         </dependency>
     </dependencies>
 

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

@@ -166,26 +166,38 @@
             </if>
     </select>
     <select id="getAssoEquips" resultType="com.yeejoin.amos.fas.business.vo.AssoEquipsVo">
-             select DISTINCT
-                 sto.id as equipmentId,
-                 spe.code as equipmentCode,
-                 det.name as equipmentName ,
-                 fqe.name as importantEquipName ,
-                 group_concat( concat( speind.equipment_index_name, '##', poin.state ) ) AS equipmentPointNames,
-                 poin.important_equipment_id as importantEquipId,
-                 fmea_id as  fmeaId
-             from
-                 f_fmea_equipment_point as poin
-                 left join f_equipment as fqe on poin.important_equipment_id = fqe.id
-                 left join wl_equipment_specific_index as speind on poin.equipment_point_id = speind.id
-                 left join wl_equipment_specific as spe on speind.equipment_specific_id = spe.id
-                 left join wl_stock_detail as sto on sto.qr_code = spe.qr_code
-                 left join wl_equipment_detail as det on  spe.equipment_detail_id = det.id
-                 left join wl_equipment as equip on det.equipment_id = equip.id
-                <if test="fmeaId != null  ">
-                    where fmea_id = #{fmeaId}
-                </if>
-                 limit #{pageNumber},#{pageSize}
+        SELECT
+        sto.id AS equipmentId,
+        spe.code AS equipmentCode,
+        det.name AS equipmentName,
+        fqe.name AS importantEquipName,
+        GROUP_CONCAT( speind.equipment_index_name, '##', poin.state ) AS equipmentPointNames,
+        poin.important_equipment_id AS importantEquipId,
+        fmea_id AS fmeaId
+        FROM
+        f_fmea_equipment_point poin
+        LEFT JOIN f_equipment AS fqe ON poin.important_equipment_id = fqe.id
+        LEFT JOIN wl_equipment_specific_index AS speind ON poin.equipment_point_id = speind.id
+        LEFT JOIN wl_equipment_specific AS spe ON speind.equipment_specific_id = spe.id
+        LEFT JOIN wl_stock_detail AS sto ON sto.qr_code = spe.qr_code
+        LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
+        LEFT JOIN wl_equipment_index ei ON ei.id = speind.equipment_index_id
+        <where>
+            ei.type_code = 'BREAKDOWN'
+            <if test="fmeaId != null  ">
+                AND fmea_id = #{fmeaId}
+            </if>
+            <if test="indexIds.size > 0">
+                AND ei.id IN
+                <foreach collection="indexIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY
+        poin.important_equipment_id,
+        fmeaId
+        limit #{pageNumber},#{pageSize}
     </select>
 
     <select id="findEquipNameById" resultType="String">

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

@@ -327,9 +327,9 @@
 			FROM (
 				SELECT @s :=@s + 1 as `index`, DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date
 				FROM mysql.help_topic,(SELECT @s := 0) temp
-				WHERE @s < 7
 				) temp1
-			left join f_safety_index_change_log S on s.collect_date =  temp1.date AND (S.org_code = #{orgCode} OR S.org_code like CONCAT(#{orgCode},'-%'))
+			left join f_safety_index_change_log S on S.collect_date =  temp1.date
+			where temp1.index < 8 
 			ORDER BY temp1.date
 		]]>
 	</select>
@@ -1360,7 +1360,7 @@
 		left join wl_stock_detail as sto on  sto.qr_code = spe.qr_code
 		left join wl_warehouse_structure as str on sto.warehouse_structure_id = str.source_id
 		left join f_risk_source as risk on str.source_id = risk.source_id
-		where   substr(cat.code ,1,4) = 8501 and risk.source_id is not null
+		where   substr(cat.code ,1,4) = '9204' and risk.source_id is not null
 		<if test="protectObjName != null and protectObjName != ''">
 			AND f.name = #{protectObjName}
 		</if>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.yeejoin.amos</groupId>
 	<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-	<version>3.0.1.5</version>
+	<version>3.0.1.7</version>
 	<packaging>pom</packaging>
 	<name>YeeAmosFireAutoSysRoot</name>