Merge branch 'dev-sx' of ssh://10.70.33.7:32359/smart/hp-smart into dev

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

@@ -88,7 +88,7 @@
 
     <select id="queryDev" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002A">
         SELECT
-        <include refid="column"/>
+        <include refid="columnDev"/>
         FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
         <include refid="conditionDev"/>
@@ -105,7 +105,7 @@
 
     <select id="queryRun" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002A">
         SELECT
-        <include refid="column"/>
+        <include refid="columnRun"/>
         FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM05 B
         WHERE 1=1
         <include refid="conditionRun"/>

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

@@ -106,7 +106,7 @@
 
     <select id="queryDev" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002B">
         SELECT
-        <include refid="column"/>
+        <include refid="columnDev"/>
         FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
         <include refid="conditionDev"/>
@@ -123,7 +123,7 @@
 
     <select id="queryRun" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002B">
         SELECT
-        <include refid="column"/>
+        <include refid="columnRun"/>
         FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM05 B
         WHERE 1=1
         <include refid="conditionRun"/>

src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001A.xml

@@ -66,6 +66,24 @@
 		</isNotEmpty>
 	</sql>
 
+    <!-- 开发环境 -->
+    <sql id="conditionDev">
+        AND A.DOC_ID = B.DOC_ID
+        <include refid="condition"/>
+        <isNotEmpty prepend=" AND " property="docName">
+            B.DOC_NAME LIKE CONCAT('%', #docName#, '%')
+        </isNotEmpty>
+    </sql>
+
+    <!-- 正式环境 -->
+    <sql id="conditionRun">
+        AND A.DOC_ID = B.RES_ID
+        <include refid="condition"/>
+        <isNotEmpty prepend=" AND " property="docName">
+            B.RES_CNAME LIKE CONCAT('%', #docName#, '%')
+        </isNotEmpty>
+    </sql>
+
     <sql id="customCondition">
         <isNotEmpty prepend=" AND " property="createdDateFrom">
             A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
@@ -91,8 +109,7 @@
         <include refid="columnDev"/>
         FROM ${hpjxSchema}.T_HPZL001A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
-        AND A.DOC_ID = B.DOC_ID
-        <include refid="condition"/>
+        <include refid="conditionDev"/>
         <include refid="customCondition"/>
         <include refid="order"/>
     </select>
@@ -100,7 +117,7 @@
     <select id="countDev" resultClass="int">
         SELECT COUNT(*) FROM ${hpjxSchema}.T_HPZL001A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
-        <include refid="condition"/>
+        <include refid="conditionDev"/>
         <include refid="customCondition"/>
     </select>
 
@@ -109,8 +126,7 @@
         <include refid="columnRun"/>
         FROM ${hpjxSchema}.T_HPZL001A A, ${platSchema}.TEUDM05 B
         WHERE 1=1
-        AND A.DOC_ID = B.RES_ID
-        <include refid="condition"/>
+        <include refid="conditionRun"/>
         <include refid="customCondition"/>
         <include refid="order"/>
     </select>
@@ -118,7 +134,7 @@
     <select id="countRun" resultClass="int">
         SELECT COUNT(*) FROM ${hpjxSchema}.T_HPZL001A A, ${platSchema}.TEUDM05 B
         WHERE 1=1
-        <include refid="condition"/>
+        <include refid="conditionRun"/>
         <include refid="customCondition"/>
     </select>