Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT003.xml

@@ -150,7 +150,7 @@
                 select
                 a.GROUP_NAME as SERIES,
                 concat(substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 4 day),'-',''),5,2),'/',substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 4 day),'-',''),7,2)) as X,
-                ifnull(sum(WEIGHT),0) as VALUE
+                sum(ifnull(WEIGHT,0)+ifnull(WEIGHT_JH,0))/2 as VALUE
                 ,replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 4 day),'-','') as date,
                 case when right(a.GROUP_NAME,2) = '一组' then 1
                 when right(a.GROUP_NAME,2) = '二组' then 2
@@ -168,7 +168,7 @@
                 select
                 a.GROUP_NAME as SERIES,
                 concat(substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 3 day),'-',''),5,2),'/',substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 3 day),'-',''),7,2)) as X,
-                ifnull(sum(WEIGHT),0) as VALUE
+                sum(ifnull(WEIGHT,0)+ifnull(WEIGHT_JH,0))/2 as VALUE
                 ,replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 3 day),'-','') as date,
                 case when right(a.GROUP_NAME,2) = '一组' then 1
                 when right(a.GROUP_NAME,2) = '二组' then 2
@@ -186,7 +186,7 @@
                 select
                 a.GROUP_NAME as SERIES,
                 concat(substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 2 day),'-',''),5,2),'/',substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 2 day),'-',''),7,2)) as X,
-                ifnull(sum(WEIGHT),0) as VALUE
+                sum(ifnull(WEIGHT,0)+ifnull(WEIGHT_JH,0))/2 as VALUE
                 ,replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 2 day),'-','') as date,
                 case when right(a.GROUP_NAME,2) = '一组' then 1
                 when right(a.GROUP_NAME,2) = '二组' then 2
@@ -204,7 +204,7 @@
                 select
                 a.GROUP_NAME as SERIES,
                 concat(substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 1 day),'-',''),5,2),'/',substring(replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 1 day),'-',''),7,2)) as X,
-                ifnull(sum(WEIGHT),0) as VALUE
+                sum(ifnull(WEIGHT,0)+ifnull(WEIGHT_JH,0))/2 as VALUE
                 ,replace(date_sub(str_to_date(#date#,'%Y%m%d'), INTERVAL 1 day),'-','') as date,
                 case when right(a.GROUP_NAME,2) = '一组' then 1
                 when right(a.GROUP_NAME,2) = '二组' then 2
@@ -222,7 +222,7 @@
                 select
                 a.GROUP_NAME as SERIES,
                 concat(substring(#date#,5,2),'/',substring(#date#,7,2)) as X,
-                ifnull(sum(WEIGHT),0) as VALUE
+                sum(ifnull(WEIGHT,0)+ifnull(WEIGHT_JH,0))/2 as VALUE
                 ,#date# as date,
                 case when right(a.GROUP_NAME,2) = '一组' then 1
                 when right(a.GROUP_NAME,2) = '二组' then 2