会议修改

WebContent/jwapp/pages/meeting/js/meetingTab.js

@@ -45,12 +45,11 @@ var is_column = [ [
 				{field : 'MEETING_NAME',title : '会议名称',width : 100,align : 'center'},
 				{field : 'MEETING_CONTENT',title : '会议内容',width : 300,align : 'center'},
 				{field : 'VENUE',title : '会议地址',width : 300,align : 'center'},
+				{field : 'HOST',title : '主持人',width : 80,align : 'center'},
 				{field : 'START_TIME',title : '开始时间',width : 150,align : 'center'},
 				{field : 'END_TIME',title : '结束时间',width : 150,align : 'center'},
-				{field : 'CREATE_ID',title : '创建人',width : 80,align : 'center'},
-				{field : 'CREATE_TIME',title : '创建时间',width : 150,align : 'center'},
-				{field : 'UPDATE_ID',title : '修改人',width : 80,align : 'center'},
-				{field : 'UPDATE_TIME',title : '修改时间',width : 150,align : 'center'}
+				{field : 'CHECK_START_TIME',title : '签到开始时间',width : 150,align : 'center'},
+				{field : 'CHECK_END_TIME',title : '签到结束时间',width : 150,align : 'center'}
 				] ];
 //列表加载完成回调
 function dataOnLoadSuccess(){

WebContent/jwapp/pages/meeting/meetingTabDetail.jsp

@@ -12,6 +12,15 @@
     </td>
     </tr>
     <tr>
+   <td style="width: 15%;" class="tableStyleLable">
+		<span>主持人:</span>
+	</td>
+   <td  style="width: 85%">
+	  <input class="easyui-textbox" id="HOST" name="FIELD_HOST" style="width:600px" required=true  value="${is_row.HOST}"/>
+    </td>
+    </tr>
+   <tr>
+   <tr>
    <td class="tableStyleLable" valign="top" style="height:160px">
 		<span>会议内容:</span>
 	</td>
@@ -39,5 +48,17 @@
 	  <input id="END_TIME" name="FIELD_END_TIME"  type="text" value="${is_row.END_TIME}" >
    </td>
    </tr>
+   <tr>
+   <td style="width: 20%;" class="tableStyleLable">
+		<span>
+		会议签到时间:
+		</span>
+	</td>
+   <td  style="width: 80%">
+	  <input class="easyui-datetimebox" required id="CHECK_START_TIME"  name="FIELD_CHECK_START_TIME"  value="${is_row.CHECK_START_TIME}" />
+	  <span>到</span>
+	  <input class="easyui-datetimebox" required id="CHECK_END_TIME" name="FIELD_CHECK_END_TIME"  type="text" value="${is_row.CHECK_END_TIME}" >
+   </td>
+   </tr>
 </table>
 </form>
\ No newline at end of file

src_jwapp/com/jw/app/business/meeting/MeetingBusinessImpl.java

 package com.jw.app.business.meeting;
 
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,6 +16,7 @@ import org.apache.ibatis.session.RowBounds;
 import com.jw.app.business.MeetingBusiness;
 import com.gaowj.business.exception.BusinessException;
 import com.gaowj.business.util.Page;
+import com.gaowj.business.util.QueryParamUtil;
 import com.gaowj.business.util.SessionUtil;
 import com.gaowj.standard.utils.CacheKit;
 
@@ -55,6 +59,14 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 
 	@Override
 	public void insert_check_in(Map<String, Object> entity) throws BusinessException {
+		List<Map<String, Object>> timeList = meetingDAO.list_checkTime(entity);
+		Map<String, Object> timeMap = timeList.get(0);
+		SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+		try {
+			Date startTime=sf.parse((String)timeMap.get("CHECK_START_TIME"));
+			Date endTime=sf.parse((String)timeMap.get("CHECK_END_TIME"));
+			Date thistime = new Date();
+			if (thistime.after(startTime) && thistime.before(endTime)) {
 				List<Map<String, Object>> items = meetingDAO.list_check_in(entity);
 				if (items.size() == 0) {
 					entity.put("UUID", java.util.UUID.randomUUID().toString());
@@ -82,6 +94,11 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 					}
 				}
 			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 
 	@Override
 	public void update_meeting(Map<String, Object> entity) throws BusinessException {
@@ -173,10 +190,9 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 
 	@Override
 	public List<Map<String, Object>> list_meeting(Map<String, Object> query) throws BusinessException {
-		List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "meeting" + query);
+		List<Map<String, Object>> list_data = null;
 		if (list_data == null || list_data.size() == 0) {
 			list_data = meetingDAO.list_meeting(query);
-			CacheKit.put("ehcache10", "kqmk" + query, list_data);
 		}
 		return list_data;
 	}

src_jwapp/com/jw/app/business/meeting/meetingDAO.java

@@ -31,4 +31,6 @@ public interface meetingDAO {
 
 	int listCount_check_in(Map<String, Object> query) throws BusinessException;
 	
+	List<Map<String, Object>> list_checkTime(Map<String, Object> query) throws BusinessException;
+
 }

src_jwapp/com/jw/app/business/meeting/meetingDAO.xml

@@ -167,6 +167,12 @@
 		<include refid="WHERE"></include>
 	</select>
 	
+	<select id="list_checkTime" parameterType="map" resultType="upperCaseKeyMap">
+		select *
+		from  MEETING_MANAGE 
+		where UUID=#{MEETING_ID}
+	</select>
+
 	<select id="list_check_in" parameterType="map" resultType="upperCaseKeyMap">
 		select check_in.*,info.real_name,unit.name,info.telephone
 		from