feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>nanyang</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.6</version>
 	<name>main-service</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/resources/mapper/TaDeviceJobMapper.xml

@@ -38,6 +38,7 @@
         <if test="startDate != null and startDate != ''">
             AND t.job_date BETWEEN #{startDate} AND #{endDate}
         </if>
+        AND s.`status` &gt; -1
         ORDER BY
             t.job_date DESC
     </sql>
@@ -72,7 +73,7 @@
             t.*
         FROM
             ta_device_job t
-        LEFT JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+        LEFT JOIN ta_machinery s ON t.machinery_id = s.machinery_id AND s.`status` &gt; -1
         WHERE
             1 = 1
             <if test="deviceKind != null and deviceKind != ''">

src/main/resources/mapper/TaMachineryMapper.xml

@@ -57,6 +57,7 @@
                 OR n.`name` LIKE CONCAT('%', #{q}, '%')
             )
         </if>
+            AND s.`status` &gt; -1
          GROUP BY
             t.org_id,
             t.type_id

src/main/resources/mapper/TdDeviceMapper.xml

@@ -19,7 +19,7 @@
             td_raw_device t
                 LEFT JOIN td_device s ON t.device_kind = s.device_type
                     AND t.device_no = s.device_no AND s.`status` > -1
-                LEFT JOIN ta_machinery m ON s.machinery_id = m.machinery_id
+                LEFT JOIN ta_machinery m ON s.machinery_id = m.machinery_id AND m.`status` > -1
         WHERE 1 = 1
         <if test="deviceType != null and deviceType != ''">
             AND t.device_kind = #{deviceType}
@@ -50,6 +50,7 @@
         WHERE
             t.location IS NOT NULL
           AND t.status &gt; -1
+            AND s.status &gt; -1
           AND t.device_type IN
             <foreach collection="typeList" index="index" item="item" open="(" separator="," close=")">
                 #{item}