app驾驶舱优化

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

@@ -242,9 +242,11 @@
 
 
         <select id="queryPmXMinfo" resultClass="java.util.HashMap">
-                select
+                select a.PROJ_NAME,a.JHDATE,a.JHCL,a.SJCL,a.SCJD,a.FHJD
+                from (select
                 a.PROJ_NAME,
-                concat(left(max(a.PLAN_COMPLETION_DATE),4),'年',substring(max(a.PLAN_COMPLETION_DATE),5,2),'月',right(max(a.PLAN_COMPLETION_DATE),2),'日') as JHDATE,
+                a.DELIVERY_DATE,
+                concat(left(max(a.PLAN_COMPLETION_DATE),4),'/',substring(max(a.PLAN_COMPLETION_DATE),5,2),'/',right(max(a.PLAN_COMPLETION_DATE),2),'/') as JHDATE,
                 concat(format(ifnull(sum(b.NUM*b.UNIT_WT ),0),2),'吨') as JHCL,
                 concat(format(ifnull(sum(c.WEIGHT),0),2),'吨') as SJCL,
                 concat(format((ifnull( sum( c.WEIGHT ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT ), 0 ) * 100),2),'%') as SCJD,
@@ -254,7 +256,8 @@
                 left join  hpjx.T_HPkC003 c on c.PROD_ORDER_NO = b.PROD_ORDER_NO
                 left join  hpjx.T_HPkC004 d on d.PROD_NO = b.PROD_ORDER_NO
                 where a.COMPANY_CODE = #companyCode# and c.FACTORY_CODE  = #factorycode#
-                group by a.PROJ_NAME
+                group by a.PROJ_NAME) a
+                where left(a.SCJD,3) <![CDATA[<>]]> '100' and left(a.FHJD,3) <![CDATA[<>]]> '100' and a.DELIVERY_DATE > DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 3 MONTH), '%Y%m%d')
         </select>
 
         <select id="queryPmCompanyInfo" resultClass="java.util.HashMap">