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

@@ -47,12 +47,12 @@
                 (select
                     sum(USER_COUNT)
                 FROM hpjx.t_hpsc008
-                where DELETE_FLAG = 0 and COMPANY_CODE = #companyCode# and left(REGISTER_DATE,6) = left(#date#,4) and REGISTER_DATE <![CDATA[<=]]> #date# and FACTORY_CODE = #factorycode# ) as YGL,
+                where DELETE_FLAG = 0 and COMPANY_CODE = #companyCode# and left(REGISTER_DATE,4) = left(#date#,4) and REGISTER_DATE <![CDATA[<=]]> #date# and FACTORY_CODE = #factorycode# ) as YGL,
                 0 as JHCL,
                 (select
                     sum(WEIGHT)
                 FROM hpjx.t_hpsc008
-                where DELETE_FLAG = 0 and COMPANY_CODE = #companyCode# and left(REGISTER_DATE,6) = left(#date#,4) and REGISTER_DATE <![CDATA[<=]]> #date# and FACTORY_CODE = #factorycode# ) as SJCL
+                where DELETE_FLAG = 0 and COMPANY_CODE = #companyCode# and left(REGISTER_DATE,4) = left(#date#,4) and REGISTER_DATE <![CDATA[<=]]> #date# and FACTORY_CODE = #factorycode# ) as SJCL
                 from dual) a
         </select>
 
@@ -266,7 +266,7 @@
         <select id="queryMaxDate" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
                 SELECT
                 MAX(REGISTER_DATE)	as "registerDate"  <!-- 最新登记日期 -->
-                FROM ${hpjxSchema}.T_HPXS001
+                FROM ${hpjxSchema}.t_hpsc008
                 WHERE 1=1 AND DELETE_FLAG = 0
                 <isNotEmpty prepend=" AND " property="companyCode">
                         COMPANY_CODE = #companyCode#

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC008.xml

@@ -540,7 +540,7 @@
 	<select id="queryMaxDate" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT
 			MAX(REGISTER_DATE)	as "registerDate"  <!-- 最新登记日期 -->
-		FROM ${hpjxSchema}.T_HPXS001
+		FROM ${hpjxSchema}.t_hpsc008
 		WHERE 1=1 AND DELETE_FLAG = 0
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#