gaodd преди 1 година
родител
ревизия
ca4620c3fb

+ 1 - 1
src/main/java/com/chinaitop/depot/registrationTable/mapper/RecordWheatInfoMapper.xml

@@ -554,7 +554,7 @@
554
     END
554
     END
555
     ) kcsl
555
     ) kcsl
556
     FROM
556
     FROM
557
-    crk_qh.data_kcgl_qckc_default
557
+    data_kcgl_qckc_default
558
     WHERE
558
     WHERE
559
     1 = 1
559
     1 = 1
560
     <if test="orgId != null">
560
     <if test="orgId != null">

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

@@ -23,13 +23,13 @@
23
   	     END cccxrq,
23
   	     END cccxrq,
24
          '1' bjlx,
24
          '1' bjlx,
25
          DATE_FORMAT(NOW(), '%Y-%m-%d') bjrq
25
          DATE_FORMAT(NOW(), '%Y-%m-%d') bjrq
26
-	   FROM crk_qh.data_kcgl_kcsw_default a 
26
+	   FROM depot_qh.data_kcgl_kcsw_default a 
27
 	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
27
 	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
28
 	   LEFT JOIN (
28
 	   LEFT JOIN (
29
          SELECT m1.ch, m1.hwh
29
          SELECT m1.ch, m1.hwh
30
-         from crk_qh.data_kcgl_fcbgz_default m1 
31
-         INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
32
-         INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
30
+         from depot_qh.data_kcgl_fcbgz_default m1 
31
+         INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
32
+         INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
33
          WHERE zcsl > 0
33
          WHERE zcsl > 0
34
          ORDER BY m1.rq asc
34
          ORDER BY m1.rq asc
35
          LIMIT 1
35
          LIMIT 1
@@ -67,13 +67,13 @@
67
     	  ELSE NULL 
67
     	  ELSE NULL 
68
   	    END bjrq,
68
   	    END bjrq,
69
         b.hwh ckhwh
69
         b.hwh ckhwh
70
-	  FROM crk_qh.data_kcgl_kcsw_default a 
70
+	  FROM depot_qh.data_kcgl_kcsw_default a 
71
 	  LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
71
 	  LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
72
       LEFT JOIN (
72
       LEFT JOIN (
73
         SELECT m1.ch, m1.hwh
73
         SELECT m1.ch, m1.hwh
74
-        from crk_qh.data_kcgl_fcbgz_default m1 
75
-        INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
76
-        INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
74
+        from depot_qh.data_kcgl_fcbgz_default m1 
75
+        INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
76
+        INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
77
         WHERE zcsl > 0
77
         WHERE zcsl > 0
78
         ORDER BY m1.rq DESC
78
         ORDER BY m1.rq DESC
79
         LIMIT 1
79
         LIMIT 1
@@ -98,8 +98,8 @@
98
      LEFT JOIN (
98
      LEFT JOIN (
99
        SELECT 
99
        SELECT 
100
          tzdcb.UnitID,tzdzb.jhdID, tzdcb.chID, tzdcb.hwID, SUM(tzdcb.count) jzrqylrsl, SUM(tzdcb.sysl) jzrqsylrsl
100
          tzdcb.UnitID,tzdzb.jhdID, tzdcb.chID, tzdcb.hwID, SUM(tzdcb.count) jzrqylrsl, SUM(tzdcb.sysl) jzrqsylrsl
101
-       from crk_qh.data_crkyw_tzdxx_default tzdzb
102
-       LEFT JOIN crk_qh.data_crkyw_tzdxx_flt_001 tzdcb on tzdcb.MainDataID=tzdzb.DataID
101
+       from depot_qh.data_crkyw_tzdxx_default tzdzb
102
+       LEFT JOIN depot_qh.data_crkyw_tzdxx_flt_001 tzdcb on tzdcb.MainDataID=tzdzb.DataID
103
        INNER JOIN business_rp_inbound rkjh on rkjh.rp_report_id=tzdzb.jhdID
103
        INNER JOIN business_rp_inbound rkjh on rkjh.rp_report_id=tzdzb.jhdID
104
        GROUP BY tzdzb.jhdID, tzdcb.hwID
104
        GROUP BY tzdzb.jhdID, tzdcb.hwID
105
      ) tzdxx ON tzdxx.jhdID=a.rp_report_id
105
      ) tzdxx ON tzdxx.jhdID=a.rp_report_id
@@ -112,9 +112,9 @@
112
         CASE WHEN CURDATE() > LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) THEN '1' ELSE '0' END jkqzt,
112
         CASE WHEN CURDATE() > LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) THEN '1' ELSE '0' END jkqzt,
113
         LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) jkqjzr,
113
         LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) jkqjzr,
114
         LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) - INTERVAL 15 DAY yjrq
114
         LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) - INTERVAL 15 DAY yjrq
115
-      from crk_qh.data_kcgl_fcbgz_default m1 
116
-      INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
117
-      INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
115
+      from depot_qh.data_kcgl_fcbgz_default m1 
116
+      INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
117
+      INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
118
       WHERE 1=1 
118
       WHERE 1=1 
119
       AND m1.hwh=#{hwh,jdbcType=VARCHAR}
119
       AND m1.hwh=#{hwh,jdbcType=VARCHAR}
120
       AND DATE_FORMAT(m1.rq, "%Y-%m-%d") BETWEEN #{startDate,jdbcType=VARCHAR} AND #{EndDate,jdbcType=VARCHAR}
120
       AND DATE_FORMAT(m1.rq, "%Y-%m-%d") BETWEEN #{startDate,jdbcType=VARCHAR} AND #{EndDate,jdbcType=VARCHAR}