1.fixBug:系统管理页面报错问题修复

src/main/java/com/baosight/hpjx/hp/kc/tools/CKExcelTools.java

 package com.baosight.hpjx.hp.kc.tools;
 
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
-import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.ExcelUtils;
 import com.baosight.hpjx.util.MapUtils;
@@ -21,9 +20,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -37,24 +37,9 @@
 		<isNotEmpty prepend=" AND " property="docId">
             A.DOC_ID = #docId#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdBy">
-            A.CREATED_BY = #createdBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdName">
-            A.CREATED_NAME = #createdName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdTime">
-            A.CREATED_TIME = #createdTime#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedBy">
-            A.UPDATED_BY = #updatedBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedName">
-            A.UPDATED_NAME = #updatedName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedTime">
-            A.UPDATED_TIME = #updatedTime#
-		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="docName">
+            B.DOC_NAME LIKE CONCAT('%', #docName#, '%')
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -69,7 +54,7 @@
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="order">
-                $orderBy$
+                $order$
             </isNotEmpty>
             <isEmpty property="order">
                 A.ID DESC

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

@@ -99,7 +99,7 @@
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="order">
-                $orderBy$
+                $order$
             </isNotEmpty>
             <isEmpty property="order">
                 ID ASC

src/main/webapp/HP/SC/HPSC002B.jsp

@@ -11,7 +11,7 @@
 		<div class="row">
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
-			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
+			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
 			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
 			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">

src/main/webapp/XS/OG/XSOG0801.jsp

@@ -102,7 +102,7 @@
     String loginPublicKey = LoginConstants.loginRsaPublicKey;
     String cryptoPasswordEnable = LoginConstants.cryptoPasswordEnable;
 	String companyCode = UserSessionUtils.getCompanyCode();
-	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.getPz009(companyCode).getLoginPrefix();
+	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.HpPz009.getByCode(companyCode).getLoginPrefix();
 %>
 <c:set var="pwdRgx" value="<%=passwordRegex%>"/>
 <c:set var="pwdDesc" value="<%=passwordDesc%>"/>

src/main/webapp/XS/XS3001.jsp

@@ -21,7 +21,7 @@
         request.setAttribute("passwordTip", "密码由不超过255位的英文字母或者数字字符或下划线组成。");
     }
 	String companyCode = UserSessionUtils.getCompanyCode();
-	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.getPz009(companyCode).getLoginPrefix();
+	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.HpPz009.getByCode(companyCode).getLoginPrefix();
 	String username = UserSession.getUser().getUsername();
     String passwordRegex = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.regex"), "^(?=.*?[a-zA-Z])(?=.*?[0-9]).{1,}$");
     String passwordDesc = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.desc"), "密码必须包含英文及数字");