2024-05-11 优化设备计划人、设备负责人、维修申请人默认选中登录用户

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB001.xml

@@ -168,7 +168,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				PURCHASE_DATE desc,MAINTAIN_DATE desc,ID asc
+				PURCHASE_DATE desc,CREATED_TIME DESC,ID asc
 			</isEmpty>
 		</dynamic>
 

src/main/webapp/HG/SB/HGSB001.jsp

@@ -9,8 +9,12 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
 
 <EF:EFPage  title="设备台账">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -68,7 +72,7 @@
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="deviceUserId" cname="设备负责人"
+            <EF:EFComboColumn ename="deviceUserId" cname="设备负责人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"

src/main/webapp/HG/SB/HGSB002.jsp

@@ -9,8 +9,13 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
+
 
 <EF:EFPage  title="设备计划">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -67,7 +72,7 @@
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
             <EF:EFColumn ename="planEndDate" cname="计划结束日期" width="120" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
-            <EF:EFComboColumn ename="planUserId" cname="计划人"
+            <EF:EFComboColumn ename="planUserId" cname="计划人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"

src/main/webapp/HG/SB/HGSB003.jsp

@@ -9,8 +9,12 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
-
+<%@ page import="com.baosight.iplat4j.core.web.threadlocal.UserSession" %>
+<%
+    String loginName = UserSession.getLoginName();
+%>
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<c:set var="loginName" value="<%=loginName%>" />
 
 <EF:EFPage  title="设备维修申请">
     <EF:EFRegion id="inqu" title="查询条件">
@@ -52,7 +56,7 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="checkItem" cname="检查项" width="100" enable="true" readonly="false" align="center" required="true"/>
             <EF:EFColumn ename="checkDescrip" cname="检查描述" type="textarea" width="160" align="center"/>
-            <EF:EFComboColumn ename="applyUserId" cname="申请人"
+            <EF:EFComboColumn ename="applyUserId" cname="申请人" defaultValue="${loginName}"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" width="100" readonly="false" required="true"