ouyj před 2 měsíci
rodič
revize
e7c502ee15

+ 2 - 1
src/main/hr/com/yw/hr/train/dao/TrainImpleCourseDaoImpl.java

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import com.yw.core.common.BaseDao;
@@ -149,7 +150,7 @@ public class TrainImpleCourseDaoImpl extends BaseDao implements TrainImpleCourse
 			     " INNER JOIN hr_train_course htc on htc.universalid=hitc.course_id  " +		    
 			    "  INNER JOIN hr_train_course_class htcc on htcc.universalid=hitc.class_id "+
 			     " where hitc.imple_id="+tic.getImple_id();
-		return jdbcTemplate.queryForList(sql, TrainImpleCourse.class);
+		return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TrainImpleCourse.class));
 	}
 
 	@Override

+ 22 - 22
src/main/webapp/yw/hr/train/apply/ligerTab.jsp

@@ -577,29 +577,29 @@
 	   	
 	   		<div title="公司培训调查" id="to_finish_assessTab"  style="overflow: hidden;">
 	     	<div class="default_search" style="margin: 0;">
+				<ul style="width:350px;">
+					<li class="title"> 需求单名称:</li>
+					<li style="vertical-align:middle;">
+					<input type="text" name="demand_name" id="demand_name" style="width:200px;">
+
+					</li>
+				</ul>
 				<ul >
-				<li class="title"> 需求单名称:</li>
-				<li style="vertical-align:middle;">
-				<input type="text" name="demand_name" id="demand_name">
-				
-			    </li>
-			</ul>
-			<ul >
-				<li class="title">是否反馈:</li>
-				<li class="text">
-				<select id="status" name="status" > 
-		 				<option value="" selected="selected">-请选择-</option> 
-		 				<c:forEach items="${demandSurveyList}" var="item">
-		 					<option value="${item.dvalue  }" >${item.dname}</option>
-		 				</c:forEach>
-			 		</select>				</li>
-			</ul>
-			<ul >
-				<li class="search-button"><input type="button" class='l-button'
-					name="search" onclick="searchByKword()" value="查询" />
-				</li>
-			</ul>
-		</div>
+					<li class="title">是否反馈:</li>
+					<li class="text">
+					<select id="status" name="status" >
+							<option value="" selected="selected">-请选择-</option>
+							<c:forEach items="${demandSurveyList}" var="item">
+								<option value="${item.dvalue  }" >${item.dname}</option>
+							</c:forEach>
+						</select>				</li>
+				</ul>
+				<ul >
+					<li class="search-button"><input type="button" class='l-button'
+						name="search" onclick="searchByKword()" value="查询" />
+					</li>
+				</ul>
+			</div>
 	     	<div style="overflow: hidden; clear: both;">
 				<div id="to_finish_assess" style="margin: 0; padding: 0"></div>
 	   		</div>	 	

+ 5 - 5
src/main/webapp/yw/hr/train/demand/demandLigerTab.jsp

@@ -356,23 +356,23 @@ function changestate(demand_survey_id,status){
 			   <input type="button" class="l-button" value="新增需求单" onclick="addTab('addDemand'+getCurrentTabId(), '新增需求单', '${pageContext.request.contextPath }/hrTrainDemandAction.do?task=toAddDemandSurvey&tabid=' + getCurrentTabId(),true,true);" style="width: 90px;margin-top:3px;margin-bottom:3px;"/>
 	     <div class="default_search" style="margin: 0;">
 		
-			<ul >
+			<ul style="width:250px;">
 				<li class="title"  >年度:</li>
 				<li class="text">
 					<input type="text" class="Wdate" name="demand_date_str" id="demand_date_str" onclick="WdatePicker({dateFmt:'yyyy'})" value="${attrecordrs.demand_date_str }" />		
 				</li>
 			</ul>
-			<ul >
+			<ul style="width:300px;">
 				<li class="title"> 需求单名称:</li>
 				<li >
-				<input type="text" name="demand_name" id="demand_name">
+				<input type="text" name="demand_name" id="demand_name" style="width:150px;">
 				
 			    </li>
 			</ul>
-			<ul >
+			<ul style="width:300px;">
 				<li class="title" > 发起人:</li>
 				<li >
-			         <input type="text" name="user" id="user">		
+			         <input type="text" name="user" id="user" style="width:150px;">
 			    </li>
 			</ul>
 			<ul >