Merge branch 'dev-2.2.0' of depot-qinghai/depot-storage-qinghai into dev

src/main/java/com/chinaitop/depot/warningAndAlarm/mapper/TimedTaskMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.chinaitop.depot.warningAndAlarm.mapper.TimedTaskMapper" >
 
   <select id="selectYlwl" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
-    select * from (
+    select 
+      id, orgId, ch, hwh, lspz, lsxz, kcsl, scnf, zhycrq, cbnx, cccxrq, bjlx, bjrq
+    from (
        SELECT 
          REPLACE(UUID(), '-', '') id,a.UnitID orgId,a.ch, a.hwh, a.pz lspz, a.hwxz lsxz, a.kcsl, e1.enumName scnf,
          DATE_FORMAT(a.rq, '%Y-%m-%d') zhycrq,
@@ -23,40 +25,61 @@
          DATE_FORMAT(NOW(), '%Y-%m-%d') bjrq
 	   FROM crk_qh.data_kcgl_kcsw_default a 
 	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
+	   LEFT JOIN (
+         SELECT m1.ch, m1.hwh
+         from crk_qh.data_kcgl_fcbgz_default m1 
+         INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
+         INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
+         WHERE zcsl > 0
+         ORDER BY m1.rq asc
+         LIMIT 1
+       ) b on b.hwh=a.hwh
     ) datas
     WHERE 1=1 
     and DATE_FORMAT(NOW(), '%Y-%m-%d') > DATE_FORMAT(datas.cccxrq, '%Y-%m-%d')
+    and IFNULL(ckhwh, '')=''
   </select>
 
   <select id="selectLhyj" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
-    select * from (
-       SELECT 
-         REPLACE(UUID(), '-', '') id,a.UnitID orgId,a.ch, a.hwh, a.pz lspz, a.hwxz lsxz, a.kcsl, e1.enumName scnf, 
-         DATE_FORMAT(a.rq, '%Y-%m-%d') zhycrq,
-         CASE a.pz 
-    	   WHEN '3164' THEN '5年' 
-    	   WHEN '3166' THEN '3年' 
-    	   WHEN '3170' THEN '3年' 
-    	   ELSE NULL 
-  	     END cbnx,
-  	     CASE a.pz 
-    	   WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-12-31') 
-    	   WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
-    	   WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
-    	   ELSE NULL 
-  	     END cccxrq,
-         '0' bjlx,
-         CASE a.pz 
-    	   WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-09-30') 
-    	   WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
-    	   WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
-    	   ELSE NULL 
-  	     END bjrq
-	   FROM crk_qh.data_kcgl_kcsw_default a 
-	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
+    select 
+      id, orgId, ch, hwh, lspz, lsxz, kcsl, scnf, zhycrq, cbnx, cccxrq, bjlx, bjrq 
+    from (
+      SELECT 
+        REPLACE(UUID(), '-', '') id,a.UnitID orgId,a.ch, a.hwh, a.pz lspz, a.hwxz lsxz, a.kcsl, e1.enumName scnf, 
+        DATE_FORMAT(a.rq, '%Y-%m-%d') zhycrq,
+        CASE a.pz 
+    	  WHEN '3164' THEN '5年' 
+    	  WHEN '3166' THEN '3年' 
+    	  WHEN '3170' THEN '3年' 
+    	  ELSE NULL 
+  	    END cbnx,
+  	    CASE a.pz 
+    	  WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-12-31') 
+    	  WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	  WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	  ELSE NULL 
+  	    END cccxrq,
+        '0' bjlx,
+        CASE a.pz 
+    	  WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-09-30') 
+    	  WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
+    	  WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
+    	  ELSE NULL 
+  	    END bjrq,
+        b.hwh ckhwh
+	  FROM crk_qh.data_kcgl_kcsw_default a 
+	  LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
+      LEFT JOIN (
+        SELECT m1.ch, m1.hwh
+        from crk_qh.data_kcgl_fcbgz_default m1 
+        INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
+        INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
+        WHERE zcsl > 0
+        ORDER BY m1.rq DESC
+        LIMIT 1
+      ) b on b.hwh=a.hwh
     ) datas
-    WHERE 1=1 
-    and DATE_FORMAT(NOW(), '%Y-%m-%d') >= DATE_FORMAT(datas.bjrq, '%Y-%m-%d')
+    WHERE 1=1 AND IFNULL(ckhwh, '')='' and DATE_FORMAT(NOW(), '%Y-%m-%d') >= DATE_FORMAT(datas.bjrq, '%Y-%m-%d')
   </select>
 
   <select id="selectJkqjyqzsj" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">