Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3,7 +3,7 @@
 <sqlMap namespace="HPMT002">
 
 	<select id="pmProject" resultClass="java.util.HashMap">
-            SELECT * FROM (
+<!--            SELECT * FROM (-->
         SELECT
         ID as "id",
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
@@ -43,12 +43,12 @@
              PROJ_NAME LIKE CONCAT('%', #projName#, '%')
             </isNotEmpty>
         order by STATUS,PLAN_COMPLETION_DATE
-            ) AS A WHERE actualCompletionNum!=num
+<!--            ) AS A WHERE actualCompletionNum!=num-->
         limit #offset#, #pageSize#
 	</select>
 
         <select id="pmProjectCount" resultClass="java.util.HashMap">
-                SELECT * FROM (
+<!--                SELECT * FROM (-->
                 SELECT
                 ID as "id",
                 COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
@@ -88,7 +88,7 @@
                         PROJ_NAME LIKE CONCAT('%', #projName#, '%')
                 </isNotEmpty>
                 order by STATUS,PLAN_COMPLETION_DATE
-                ) AS A WHERE actualCompletionNum!=num
+             <!--   ) AS A WHERE actualCompletionNum!=num-->
         </select>
 
         <select id="pmQuality" resultClass="java.util.HashMap">