日志查询优化

src/main/java/com/baosight/hpjx/hp/rz/service/ServiceHPRZ001.java

@@ -56,6 +56,7 @@ public class ServiceHPRZ001 extends ServiceBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
+            inInfo.setCell(EiConstant.queryBlock, 0, "companyCode",UserSessionUtils.getCompanyCode());
             inInfo = super.query(inInfo, HPRZ001.QUERY, new HPRZ001());
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hpjx/hp/rz/sql/HPRZ001.xml

@@ -36,10 +36,10 @@
 			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdDateFrom">
-			CREATED_TIME >= #createdDateFrom#
+			CREATED_TIME >= replace(replace(replace(#createdDateFrom#,'-',''),' ',''),':','')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdDateTo">
-			CREATED_TIME <![CDATA[<=]]> #createdDateTo#
+			CREATED_TIME <![CDATA[<=]]> replace(replace(replace(#createdDateTo#,'-',''),' ',''),':','')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="operModul">
 			OPER_MODUL = #operModul#
@@ -67,10 +67,10 @@
 			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdDateFrom">
-			CREATED_TIME >= #createdDateFrom#
+			CREATED_TIME >= replace(replace(replace(#createdDateFrom#,'-',''),' ',''),':','')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdDateTo">
-			CREATED_TIME <![CDATA[<=]]> #createdDateTo#
+			CREATED_TIME <![CDATA[<=]]> replace(replace(replace(#createdDateTo#,'-',''),' ',''),':','')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="operModul">
 			OPER_MODUL = #operModul#
@@ -149,6 +149,9 @@
 		SELECT
 		distinct OPER_MODUL	as "operModul"  <!-- 操作模块 -->
 		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
 	</select>
 
 	<!-- 查询操作类型 -->
@@ -156,6 +159,9 @@
 		SELECT
 		distinct OPER_TYPE	as "operType"  <!-- 操作类型 -->
 		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
 	</select>
   
 </sqlMap>
\ No newline at end of file

src/main/webapp/HP/RZ/HPRZ001.js

@@ -5,6 +5,12 @@ $(function() {
             pageSize: 20,
             pageSizes: [10, 20, 50, 70, 100],
         },
+        columns: [{
+            field: "createdName",
+            template: function (options) {
+                return showUserName(options.createdBy, options.createdName);
+            }
+        }]
     }
 
     // 查询

src/main/webapp/HP/RZ/HPRZ001.jsp

@@ -9,14 +9,14 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-            <EF:EFSelect cname="企业编码" ename="inqu_status-0-companyCode" colWidth="3" filter="contains" defultValue="">
+     <%--       <EF:EFSelect cname="企业编码" ename="inqu_status-0-companyCode" colWidth="3" filter="contains" defultValue="">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="company_record_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
-            <EF:EFInput cname="创建人名称" ename="inqu_status-0-createdName" colWidth="3"/>
+            </EF:EFSelect>--%>
+            <EF:EFInput cname="操作人" ename="inqu_status-0-createdName" colWidth="3"/>
             <EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
                            startName="createdDateFrom" endName="createdDateTo" row="0" role="datetime"
-                           format="yyyyMMddhhmm" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+                           format="yyyy-MM-dd HH:mm" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
 
         </div>
@@ -35,13 +35,14 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
             <EF:EFColumn ename="id" cname="主键id" hidden="true"/>
-            <EF:EFColumn ename="companyCode" cname="企业编码" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" readonly="true" width="120" align="center"/>
+            <%--<EF:EFColumn ename="companyCode" cname="企业编码" enable="false" readonly="true" width="100" align="center"/>--%>
+            <EF:EFColumn ename="createdName" cname="操作人" enable="false" readonly="true" width="150" align="center"/>
             <EF:EFColumn ename="operModul" cname="操作模块" enable="false" readonly="true" width="100" align="center"/>
             <EF:EFColumn ename="operType" cname="操作类型" enable="false" readonly="true" width="80" align="center"/>
             <EF:EFColumn ename="operDesc" cname="操作说明" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="operContent" cname="操作内容" enable="false" readonly="true" width="800" align="center"/>
+            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" readonly="true" width="120" align="center"
+                         parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
+       <%--     <EF:EFColumn ename="operContent" cname="操作内容" enable="false" readonly="true" width="800" align="center"/>--%>
         </EF:EFGrid>
     </EF:EFRegion>