日志

WebContent/jwapp/pages/log/js/logTab.js

 /**
- * 序号：1
+ * 序号：
  * 功能：定义分页(EasyUI)
  * 参数：
  * 说明：
@@ -29,20 +29,9 @@ var ls_module_id='2';
 var ls_ywlx = 'YBYW';
 /****/
 
-/**
- * 序号：2
- * 功能：构建下拉框内容
- * 参数：
- * 说明：方便新增、修改页面里的下拉选项加载数据
- * 作者：高伟杰
- * 时间：2016-01-22
- * 单位：杰夫兄弟智慧科技有限公司
- * 备注：需更改
- **/
-
 
 /**
- * 序号：3
+ * 序号：
  * 功能：构建主页面列表
  * 参数：
  * 说明：
@@ -52,7 +41,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="会议签到管理&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="日志管理";
 var is_column = [ [
 				{field : 'LOG_TITLE',title : '日志标题',width : 100,align : 'center'},
 				{field : 'LOG_CONTENT',title : '日志内容',width : 300,align : 'center'},
@@ -75,7 +64,7 @@ datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/logData_list",queryData,is_colum
 /****/
 
 /**
- * 序号：4
+ * 序号：
  * 功能：设置主页面操作列菜单
  * 参数：
  * 说明：
@@ -110,7 +99,7 @@ function getOptionMenuCount(){
 /****/
 
 /**
- * 序号：5
+ * 序号：
  * 功能：新增修改弹出
  * 参数：
  * 说明：
@@ -156,6 +145,7 @@ function updateData(is_entity){
 	return v_result;
 }
 
+//回复弹出框格式
 function openreplyRow(editUrl,is_row,is_title,is_max,is_width,is_height,is_left,is_top){
 	$('#detail').dialog( {
 		title : is_title,
@@ -188,6 +178,28 @@ function openreplyRow(editUrl,is_row,is_title,is_max,is_width,is_height,is_left,
 	});
 }
 
+////定义grid列表
+//var ls_title="日志管理";
+//var is_column = [ [
+//				{field : 'LOG_TITLE',title : '日志标题',width : 100,align : 'center'},
+//				{field : 'LOG_CONTENT',title : '日志内容',width : 300,align : 'center'},
+//				{field : 'NEW_CREATE',title : '创建人',width : 80,align : 'center'},
+//				{field : 'CREATE_TIME',title : '创建时间',width : 150,align : 'center'},
+//				{field : 'NEW_UPDATE',title : '修改人',width : 80,align : 'center'},
+//				{field : 'UPDATE_TIME',title : '修改时间',width : 150,align : 'center'}
+//				] ];
+////列表加载完成回调
+//function dataOnLoadSuccess(){
+//	
+//}
+////设置颜色和每行高度
+//function rowstyler(index,row){
+//
+//}
+////展示列表
+//datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/logData_list",queryData,is_column,60,80);
+
+
 /**
  * 序号：
  * 功能：回复
@@ -209,28 +221,32 @@ function replyRow(index) {
 
 //加载回复子页面成功后的回调
 function replyUrlOnloadCallback(is_row){
-	var listItem=logModule.logDataAction.listItem({
-		FIELD_LOG_ID:is_row.UUID
-	}).listItems;
-	for(var i=0;i<listItem.length;i++){
-		add_log_item(listItem[i].REPLY_NAME,listItem[i].REPLY_CONTENT,listItem[i].UUID,listItem[i].CODE);
-	}
+//	var listItem=logModule.logDataAction.listItem({
+//		FIELD_LOG_ID:is_row.UUID
+//	}).rowSet;
+//	for(var i=0;i<listItem.length;i++){
+//		add_log_item(listItem[i].REPLY_NAME,listItem[i].REPLY_CONTENT,listItem[i].UUID,listItem[i].CODE);
+//	}
+	datagridReply("logItemInputForm",gaowj.WEB_APP_NAME + "/logData_listItem",queryData,reply_column);
 }
 
 //回复保存
 function replySaveRow(){
-	var items={FIELD_LOG_ID:$("input[name=FIELD_UUID]").val(),
-			   FIELD_REPLY_CONTENT:$("input[name=FIELD_USER_REPLY_CONTENT]").val()}
-	var v_result = logModule.logActAction.insertReply(items);
-	if(v_result.NAME=='999'){
-		add_log_item(v_result.REPLY_NAME,v_result.REPLY_CONTENT,v_result.UUID,v_result.CODE);
-		$("#USER_REPLY_CONTENT").textbox('setValue','')
+	if($("input[name=FIELD_USER_REPLY_CONTENT]").val()==''){
+		$.messager.alert('提示','请在回复框输入内容')
+	}else{
+		var items={FIELD_LOG_ID:$("input[name=FIELD_UUID]").val(),
+		   FIELD_REPLY_CONTENT:$("input[name=FIELD_USER_REPLY_CONTENT]").val()}
+		var v_result = logModule.logActAction.insertReply(items);
+		if(v_result.NAME=='999'){
+			add_log_item(items.REPLY_NAME,items.REPLY_CONTENT,items.UUID,items.CODE);
+		}
 	}
 }
 
 
 /**
- * 序号：6
+ * 序号：
  * 功能：单个删除
  * 参数：
  * 说明：
@@ -259,7 +275,7 @@ function deleteRow(index){
 /****/
 
 /**
- * 序号：7
+ * 序号：
  * 功能：批量删除
  * 参数：
  * 说明：
@@ -294,7 +310,43 @@ function deleteBatchRow(){
 /****/
 
 /**
- * 序号：8
+ * 序号：
+ * 功能：回复删除
+ * 参数：
+ * 说明：
+ * 作者：高伟杰
+ * 时间：2016-01-22
+ * 单位：杰夫兄弟智慧科技有限公司
+ * 备注：需更改
+ **/
+function deleteItemRow(handler){
+	code=$(handler).parent().next().find('input').val();
+	console.log(code)
+	if(code == ''|| code == null){
+		return
+	}else{
+		$.messager.confirm('提示', '确定删除?', function(r) {
+			if (r) {
+				var v_query = {};
+			    v_query.FIELD_CODE = code;
+			    var v_result = logModule.logActAction.deleteReply(v_query);
+			    $(handler).parent().parent().remove();
+				if(v_result.NAME=='999'){
+					$(handler).parent().parent().remove();
+					$.messager.alert('提示',v_result.VALUE);
+				}else{
+					$.messager.alert('提示',v_result.VALUE);
+				}
+				
+			}
+		});
+	}
+	
+}
+/****/
+
+/**
+ * 序号：
  * 功能：刷新
  * 参数：
  * 说明：
@@ -310,7 +362,7 @@ function refreshRow(){
 /****/
 
 /**
- * 序号：9
+ * 序号：
  * 功能：查询
  * 参数：
  * 说明：
@@ -365,7 +417,7 @@ function add_log_item(index,content,uuid,code){
 	
 	log_item_index.append('<input class="easyui-validatebox easyui-textbox" readonly="readonly" name="log_item_index" value="'+index+'" />');
 	log_item_info.append('<input class="easyui-validatebox easyui-textbox" readonly="readonly" name="log_item_info" style="width: 400px" value="'+content+'"/>');
-	log_item_delete.append('<a name="log_item_delete" class="log_item_delete" onclick="javascript:deleteItemRow(this)">删除</a>');
+	log_item_delete.append('<a name="log_item_delete"  onclick="javascript:deleteItemRow(this)">删除</a>');
 	log_item_uuid.append('<input type="hidden" name="log_item_uuid" value="'+uuid+'" />');
 	log_item_code.append('<input type="hidden" name="log_item_code" value="'+code+'" />');
 
@@ -373,27 +425,33 @@ function add_log_item(index,content,uuid,code){
 }
 
 /**
- * 序号：
- * 功能：回复删除
- * 参数：
- * 说明：
- * 作者：高伟杰
- * 时间：2016-01-22
- * 单位：杰夫兄弟智慧科技有限公司
- * 备注：需更改
- **/
-function deleteItemRow(handler){
-	code=$(handler).parent().next().find('input').val();
-	$.messager.confirm('提示', '确定删除?', function(r) {
-		if (r) {
-			var v_query = {};
-		    v_query.FIELD_CODE = code;
-		    $(handler).parent().parent().remove();
-		    var v_result = logModule.logActAction.deleteReply(v_query);
-			$.messager.alert('提示',v_result.VALUE);
+ * 回复
+ * 2016-12-01
+ * 高伟杰
+**/
+function datagridReply(is_view,is_url,is_query,is_column){
+	$('#'+is_view).datagrid({
+	    iconCls:$.getJwWindowPic(),
+	    url:is_url,
+	    queryParams : is_query,//查询参数
+		rownumbers : true,//显示索引号
+		singleSelect : false,//是否多选
+		fitColumns : false,//是否撑满
+		autoRowHeight : false,//设定高度
+		rowStyler :function(index,row){return rowstyler(index,row);},
+		pagination : true,//分页显示
+		pageSize : rows,//显示行数
+		pageList : listPageSize,//条数选择
+		striped : true, //是否隔行显示
+		remoteSort : false,//是否从服务器排序
+		columns : is_column,
+		onLoadSuccess : function() {
+			dataOnLoadSuccess();
 		}
 	});
-	
 }
-/****/
 
+var reply_column = [ [
+	{field : 'REPLY_NAME',width : 100,align : 'center'},
+	{field : 'REPLY_CONTENT',width : 300,align : 'center'},
+	] ];

WebContent/jwapp/pages/log/js/replyTab.js

@@ -41,7 +41,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="会议签到管理&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="日志管理";
 var is_column = [ [
 				{field : 'LOG_TITLE',title : '日志标题',width : 100,align : 'center'},
 				{field : 'LOG_CONTENT',title : '日志内容',width : 300,align : 'center'},
@@ -94,16 +94,6 @@ function updateUrlOnloadCallback(is_row){
 	for(var i=0;i<listItem.length;i++){
 		add_log_item(listItem[i].REPLY_NAME,listItem[i].REPLY_CONTENT,listItem[i].UUID,listItem[i].CODE);
 	}
-	$('.log_item_delete').each(function (){
-		if(typeof $(this).next().next().find('input').val() == 'undefined'){
-		}else{
-			if($(this).next().next().find('input').val() == gaowj.SEESION_CODE ){
-			}else {
-				$(this).hide();
-			}
-		}
-			});
-	
 }
 
 //保存
@@ -115,11 +105,15 @@ function updateData(is_entity){
 }
 //回复保存
 function replySaveRow(){
-	var items={FIELD_LOG_ID:$("input[name=FIELD_UUID]").val(),
-			   FIELD_REPLY_CONTENT:$("input[name=FIELD_USER_REPLY_CONTENT]").val()}
-	var v_result = logModule.logActAction.insertReply(items);
-	if(v_result.NAME=='999'){
-		add_log_item(items.REPLY_NAME,items.REPLY_CONTENT,items.UUID,items.CODE);
+	if($("input[name=FIELD_USER_REPLY_CONTENT]").val()==''){
+		$.messager.alert('提示','请在回复框输入内容')
+	}else{
+		var items={FIELD_LOG_ID:$("input[name=FIELD_UUID]").val(),
+		   FIELD_REPLY_CONTENT:$("input[name=FIELD_USER_REPLY_CONTENT]").val()}
+		var v_result = logModule.logActAction.insertReply(items);
+		if(v_result.NAME=='999'){
+			add_log_item(items.REPLY_NAME,items.REPLY_CONTENT,items.UUID,items.CODE);
+		}
 	}
 }
 
@@ -200,6 +194,16 @@ function add_log_item(index,content,uuid,code){
 	log_item_code.append('<input type="hidden" name="log_item_code" value="'+code+'" />');
 
 	$.parser.parse('.log_item_one');
+	
+	$('.log_item_delete').each(function (){
+		if(typeof $(this).next().next().find('input').val() == 'undefined'){
+		}else{
+			if($(this).next().next().find('input').val() == gaowj.SEESION_CODE ){
+			}else {
+				$(this).hide();
+			}
+		}
+			});
 }
 
 /**
@@ -213,14 +217,25 @@ function add_log_item(index,content,uuid,code){
  * 备注：需更改
  **/
 function deleteItemRow(handler){
-	code=$(handler).parent().next().find('input').val();
-	$.messager.confirm('提示', '确定删除?', function(r) {
-		if (r) {
-			var v_query = {};
-		    v_query.FIELD_CODE = code;
-		    var v_result = logModule.logActAction.deleteReply(v_query);
-			$.messager.alert('提示',v_result.VALUE);
-		}
-	});
+	code=$('.log_item_delete').parent().next().find('input').val();
+	if(code == ''|| code == null){
+		return
+	}else{
+		$.messager.confirm('提示', '确定删除?', function(r) {
+			if (r) {
+				var v_query = {};
+			    v_query.FIELD_CODE = code;
+			    var v_result = logModule.logActAction.deleteReply(v_query);
+				if(v_result.NAME=='999'){
+					$('.log_item_delete').parent().parent().remove();
+					$.messager.alert('提示',v_result.VALUE);
+				}else{
+					$.messager.alert('提示',v_result.VALUE);
+				}
+				
+			}
+		});
+	}
+	
 }
 /****/

WebContent/jwapp/pages/meeting/js/check_inTab.js

@@ -41,7 +41,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="会议签到管理&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="会议签到管理";
 var is_column = [ [
 				{field : 'MEETING_NAME',title : '会议名称',width : 100,align : 'center'},
 				{field : 'MEETING_CONTENT',title : '会议内容',width : 300,align : 'center'},

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

 /**
- * 序号：1
+ * 序号：
  * 功能：定义分页(EasyUI)
  * 参数：
  * 说明：
@@ -30,19 +30,7 @@ var ls_ywlx = 'YBYW';
 /****/
 
 /**
- * 序号：2
- * 功能：构建下拉框内容
- * 参数：
- * 说明：方便新增、修改页面里的下拉选项加载数据
- * 作者：高伟杰
- * 时间：2016-01-22
- * 单位：杰夫兄弟智慧科技有限公司
- * 备注：需更改
- **/
-
-
-/**
- * 序号：3
+ * 序号：
  * 功能：构建主页面列表
  * 参数：
  * 说明：
@@ -52,7 +40,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="会议签到管理&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="会议签到管理";
 var is_column = [ [
 				{field : 'MEETING_NAME',title : '会议名称',width : 100,align : 'center'},
 				{field : 'MEETING_CONTENT',title : '会议内容',width : 300,align : 'center'},
@@ -78,7 +66,7 @@ datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/meetingData_list",queryData,is_c
 /****/
 
 /**
- * 序号：4
+ * 序号：
  * 功能：设置主页面操作列菜单
  * 参数：
  * 说明：
@@ -113,7 +101,7 @@ function getOptionMenuCount(){
 /****/
 
 /**
- * 序号：5
+ * 序号：
  * 功能：新增修改弹出
  * 参数：
  * 说明：
@@ -132,61 +120,6 @@ function addRow(){
 function addUrlOnloadCallback(is_row){
 	initDateBox();
 }
-function addZero(d){
-	if(d<10){
-		return "0"+d;
-	}
-	return d;
-}
-
-function initDateBox(){
-	$("#START_TIME").datetimebox({
-	    required:true,
-	    formatter:function(date){
-	    	var y = date.getFullYear();
-	    	var m = date.getMonth()+1;
-	    	var d = date.getDate();
-	    	var h = date.getHours();
-	    	var min = date.getMinutes();
-	    	var s = date.getSeconds();
-	    	var nowDate=new Date();
-	    	if(date.getTime() < nowDate.getTime()){
-	    		h = nowDate.getHours();
-		    	min = nowDate.getMinutes();
-		    	s = nowDate.getSeconds();
-	    	}
-	    	return y+'-'+addZero(m)+'-'+addZero(d)+' '+addZero(h)+':'+addZero(min)+':'+addZero(s);
-	    }
-	});
-	$("#END_TIME").datetimebox({
-	    required:true,
-	    formatter:function(date){
-	    	var y = date.getFullYear();
-	    	var m = date.getMonth()+1;
-	    	var d = date.getDate();
-	    	var h = date.getHours();
-	    	var min = date.getMinutes();
-	    	var s = date.getSeconds();
-	    	var nowDate=new Date();
-	    	if(date.getTime() < nowDate.getTime()){
-	    		h = nowDate.getHours();
-		    	min = nowDate.getMinutes();
-		    	s = nowDate.getSeconds();
-	    	}
-	    	return y+'-'+addZero(m)+'-'+addZero(d)+' '+addZero(h)+':'+addZero(min)+':'+addZero(s);
-	    }
-	});
-	$('#START_TIME').datetimebox('calendar').calendar({
-		validator: function(date){
-			return new Date().getTime()<=date||date.getDate()==new Date().getDate();
-		}
-	});	
-	$('#END_TIME').datetimebox('calendar').calendar({
-		validator: function(date){
-			return new Date().getTime()<=date||date.getDate()==new Date().getDate();
-		}
-	});	
-}
 //保存
 function insertData(is_entity){
 	is_entity.FIELD_START_TIME = strToDateObj(is_entity.FIELD_START_TIME);
@@ -219,8 +152,37 @@ function updateData(is_entity){
 	return v_result;
 }
 
-/****/
+//签到
+function check_userRow(index){
+	$('#list').datagrid('selectRow',index);
+	var is_row = $('#list').datagrid('getSelections');
+	$('#list').datagrid('clearSelections');
+	is_row[0].OPETYPE = 'checkin';
+	openLookRow("meetingView_check_userList",is_row[0],"签到人员",true,0.65,0.95,0,0);
+}
 
+//加载签到子页面成功后的回调
+function checkinUrlOnloadCallback(is_row){
+	var listcheck=meetingModule.meetingDataAction.listCheck_in({
+		FIELD_MEETING_ID:is_row.UUID
+	}).listchecks;
+    for(var i=0;i<listcheck.length;i++){
+
+	    $('#check_in_list').datagrid('insertRow', {
+	    	row: {	
+	    		REAL_NAME: listcheck[i].REAL_NAME,
+		    	CREATE_TIME: listcheck[i].CHECK_IN_TIME,
+		    	NAME: listcheck[i].NAME,
+		    	TELEPHONE: listcheck[i].TELEPHONE
+	    	}
+	    });
+    }
+
+	
+}
+
+/****/
+//签到弹出框格式
 function openLookRow(editUrl,is_row,is_title,is_max,is_width,is_height,is_left,is_top){
 	$('#detail').dialog( {
 		title : is_title,
@@ -253,36 +215,65 @@ function openLookRow(editUrl,is_row,is_title,is_max,is_width,is_height,is_left,i
 	});
 }
 
-function check_userRow(index){
-	$('#list').datagrid('selectRow',index);
-	var is_row = $('#list').datagrid('getSelections');
-	$('#list').datagrid('clearSelections');
-	is_row[0].OPETYPE = 'checkin';
-	openLookRow("meetingView_check_userList",is_row[0],"签到人员",true,0.65,0.95,0,0);
-}
-
-//加载签到子页面成功后的回调
-function checkinUrlOnloadCallback(is_row){
-	var listcheck=meetingModule.meetingDataAction.listCheck_in({
-		FIELD_MEETING_ID:is_row.UUID
-	}).listchecks;
-    for(var i=0;i<listcheck.length;i++){
 
-	    $('#check_in_list').datagrid('insertRow', {
-	    	row: {	
-	    		REAL_NAME: listcheck[i].REAL_NAME,
-		    	CREATE_TIME: listcheck[i].CHECK_IN_TIME,
-		    	NAME: listcheck[i].NAME,
-		    	TELEPHONE: listcheck[i].TELEPHONE
+function addZero(d){
+	if(d<10){
+		return "0"+d;
+	}
+	return d;
+}
+//限制时间
+function initDateBox(){
+	$("#START_TIME").datetimebox({
+	    required:true,
+	    formatter:function(date){
+	    	var y = date.getFullYear();
+	    	var m = date.getMonth()+1;
+	    	var d = date.getDate();
+	    	var h = date.getHours();
+	    	var min = date.getMinutes();
+	    	var s = date.getSeconds();
+	    	var nowDate=new Date();
+	    	if(date.getTime() < nowDate.getTime()){
+	    		h = nowDate.getHours();
+		    	min = nowDate.getMinutes();
+		    	s = nowDate.getSeconds();
 	    	}
-	    });
-    }
-
-	
+	    	return y+'-'+addZero(m)+'-'+addZero(d)+' '+addZero(h)+':'+addZero(min)+':'+addZero(s);
+	    }
+	});
+	$("#END_TIME").datetimebox({
+	    required:true,
+	    formatter:function(date){
+	    	var y = date.getFullYear();
+	    	var m = date.getMonth()+1;
+	    	var d = date.getDate();
+	    	var h = date.getHours();
+	    	var min = date.getMinutes();
+	    	var s = date.getSeconds();
+	    	var nowDate=new Date();
+	    	if(date.getTime() < nowDate.getTime()){
+	    		h = nowDate.getHours();
+		    	min = nowDate.getMinutes();
+		    	s = nowDate.getSeconds();
+	    	}
+	    	return y+'-'+addZero(m)+'-'+addZero(d)+' '+addZero(h)+':'+addZero(min)+':'+addZero(s);
+	    }
+	});
+	$('#START_TIME').datetimebox('calendar').calendar({
+		validator: function(date){
+			return new Date().getTime()<=date||date.getDate()==new Date().getDate();
+		}
+	});	
+	$('#END_TIME').datetimebox('calendar').calendar({
+		validator: function(date){
+			return new Date().getTime()<=date||date.getDate()==new Date().getDate();
+		}
+	});	
 }
 
 /**
- * 序号：6
+ * 序号：
  * 功能：单个删除
  * 参数：
  * 说明：
@@ -311,7 +302,7 @@ function deleteRow(index){
 /****/
 
 /**
- * 序号：7
+ * 序号：
  * 功能：批量删除
  * 参数：
  * 说明：
@@ -346,7 +337,7 @@ function deleteBatchRow(){
 /****/
 
 /**
- * 序号：8
+ * 序号：
  * 功能：刷新
  * 参数：
  * 说明：
@@ -362,7 +353,7 @@ function refreshRow(){
 /****/
 
 /**
- * 序号：9
+ * 序号：
  * 功能：查询
  * 参数：
  * 说明：

WebContent/jwapp/pages/vote/js/endedVoteTab.js

@@ -40,7 +40,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="投票管理功能&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="投票管理功能";
 var is_column = [ [
 				{field : 'CONTENT',title : '主题内容',width : 150,align : 'center'},
 				{field :'opt',title : '操作',width : 150,align : 'center',
@@ -94,7 +94,7 @@ function getOptionMenuCount(){
 
 /**
  * 序号：
- * 功能：新增修改弹出
+ * 功能：查找弹出
  * 参数：
  * 说明：
  * 作者：朱天成

WebContent/jwapp/pages/vote/js/ongoingVoteTab.js

@@ -41,7 +41,7 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="投票管理功能&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="投票管理功能";
 var is_column = [ [
 				{field : 'CONTENT',title : '主题内容',width : 150,align : 'center'},
 				{field : 'VOTE_COUNT',title : '状态',width : 150,align : 'center',
@@ -102,7 +102,7 @@ function getOptionMenuCount(){
 
 /**
  * 序号：
- * 功能：新增修改弹出
+ * 功能：新增查找弹出
  * 参数：
  * 说明：
  * 作者：朱天成
@@ -121,6 +121,50 @@ function editRow(index) {
 	openEditRow("voteView_userVoteTabDetail",is_row[0],"投票",true,0.65,0.95,0,0);	
 }
 
+//加载投票子页面成功后的回调
+function updateUrlOnloadCallback(is_row){
+	var listItem=voteModule.voteDataAction.listItem({
+		FIELD_MANAGE_ID:is_row.UUID
+	}).listItems;
+	
+	for(var i=0;i<listItem.length;i++){
+		add_vote_item(listItem[i].INDEX_NAME,listItem[i].CONTENT,listItem[i].UUID);
+	}
+}
+
+
+
+//保存
+function updateData(is_entity){
+	var uuids='';
+	var i=0;
+	$(".vote_item_list :checkbox:checked").each(function(index){
+		uuids+=','+$(this).val();
+		i++;
+	});
+	var min=$("input[name=FIELD_MIN_COUNT]").val();
+	var max=$("input[name=FIELD_MAX_COUNT]").val();
+    var flag=$("input[name=FIELD_STATUS_FLAG]").val();
+	//判断用户选择的选项是否在上下限之间，如果不在，则提示用户，不进行提交操作
+    if(min==max&&i!=min){
+    	$.messager.alert("必须选择"+max+"个选项");
+		return;
+    }else if(i<min||i>max){
+		$.messager.alert("请选择"+min+"到"+max+"个选项");
+		return;
+	}
+	
+	if(uuids.length>0){
+		uuids=uuids.substring(1);
+	}
+	is_entity.FIELD_UUIDS=uuids;
+	is_entity.FIELD_FLAG =flag;
+	v_result = voteModule.voteActAction.insertUserVote(is_entity);
+	$('#list').datagrid('reload');
+	return v_result;
+}
+
+//查找
 function lookfor(index){
 	$('#list').datagrid('selectRow',index);
 	var is_row = $('#list').datagrid('getSelections');
@@ -184,49 +228,6 @@ function lookforUrlOnloadCallback(is_row,index){
 	}
 }
 
-//加载投票子页面成功后的回调
-function updateUrlOnloadCallback(is_row){
-	var listItem=voteModule.voteDataAction.listItem({
-		FIELD_MANAGE_ID:is_row.UUID
-	}).listItems;
-	
-	for(var i=0;i<listItem.length;i++){
-		add_vote_item(listItem[i].INDEX_NAME,listItem[i].CONTENT,listItem[i].UUID);
-	}
-}
-
-
-
-//保存
-function updateData(is_entity){
-	var uuids='';
-	var i=0;
-	$(".vote_item_list :checkbox:checked").each(function(index){
-		uuids+=','+$(this).val();
-		i++;
-	});
-	var min=$("input[name=FIELD_MIN_COUNT]").val();
-	var max=$("input[name=FIELD_MAX_COUNT]").val();
-    var flag=$("input[name=FIELD_STATUS_FLAG]").val();
-	//判断用户选择的选项是否在上下限之间，如果不在，则提示用户，不进行提交操作
-    if(min==max&&i!=min){
-    	$.messager.alert("必须选择"+max+"个选项");
-		return;
-    }else if(i<min||i>max){
-		$.messager.alert("请选择"+min+"到"+max+"个选项");
-		return;
-	}
-	
-	if(uuids.length>0){
-		uuids=uuids.substring(1);
-	}
-	is_entity.FIELD_UUIDS=uuids;
-	is_entity.FIELD_FLAG =flag;
-	v_result = voteModule.voteActAction.insertUserVote(is_entity);
-	$('#list').datagrid('reload');
-	return v_result;
-//	}
-}
 
 /**
  * 功能：刷新

WebContent/jwapp/pages/vote/js/voteTab.js

 /**
- * 序号：1
+ * 序号：
  * 功能：定义分页(EasyUI)
  * 参数：
  * 说明：
@@ -30,7 +30,7 @@ var ls_ywlx = 'YBYW';
 /****/
 
 /**
- * 序号：2
+ * 序号：
  * 功能：构建下拉框内容
  * 参数：
  * 说明：方便新增、修改页面里的下拉选项加载数据
@@ -44,7 +44,7 @@ var v_statusquery_data = [{CODE_ID:'0',CODE_NAME:'未开始'},{CODE_ID:'1',CODE_
 /****/
 
 /**
- * 序号：3
+ * 序号：
  * 功能：构建主页面列表
  * 参数：
  * 说明：
@@ -54,7 +54,7 @@ var v_statusquery_data = [{CODE_ID:'0',CODE_NAME:'未开始'},{CODE_ID:'1',CODE_
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="投票管理功能&nbsp;&nbsp;<font color='#993300'></font>";
+var ls_title="投票管理功能";
 var is_column = [ [
 				{field : 'CONTENT',title : '主题内容',width : 150,align : 'center'},
 				{field : 'SUB_TITLE',title : '副标题',width : 150,align : 'center'},
@@ -76,13 +76,6 @@ var is_column = [ [
 				] ];
 //列表加载完成回调
 function dataOnLoadSuccess(){
-	$('#FIELD_STATUS_FLAG').combobox({
-		data : v_statusquery_data,
-		valueField : 'CODE_ID',
-		textField : 'CODE_NAME',
-		editable:false,  
-		panelHeight:'auto'
-	});
 }
 //设置颜色和每行高度
 function rowstyler(index,row){
@@ -94,7 +87,7 @@ datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/voteData_list",queryData,is_colu
 /****/
 
 /**
- * 序号：4
+ * 序号：
  * 功能：设置主页面操作列菜单
  * 参数：
  * 说明：
@@ -129,7 +122,7 @@ function getOptionMenuCount(){
 /****/
 
 /**
- * 序号：5
+ * 序号：
  * 功能：新增修改弹出
  * 参数：
  * 说明：
@@ -198,13 +191,32 @@ function updateUrlOnloadCallback(is_row){
 	
 }
 
+//保存
+function updateData(is_entity){
+	var returnIsValid = $('#voteItemInputForm').form('validate');
+	if (returnIsValid) {
+		var items=[];
+		$("input[name=vote_item_index]").each(function(index){
+			items.push({
+				INDEX_NAME:$(this).val(),
+				CONTENT:$("input[name=vote_item_info]").eq(index).val(),
+				UUID:$("input[name=vote_item_delete]").eq(index).val()
+			});
+		});
+	is_entity.FIELD_ITEMS=JSON.stringify(items);
+	v_result = voteModule.voteActAction.updateVote(is_entity);
+	$('#list').datagrid('reload');
+	return v_result;
+	}
+}
+
 function addZero(d){
 	if(d<10){
 		return "0"+d;
 	}
 	return d;
 }
-
+//限制时间
 function initDateBox(){
 	$("#END_TIME").datetimebox({
 	    required:true,
@@ -229,36 +241,13 @@ function initDateBox(){
 			return new Date().getTime()<=date||date.getDate()==new Date().getDate();
 		}
 	});	
-	/*$('#ss').numberspinner({
-    min: 10,
-    max: 100,
-    editable: false
-});*/
 }
 
-//保存
-function updateData(is_entity){
-	var returnIsValid = $('#voteItemInputForm').form('validate');
-	if (returnIsValid) {
-		var items=[];
-		$("input[name=vote_item_index]").each(function(index){
-			items.push({
-				INDEX_NAME:$(this).val(),
-				CONTENT:$("input[name=vote_item_info]").eq(index).val(),
-				UUID:$("input[name=vote_item_delete]").eq(index).val()
-			});
-		});
-	is_entity.FIELD_ITEMS=JSON.stringify(items);
-	v_result = voteModule.voteActAction.updateVote(is_entity);
-	$('#list').datagrid('reload');
-	return v_result;
-	}
-}
 
 /****/
 
 /**
- * 序号：6
+ * 序号：
  * 功能：单个删除
  * 参数：
  * 说明：
@@ -287,7 +276,7 @@ function deleteRow(index){
 /****/
 
 /**
- * 序号：7
+ * 序号：
  * 功能：批量删除
  * 参数：
  * 说明：
@@ -322,6 +311,24 @@ function deleteBatchRow(){
 /****/
 
 /**
+ * 序号：
+ * 功能：选项删除
+ * 参数：
+ * 说明：
+ * 作者：朱天成
+ * 时间：2018-08-07
+ * 单位：杰夫兄弟智慧科技有限公司
+ * 备注：需更改
+ **/
+function delete_vote_item(){
+	$(".vote_item_list :checkbox:checked").each(function(){
+		$(this).parent().parent().remove();
+
+	});
+	
+}
+
+/**
  * 
  * 提前结束
  * 
@@ -344,7 +351,7 @@ function voteEndRow(index){
 }
 
 /**
- * 序号：8
+ * 序号：
  * 功能：刷新
  * 参数：
  * 说明：
@@ -360,7 +367,7 @@ function refreshRow(){
 /****/
 
 /**
- * 序号：9
+ * 序号：
  * 功能：查询
  * 参数：
  * 说明：
@@ -408,10 +415,3 @@ function add_vote_item(index,content,uuid){
 	$.parser.parse('.vote_item_one');
 }
 
-function delete_vote_item(){
-	$(".vote_item_list :checkbox:checked").each(function(){
-		$(this).parent().parent().remove();
-
-	});
-	
-}

src_jwapp/com/jw/app/business/LogBusiness.java

@@ -10,76 +10,93 @@ import com.gaowj.business.util.Page;
 
 @Service
 public interface LogBusiness {
-	
+
 	/**
 	 * 插入
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	void insert_log(Map<String,Object> entity) throws BusinessException ;
+	void insert_log(Map<String, Object> entity) throws BusinessException;
 
 	/**
 	 * 更新
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    void update_log(Map<String,Object> entity) throws BusinessException ;
-    
-    /**
+	void update_log(Map<String, Object> entity) throws BusinessException;
+
+	/**
 	 * 删除记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    void delete_log(List<String> list)throws BusinessException;
-    
-    /**
+	void delete_log(List<String> list) throws BusinessException;
+
+	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    Page<Map<String, Object>> list_log(int pageNo, int pageSize, Map<String, Object> query)throws BusinessException ;
-    
-    /**
+	Page<Map<String, Object>> list_log(int pageNo, int pageSize, Map<String, Object> query) throws BusinessException;
+
+	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    List<Map<String,Object>> list_log(Map<String, Object> query) throws BusinessException ;
-    
-    /**
+	List<Map<String, Object>> list_log(Map<String, Object> query) throws BusinessException;
+
+	/**
 	 * 获取所有记录数
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    int listCount_log(Map<String, Object> query) throws BusinessException ;
-    
-    /**
+	int listCount_log(Map<String, Object> query) throws BusinessException;
+
+	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    List<Map<String,Object>> list_reply(Map<String, Object> query) throws BusinessException ;
-    
+	List<Map<String, Object>> list_reply(Map<String, Object> query) throws BusinessException;
 
-    /**
+	/**
 	 * 获取所有记录数
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    int listCount_reply(Map<String, Object> query) throws BusinessException ;
+	int listCount_reply(Map<String, Object> query) throws BusinessException;
 
 	/**
 	 * 插入
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	void insert_reply(Map<String,Object> entity) throws BusinessException ;
-	
+	void insert_reply(Map<String, Object> entity) throws BusinessException;
+
 	/**
 	 * 删除记录
+	 * 
+	 * @param entity
+	 * @throws BusinessException
+	 */
+	void delete_reply(List<String> list) throws BusinessException;
+
+	/**
+	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    void delete_reply(List<String> list)throws BusinessException;
+	Page<Map<String, Object>> list_reply(int pageNo, int pageSize, Map<String, Object> query) throws BusinessException;
 
 }

src_jwapp/com/jw/app/business/MeetingBusiness.java

@@ -10,66 +10,76 @@ import com.gaowj.business.util.Page;
 
 @Service
 public interface MeetingBusiness {
-	
+
 	/**
 	 * 插入
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	void insert_meeting(Map<String,Object> entity) throws BusinessException ;
+	void insert_meeting(Map<String, Object> entity) throws BusinessException;
 
 	/**
 	 * 更新
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    void update_meeting(Map<String,Object> entity) throws BusinessException ;
-    
-    /**
+	void update_meeting(Map<String, Object> entity) throws BusinessException;
+
+	/**
 	 * 删除记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    void delete_meeting(List<String> list)throws BusinessException;
-    
-    /**
+	void delete_meeting(List<String> list) throws BusinessException;
+
+	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    Page<Map<String, Object>> list_meeting(int pageNo, int pageSize, Map<String, Object> query)throws BusinessException ;
-    
-    /**
+	Page<Map<String, Object>> list_meeting(int pageNo, int pageSize, Map<String, Object> query)
+			throws BusinessException;
+
+	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    List<Map<String,Object>> list_meeting(Map<String, Object> query) throws BusinessException ;
-    
-    /**
+	List<Map<String, Object>> list_meeting(Map<String, Object> query) throws BusinessException;
+
+	/**
 	 * 获取所有记录数
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-    int listCount_meeting(Map<String, Object> query) throws BusinessException ;
+	int listCount_meeting(Map<String, Object> query) throws BusinessException;
 
-    /**
+	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	Page<Map<String, Object>> list_check_in(int pageNo, int pageSize, Map<String, Object> query)throws BusinessException;
+	Page<Map<String, Object>> list_check_in(int pageNo, int pageSize, Map<String, Object> query)
+			throws BusinessException;
 
 	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	List<Map<String, Object>> list_check_in(Map<String, Object> query) throws BusinessException;
 
-
-    /**
+	/**
 	 * 获取所有记录数
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
@@ -77,6 +87,7 @@ public interface MeetingBusiness {
 
 	/**
 	 * 插入
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */

src_jwapp/com/jw/app/business/VoteBusiness.java

@@ -60,14 +60,6 @@ public interface VoteBusiness {
 	List<Map<String, Object>> list_vote(Map<String, Object> query) throws BusinessException;
 
 	/**
-	 * 获取所有记录数
-	 * 
-	 * @param entity
-	 * @throws BusinessException
-	 */
-	int listCount_vote(Map<String, Object> query) throws BusinessException;
-
-	/**
 	 * 获取选项
 	 * 
 	 * @param entity
@@ -89,8 +81,7 @@ public interface VoteBusiness {
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	void update_endvote(Map<String, Object> entity) throws BusinessException;
-
+	void update_endVote(Map<String, Object> entity) throws BusinessException;
 
 	/**
 	 * 分页获取记录
@@ -98,7 +89,8 @@ public interface VoteBusiness {
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	Page<Map<String, Object>> list_ongoing(int pageNo, int pageSize, Map<String, Object> query) throws BusinessException;
+	Page<Map<String, Object>> list_ongoing(int pageNo, int pageSize, Map<String, Object> query)
+			throws BusinessException;
 
 	/**
 	 * 获取所有记录
@@ -109,15 +101,6 @@ public interface VoteBusiness {
 	List<Map<String, Object>> list_ongoing(Map<String, Object> query) throws BusinessException;
 
 	/**
-	 * 获取所有记录数
-	 * 
-	 * @param entity
-	 * @throws BusinessException
-	 */
-	int listCount_ongoing(Map<String, Object> query) throws BusinessException;
-	
-
-	/**
 	 * 分页获取记录
 	 * 
 	 * @param entity
@@ -134,22 +117,11 @@ public interface VoteBusiness {
 	List<Map<String, Object>> list_ended(Map<String, Object> query) throws BusinessException;
 
 	/**
-	 * 获取所有记录数
-	 * 
-	 * @param entity
-	 * @throws BusinessException
-	 */
-	int listCount_ended(Map<String, Object> query) throws BusinessException;
-
-	/**
 	 * 获取用户选择
 	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
-	List<Map<String, Object>> list_userchecked(Map<String, Object> query) throws BusinessException;
-	
-
-
+	List<Map<String, Object>> list_userChecked(Map<String, Object> query) throws BusinessException;
 
 }

src_jwapp/com/jw/app/business/log/LogBusinessImpl.java

@@ -34,7 +34,7 @@ public class LogBusinessImpl implements LogBusiness {
 
 	@Override
 	public void insert_log(Map<String, Object> entity) throws BusinessException {
-		
+
 		entity.put("UUID", java.util.UUID.randomUUID().toString());
 		entity.put("CREATE_NAME", SessionUtil.getEmname());
 		entity.put("CREATE_ID", SessionUtil.getCode());
@@ -86,7 +86,7 @@ public class LogBusinessImpl implements LogBusiness {
 	@Override
 	public void delete_log(List<String> list) throws BusinessException {
 		logDAO.delete_log(list);
-		logDAO.delete_log_reply(list);
+		logDAO.delete_byLogId(list);
 
 	}
 
@@ -97,9 +97,9 @@ public class LogBusinessImpl implements LogBusiness {
 		int pageStart = (pageNo - 1) * pageSize;
 
 		// 获取列表
-		List<Map<String, Object>> items = logDAO.list_log(new RowBounds(pageStart, pageSize), 
+		List<Map<String, Object>> items = logDAO.list_log(new RowBounds(pageStart, pageSize),
 
-query);
+				query);
 		// 获取列表个数
 		int count = listCount_log(query);
 
@@ -114,13 +114,10 @@ query);
 	}
 
 	@Override
-	public List<Map<String, Object>> list_log(Map<String, Object> query) throws BusinessException 
-
-{
-		List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "meeting" + query);
+	public List<Map<String, Object>> list_log(Map<String, Object> query) throws BusinessException {
+		List<Map<String, Object>> list_data = null;
 		if (list_data == null || list_data.size() == 0) {
 			list_data = logDAO.list_log(query);
-			CacheKit.put("ehcache10", "log" + query, list_data);
 		}
 		return list_data;
 	}
@@ -129,6 +126,29 @@ query);
 	public int listCount_log(Map<String, Object> query) throws BusinessException {
 		return logDAO.listCount_log(query);
 	}
+	
+	@Override
+	public Page<Map<String, Object>> list_reply(int pageNo, int pageSize, Map<String, Object> query)
+			throws BusinessException {
+		// 计算起始记录
+		int pageStart = (pageNo - 1) * pageSize;
+
+		// 获取列表
+		List<Map<String, Object>> items = logDAO.list_reply(new RowBounds(pageStart, pageSize),
+
+				query);
+		// 获取列表个数
+		int count = listCount_reply(query);
+
+		// 创建分页对象
+		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
+		page.setStart(pageStart);
+		page.setLimit(pageSize);
+		page.setCount(count);
+		page.setItems(items);
+
+		return page;
+	}
 
 	@Override
 	public List<Map<String, Object>> list_reply(Map<String, Object> query) throws BusinessException {
@@ -143,12 +163,13 @@ query);
 	@Override
 	public void insert_reply(Map<String, Object> entity) throws BusinessException {
 		entity.put("UUID", java.util.UUID.randomUUID().toString());
-		entity.put("CODE",SessionUtil.getCode());
+		entity.put("CODE", SessionUtil.getCode());
 		entity.put("REPLY_NAME", SessionUtil.getEmname());
+		entity.put("REPLY_TIME", new Date());
 		entity.put("CREATE_ID", SessionUtil.getCode());
-		entity.put("CREATE_TIME", SessionUtil.getCurrenttime());
+		entity.put("CREATE_TIME", new Date());
 		entity.put("UPDATE_ID", SessionUtil.getCode());
-		entity.put("UPDATE_TIME", SessionUtil.getCurrenttime());
+		entity.put("UPDATE_TIME", new Date());
 		List<String> itemListKey = new ArrayList<String>();
 		List<Object> itemList = new ArrayList<Object>();
 		if (entity.keySet() != null) {
@@ -165,8 +186,6 @@ query);
 		}
 	}
 
-	
-
 	@Override
 	public void delete_reply(List<String> list) throws BusinessException {
 		logDAO.delete_reply(list);

src_jwapp/com/jw/app/business/log/logDAO.java

@@ -14,8 +14,8 @@ public interface logDAO {
 	void update_log(Map<String, Object> entity) throws BusinessException;
 
 	void delete_log(List<String> list) throws BusinessException;
-	
-	void delete_log_reply(List<String> list) throws BusinessException;
+
+	void delete_byLogId(List<String> list) throws BusinessException;
 
 	List<Map<String, Object>> list_log(RowBounds rowbounds, Map<String, Object> query) throws BusinessException;
 

src_jwapp/com/jw/app/business/log/logDAO.xml

@@ -3,36 +3,36 @@
 <mapper namespace="com.jw.app.business.log.logDAO">
 
 	<sql id="WHERE">
-	<where>
-		<trim prefixOverrides="and">
-		<if test="UUID != null and UUID != ''">
-			and f.UUID = #{UUID}
-        </if>
-        <if test="LOG_TITLE != null and LOG_TITLE != ''">
-		and f.LOG_TITLE like concat('%',#{LOG_TITLE},'%')
-        </if>
-        <if test="LOG_CONTENT != null and LOG_CONTENT != ''">
-		and f.LOG_CONTENT like concat('%',#{LOG_CONTENT},'%')
-        </if>
-        <if test="CREATE_NAME != null and CREATE_NAME != ''">
-			and f.CREATE_NAME = #{CREATE_NAME}
-        </if>
-        <if test="CREATE_ID != null and CREATE_ID != ''">
-			and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
-		</if>
-		<if test="CREATE_TIME != null and CREATE_TIME != ''">
-			and f.CREATE_TIME = #{CREATE_TIME}
-		</if>
-		<if test="UPDATE_ID != null and UPDATE_ID != ''">
-			and f.UPDATE_ID like concat('%',#{UPDATE_ID},'%')
-		</if>
-		<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
-			and f.UPDATE_TIME = #{UPDATE_TIME}
-		</if>
-		</trim>
+		<where>
+			<trim prefixOverrides="and">
+				<if test="UUID != null and UUID != ''">
+					and f.UUID = #{UUID}
+				</if>
+				<if test="LOG_TITLE != null and LOG_TITLE != ''">
+					and f.LOG_TITLE like concat('%',#{LOG_TITLE},'%')
+				</if>
+				<if test="LOG_CONTENT != null and LOG_CONTENT != ''">
+					and f.LOG_CONTENT like concat('%',#{LOG_CONTENT},'%')
+				</if>
+				<if test="CREATE_NAME != null and CREATE_NAME != ''">
+					and f.CREATE_NAME = #{CREATE_NAME}
+				</if>
+				<if test="CREATE_ID != null and CREATE_ID != ''">
+					and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
+				</if>
+				<if test="CREATE_TIME != null and CREATE_TIME != ''">
+					and f.CREATE_TIME = #{CREATE_TIME}
+				</if>
+				<if test="UPDATE_ID != null and UPDATE_ID != ''">
+					and f.UPDATE_ID like concat('%',#{UPDATE_ID},'%')
+				</if>
+				<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
+					and f.UPDATE_TIME = #{UPDATE_TIME}
+				</if>
+			</trim>
 		</where>
 	</sql>
-	
+
 	<insert id="insert_log" parameterType="map">
 		insert into LOG_MANAGE(
 		<trim prefix="" suffixOverrides=",">
@@ -48,7 +48,7 @@
 		</trim>
 	      <![CDATA[ ) ]]>
 	</insert>
-	
+
 	<update id="update_log" parameterType="map">
 	       <![CDATA[
             update LOG_MANAGE set 
@@ -61,20 +61,20 @@
 		<where>
 			<if test="UUID != null and UUID != ''">
 				and UUID = #{UUID}
-           </if>
+			</if>
 		</where>
 	</update>
-	
+
 	<delete id="delete_log" parameterType="list">
         <![CDATA[
             delete from  LOG_MANAGE where UUID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
-			#{UUID} 
-         </foreach>
+			#{UUID}
+		</foreach>
 	</delete>
-	
+
 	<insert id="insert_reply" parameterType="map">
 		insert into LOG_REPLY(
 		<trim prefix="" suffixOverrides=",">
@@ -90,58 +90,60 @@
 		</trim>
 	      <![CDATA[ ) ]]>
 	</insert>
-	
-	<delete id="delete_log_reply" parameterType="list">
+
+	<delete id="delete_byLogId" parameterType="list">
         <![CDATA[
             delete from  LOG_REPLY where LOG_ID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
-			#{UUID} 
-         </foreach>
+			#{UUID}
+		</foreach>
 	</delete>
-	
+
 	<delete id="delete_reply" parameterType="list">
         <![CDATA[
             delete from  LOG_REPLY where UUID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
-			#{UUID} 
-         </foreach>
+			#{UUID}
+		</foreach>
 	</delete>
 
 	<select id="list_log" parameterType="map" resultType="upperCaseKeyMap">
-		select nmanage.*,nupdate.real_name new_update from (select manage.*,info.real_name new_create
-		from log_manage  manage
-		LEFT JOIN `uicm_user_info`  info  on
-		info.user_id=manage.create_id ) nmanage
-		LEFT JOIN (select manage.uuid,info.real_name
-		from log_manage  manage
-		LEFT JOIN `uicm_user_info`  info  on
-		info.user_id=manage.update_id ) nupdate
-		on nmanage.uuid=nupdate.uuid
+		SELECT
+		manage.*,
+		info1.real_name new_create,
+		info2.real_name new_update,
+		reply.*
+		FROM
+		log_manage manage
+		LEFT JOIN `uicm_user_info` info1 ON info1.user_id = manage.create_id
+		LEFT JOIN `uicm_user_info` info2 ON info2.user_id = manage.update_id
+		LEFT JOIN ( SELECT log_id, count( * ) reply_count FROM log_reply GROUP BY
+		log_id ) reply ON manage.uuid = reply.log_id
 		<include refid="WHERE"></include>
 		order by CREATE_TIME DESC
 	</select>
 
 	<select id="listCount_log" parameterType="map" resultType="int">
-	 SELECT count(*) FROM LOG_MANAGE f 
-	<include refid="WHERE"></include>
-	</select> 
-	
+		SELECT count(*) FROM LOG_MANAGE f
+		<include refid="WHERE"></include>
+	</select>
+
 	<select id="list_reply" parameterType="map" resultType="upperCaseKeyMap">
 		select *
 		from LOG_REPLY
 		where LOG_ID=#{LOG_ID}
 		order by CREATE_TIME
 	</select>
-	
+
 	<select id="listCount_reply" parameterType="map" resultType="int">
-	 SELECT count(*) FROM LOG_REPLY  
-	 where LOG_ID=#{LOG_ID}
+		SELECT count(*) FROM LOG_REPLY
+		where LOG_ID=#{LOG_ID}
 	</select>
 
-	
+
 
 </mapper>
\ No newline at end of file

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

@@ -17,7 +17,7 @@ import com.gaowj.business.util.SessionUtil;
 import com.gaowj.standard.utils.CacheKit;
 
 public class MeetingBusinessImpl implements MeetingBusiness {
-	
+
 	private meetingDAO meetingDAO;
 
 	public meetingDAO getmeetingDAO() {
@@ -34,74 +34,76 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 		entity.put("CREATE_ID", SessionUtil.getCode());
 		entity.put("CREATE_TIME", new Date());
 		entity.put("UPDATE_ID", SessionUtil.getCode());
-		
+
 		entity.put("UPDATE_TIME", new Date());
-		//动态传值插入
+		// 动态传值插入
 		List<String> infoListKey = new ArrayList<String>();
-        List<Object> infoList = new ArrayList<Object>();
-        if(entity.keySet()!=null){
-          Set<String> key  = entity.keySet();
-          // 将map集合中的key和value 取出来分别放到list集合里
-          for (String str : key) {
-            infoList.add(entity.get(str));
-            infoListKey.add(str);
-          }
-          entity.put("infoListKey", infoListKey);
-          entity.put("infoList", infoList);
-          // 插入
-          meetingDAO.insert_meeting(entity);
-        }
+		List<Object> infoList = new ArrayList<Object>();
+		if (entity.keySet() != null) {
+			Set<String> key = entity.keySet();
+			// 将map集合中的key和value 取出来分别放到list集合里
+			for (String str : key) {
+				infoList.add(entity.get(str));
+				infoListKey.add(str);
+			}
+			entity.put("infoListKey", infoListKey);
+			entity.put("infoList", infoList);
+			// 插入
+			meetingDAO.insert_meeting(entity);
+		}
 	}
-	
+
 	@Override
 	public void insert_check_in(Map<String, Object> entity) throws BusinessException {
 		List<Map<String, Object>> items = meetingDAO.list_check_in(entity);
-		if(items.size() == 0) {
-		entity.put("UUID", java.util.UUID.randomUUID().toString());
-		entity.put("PARTICIPANTS_NAME", SessionUtil.getEmname());
-		entity.put("CHECK_IN_TIME", new Date());
-		entity.put("CREATE_ID", SessionUtil.getCode());
-		entity.put("CREATE_TIME", new Date());
-		entity.put("UPDATE_ID", SessionUtil.getCode());
-		entity.put("UPDATE_TIME", new Date());
-		//动态传值插入
-		List<String> infoListKey = new ArrayList<String>();
-        List<Object> infoList = new ArrayList<Object>();
-        if(entity.keySet()!=null){
-          Set<String> key  = entity.keySet();
-          // 将map集合中的key和value 取出来分别放到list集合里
-          for (String str : key) {
-            infoList.add(entity.get(str));
-            infoListKey.add(str);
-          }
-          entity.put("infoListKey", infoListKey);
-          entity.put("infoList", infoList);
-          // 插入
-          meetingDAO.insert_check_in(entity);
-        }
+		if (items.size() == 0) {
+			entity.put("UUID", java.util.UUID.randomUUID().toString());
+			entity.put("PARTICIPANTS_ID", SessionUtil.getCode());
+			entity.put("PARTICIPANTS_NAME", SessionUtil.getEmname());
+			entity.put("CHECK_IN_TIME", new Date());
+			entity.put("CREATE_ID", SessionUtil.getCode());
+			entity.put("CREATE_TIME", new Date());
+			entity.put("UPDATE_ID", SessionUtil.getCode());
+			entity.put("UPDATE_TIME", new Date());
+			// 动态传值插入
+			List<String> infoListKey = new ArrayList<String>();
+			List<Object> infoList = new ArrayList<Object>();
+			if (entity.keySet() != null) {
+				Set<String> key = entity.keySet();
+				// 将map集合中的key和value 取出来分别放到list集合里
+				for (String str : key) {
+					infoList.add(entity.get(str));
+					infoListKey.add(str);
+				}
+				entity.put("infoListKey", infoListKey);
+				entity.put("infoList", infoList);
+				// 插入
+				meetingDAO.insert_check_in(entity);
+			}
 		}
 	}
 
 	@Override
 	public void update_meeting(Map<String, Object> entity) throws BusinessException {
-		//动态传值修改
+		// 动态传值修改
 		entity.put("UPDATE_ID", SessionUtil.getCode());
 		entity.put("UPDATE_TIME", new Date());
 		List<Map<String, Object>> updateList = new ArrayList<Map<String, Object>>();
-		if(entity.keySet()!=null){
+		if (entity.keySet() != null) {
 			Set<String> key = entity.keySet();
-            // 将map集合中的key和value 取出来分别放到list集合里
-		    for (String str : key) {
-			   Map<String, Object> updateMap = new HashMap<String, Object>();
-			   if (StringUtils.equalsIgnoreCase("UUID",str)) continue;
-			   updateMap.put("key", str);
-			   updateMap.put("value", entity.get(str));
-
-			   updateList.add(updateMap);
-		    }
-		    entity.put("info", updateList);
-            //
-		    meetingDAO.update_meeting(entity);
+			// 将map集合中的key和value 取出来分别放到list集合里
+			for (String str : key) {
+				Map<String, Object> updateMap = new HashMap<String, Object>();
+				if (StringUtils.equalsIgnoreCase("UUID", str))
+					continue;
+				updateMap.put("key", str);
+				updateMap.put("value", entity.get(str));
+
+				updateList.add(updateMap);
+			}
+			entity.put("info", updateList);
+			//
+			meetingDAO.update_meeting(entity);
 		}
 
 	}
@@ -110,29 +112,30 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 	public void delete_meeting(List<String> list) throws BusinessException {
 		meetingDAO.delete_meeting(list);
 		meetingDAO.delete_check_in(list);
-		
+
 	}
 
 	@Override
-	public Page<Map<String, Object>> list_meeting(int pageNo, int pageSize,Map<String, Object> query) throws BusinessException {
-		//计算起始记录
-  		int pageStart = (pageNo - 1) * pageSize;
-  		
-  		//获取列表
-  		List<Map<String, Object>> items = meetingDAO.list_meeting(new RowBounds(pageStart, pageSize), query);
-  		//获取列表个数
-  		int count = listCount_meeting(query);
-  		
-  		//创建分页对象
-  		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
-  		page.setStart(pageStart);
-  		page.setLimit(pageSize);
-  		page.setCount(count);
-  		page.setItems(items);
-
-  		return page;
+	public Page<Map<String, Object>> list_meeting(int pageNo, int pageSize, Map<String, Object> query)
+			throws BusinessException {
+		// 计算起始记录
+		int pageStart = (pageNo - 1) * pageSize;
+
+		// 获取列表
+		List<Map<String, Object>> items = meetingDAO.list_meeting(new RowBounds(pageStart, pageSize), query);
+		// 获取列表个数
+		int count = listCount_meeting(query);
+
+		// 创建分页对象
+		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
+		page.setStart(pageStart);
+		page.setLimit(pageSize);
+		page.setCount(count);
+		page.setItems(items);
+
+		return page;
 	}
-	
+
 	@Override
 	public Page<Map<String, Object>> list_check_in(int pageNo, int pageSize, Map<String, Object> query)
 			throws BusinessException {
@@ -153,13 +156,12 @@ public class MeetingBusinessImpl implements MeetingBusiness {
 
 		return page;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> list_check_in(Map<String, Object> query) throws BusinessException {
-		List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "meeting"+query);
-		if(list_data==null || list_data.size()==0){
-			list_data=meetingDAO.list_check_in(query);
-			CacheKit.put("ehcache10", "kqmk"+query, list_data);
+		List<Map<String, Object>> list_data = null;
+		if (list_data == null || list_data.size() == 0) {
+			list_data = meetingDAO.list_check_in(query);
 		}
 		return list_data;
 	}
@@ -171,10 +173,10 @@ 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);
-		if(list_data==null || list_data.size()==0){
-			list_data=meetingDAO.list_meeting(query);
-			CacheKit.put("ehcache10", "kqmk"+query, list_data);
+		List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "meeting" + query);
+		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

@@ -8,27 +8,27 @@ import org.apache.ibatis.session.RowBounds;
 import com.gaowj.business.exception.BusinessException;
 
 public interface meetingDAO {
-	
-    void insert_meeting(Map<String,Object> entity) throws BusinessException ;
-    
-    void insert_check_in(Map<String,Object> entity) throws BusinessException ;
-	
-	void update_meeting(Map<String,Object> entity) throws BusinessException ;
-	
+
+	void insert_meeting(Map<String, Object> entity) throws BusinessException;
+
+	void insert_check_in(Map<String, Object> entity) throws BusinessException;
+
+	void update_meeting(Map<String, Object> entity) throws BusinessException;
+
 	void delete_meeting(List<String> list) throws BusinessException;
-	
+
 	void delete_check_in(List<String> list) throws BusinessException;
-	
-    List<Map<String,Object>> list_meeting(RowBounds rowbounds, Map<String, Object> query) throws BusinessException ;
-    
-    List<Map<String,Object>> list_meeting(Map<String,Object> query) throws BusinessException ;
-    
-    int listCount_meeting(Map<String, Object> query) throws BusinessException ;
-    
-    List<Map<String,Object>> list_check_in(RowBounds rowbounds, Map<String, Object> query) throws BusinessException ;
-    
-    List<Map<String,Object>> list_check_in(Map<String,Object> query) throws BusinessException ;
-    
-    int listCount_check_in(Map<String, Object> query) throws BusinessException ;
+
+	List<Map<String, Object>> list_meeting(RowBounds rowbounds, Map<String, Object> query) throws BusinessException;
+
+	List<Map<String, Object>> list_meeting(Map<String, Object> query) throws BusinessException;
+
+	int listCount_meeting(Map<String, Object> query) throws BusinessException;
+
+	List<Map<String, Object>> list_check_in(RowBounds rowbounds, Map<String, Object> query) throws BusinessException;
+
+	List<Map<String, Object>> list_check_in(Map<String, Object> query) throws BusinessException;
+
+	int listCount_check_in(Map<String, Object> query) throws BusinessException;
 
 }

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

@@ -3,45 +3,46 @@
 <mapper namespace="com.jw.app.business.meeting.meetingDAO">
 
 	<sql id="WHERE">
-	<where>
-		<trim prefixOverrides="and">
-			<if test="UUID != null and UUID != ''">
-			and f.UUID = #{UUID}
-        </if>
-        <if test="MEETING_ID != null and MEETING_ID != ''">
-			and f.MEETING_ID = #{MEETING_ID}
-        </if>
-        <if test="MEETING_NAME != null and MEETING_NAME != ''">
-			and f.MEETING_NAME like concat('%',#{MEETING_NAME},'%')
-        </if>
-        <if test="MEETING_CONTENT != null and MEETING_CONTENT != ''">
-		and f.MEETING_CONTENT like concat('%',#{MEETING_CONTENT},'%')
-        </if>
-        <if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
-			and f.PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
-        </if>
-        <if test="VENUE != null and VENUE != ''">
-			and f.VENUE = #{VENUE}
-        </if>
-        <if test="CREATE_ID != null and CREATE_ID != ''">
-			and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
-		</if>
-		<if test="START_TIME != null and START_TIME != ''">
-			and f.CREATE_TIME &gt;= #{START_TIME}
-		</if>
-		<if test="END_TIME != null and END_TIME != ''">
-			and f.CREATE_TIME &lt;= #{END_TIME}
-		</if>
-		<if test="UPDATE_ID != null and UPDATE_ID != ''">
-			and f.UPDATE_ID = #{UPDATE_ID}
-		</if>
-		<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
-			and f.UPDATE_TIME = #{UPDATE_TIME}
-		</if>
-		</trim>
+		<where>
+			<trim prefixOverrides="and">
+				<if test="UUID != null and UUID != ''">
+					and f.UUID = #{UUID}
+				</if>
+				<if test="MEETING_ID != null and MEETING_ID != ''">
+					and f.MEETING_ID = #{MEETING_ID}
+				</if>
+				<if test="MEETING_NAME != null and MEETING_NAME != ''">
+					and f.MEETING_NAME like concat('%',#{MEETING_NAME},'%')
+				</if>
+				<if test="MEETING_CONTENT != null and MEETING_CONTENT != ''">
+					and f.MEETING_CONTENT like
+					concat('%',#{MEETING_CONTENT},'%')
+				</if>
+				<if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
+					and f.PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
+				</if>
+				<if test="VENUE != null and VENUE != ''">
+					and f.VENUE = #{VENUE}
+				</if>
+				<if test="CREATE_ID != null and CREATE_ID != ''">
+					and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
+				</if>
+				<if test="START_TIME != null and START_TIME != ''">
+					and f.CREATE_TIME &gt;= #{START_TIME}
+				</if>
+				<if test="END_TIME != null and END_TIME != ''">
+					and f.CREATE_TIME &lt;= #{END_TIME}
+				</if>
+				<if test="UPDATE_ID != null and UPDATE_ID != ''">
+					and f.UPDATE_ID = #{UPDATE_ID}
+				</if>
+				<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
+					and f.UPDATE_TIME = #{UPDATE_TIME}
+				</if>
+			</trim>
 		</where>
 	</sql>
-	
+
 	<insert id="insert_meeting" parameterType="map">
 		insert into MEETING_MANAGE(
 		<trim prefix="" suffixOverrides=",">
@@ -57,7 +58,7 @@
 		</trim>
 	      <![CDATA[ ) ]]>
 	</insert>
-	
+
 	<insert id="insert_check_in" parameterType="map">
 		insert into MEETING_CHECK_IN(
 		<trim prefix="" suffixOverrides=",">
@@ -86,88 +87,98 @@
 		<where>
 			<if test="UUID != null and UUID != ''">
 				and UUID = #{UUID}
-           </if>
+			</if>
 		</where>
 	</update>
-	
+
 	<delete id="delete_meeting" parameterType="list">
         <![CDATA[
             delete from  MEETING_MANAGE where UUID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
-			#{UUID} 
-         </foreach>
+			#{UUID}
+		</foreach>
 	</delete>
-	
+
 	<delete id="delete_check_in" parameterType="list">
         <![CDATA[
             delete from  MEETING_CHECK_IN where MEETING_ID IN
          ]]>
 		<foreach collection="list" item="UUID" open="(" separator=","
 			close=")">
-			#{UUID} 
-         </foreach>
+			#{UUID}
+		</foreach>
 	</delete>
 
 	<select id="list_meeting" parameterType="map" resultType="upperCaseKeyMap">
-	SELECT * FROM
-	(
-	SELECT
+		SELECT * FROM
+		(
+		SELECT
 		manage.*,
-		SUM( CASE WHEN check_in.uuid IS NULL THEN 0 ELSE 1 END ) AS meeting_count  
-	FROM
-		( SELECT * FROM `meeting_manage`) manage
-		LEFT JOIN ( SELECT * FROM `meeting_check_in` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
-						and PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
-					</if>
-				</trim>
-			</where>
-		) check_in ON manage.uuid = check_in.meeting_id 
-	GROUP BY
+		SUM( CASE WHEN check_in.uuid IS NULL THEN
+		0 ELSE 1 END ) AS
+		meeting_count
+		FROM
+		( SELECT * FROM `meeting_manage`)
+		manage
+		LEFT JOIN ( SELECT * FROM
+		`meeting_check_in`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
+					and PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
+				</if>
+			</trim>
+		</where>
+		) check_in ON manage.uuid = check_in.meeting_id
+		GROUP BY
 		manage.uuid
-	) f 
-	
-	<include refid="WHERE"></include>
+		) f
+
+		<include refid="WHERE"></include>
 		order by f.CREATE_TIME DESC
 	</select>
 
 	<select id="listCount_meeting" parameterType="map" resultType="int">
-	 SELECT count(*) FROM
-	(
-	SELECT
+		SELECT count(*) FROM
+		(
+		SELECT
 		manage.*,
-		SUM( CASE WHEN check_in.uuid IS NULL THEN 0 ELSE 1 END ) AS meeting_count  
-	FROM
-		( SELECT * FROM `meeting_manage`) manage
-		LEFT JOIN ( SELECT * FROM `meeting_check_in` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
-						and PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
-					</if>
-				</trim>
-			</where>
-		) check_in ON manage.uuid = check_in.meeting_id 
-	GROUP BY
+		SUM( CASE WHEN check_in.uuid IS
+		NULL THEN 0 ELSE 1 END ) AS
+		meeting_count
+		FROM
+		( SELECT * FROM
+		`meeting_manage`) manage
+		LEFT JOIN ( SELECT * FROM
+		`meeting_check_in`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="PARTICIPANTS_NAME != null and PARTICIPANTS_NAME != ''">
+					and PARTICIPANTS_NAME = #{PARTICIPANTS_NAME}
+				</if>
+			</trim>
+		</where>
+		) check_in ON manage.uuid = check_in.meeting_id
+		GROUP BY
 		manage.uuid
-	) f 
-	<include refid="WHERE"></include>
-	</select> 
-	
+		) f
+		<include refid="WHERE"></include>
+	</select>
+
 	<select id="list_check_in" parameterType="map" resultType="upperCaseKeyMap">
 		select check_in.*,info.real_name,unit.name,info.telephone
-		from meeting_check_in  check_in
-		LEFT JOIN `uicm_user_info`  info  on
+		from
+		meeting_check_in check_in
+		LEFT JOIN `uicm_user_info` info on
 		info.user_id=check_in.create_id
 		left join uicm_v_unit unit
-		on unit.uuid=info.unit_id
+		on
+		unit.uuid=info.unit_id
 		where check_in.meeting_id=#{MEETING_ID}
-		
+
 	</select>
-	
+
 
 </mapper>
\ No newline at end of file

src_jwapp/com/jw/app/business/vote/VoteBusinessImpl.java

@@ -70,7 +70,7 @@ public class VoteBusinessImpl implements VoteBusiness {
 			item.put("UUID", java.util.UUID.randomUUID().toString());
 			item.put("CREATE_ID", SessionUtil.getCode());
 			item.put("CREATE_TIME", SessionUtil.getCurrenttime());
-			item.put("UPDATE_ID",SessionUtil.getCode());
+			item.put("UPDATE_ID", SessionUtil.getCode());
 			item.put("MANAGE_ID", entity.get("UUID"));
 			item.put("UPDATE_TIME", SessionUtil.getCurrenttime());
 			item.put("SORT_NUM", i);
@@ -218,6 +218,7 @@ public class VoteBusinessImpl implements VoteBusiness {
 
 		if (listMoveUuid.size() > 0) {
 			voteDAO.delete_item(listMoveUuid);
+			voteDAO.delete_vote_action(listMoveUuid);
 		}
 	}
 
@@ -239,22 +240,7 @@ public class VoteBusinessImpl implements VoteBusiness {
 	public Page<Map<String, Object>> list_vote(int pageNo, int pageSize, Map<String, Object> query)
 			throws BusinessException {
 		query.put("CREATE_ID", SessionUtil.getCode());
-		// 计算起始记录
-		int pageStart = (pageNo - 1) * pageSize;
-
-		// 获取列表
-		List<Map<String, Object>> items = voteDAO.list_vote(new RowBounds(pageStart, pageSize), query);
-		// 获取列表个数
-		int count = listCount_vote(query);
-
-		// 创建分页对象
-		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
-		page.setStart(pageStart);
-		page.setLimit(pageSize);
-		page.setCount(count);
-		page.setItems(items);
-
-		return page;
+		return list_vote_info(pageNo, pageSize, query);
 	}
 
 	@Override
@@ -262,34 +248,24 @@ public class VoteBusinessImpl implements VoteBusiness {
 			throws BusinessException {
 		// 计算起始记录
 		query.put("STATUS_FLAG", 1);
-		int pageStart = (pageNo - 1) * pageSize;
-
-		// 获取列表
-		List<Map<String, Object>> items = voteDAO.list_vote(new RowBounds(pageStart, pageSize), query);
-		// 获取列表个数
-		int count = listCount_vote(query);
-
-		// 创建分页对象
-		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
-		page.setStart(pageStart);
-		page.setLimit(pageSize);
-		page.setCount(count);
-		page.setItems(items);
-
-		return page;
+		return list_vote_info(pageNo, pageSize, query);
 	}
 
 	@Override
 	public Page<Map<String, Object>> list_ended(int pageNo, int pageSize, Map<String, Object> query)
 			throws BusinessException {
 		query.put("STATUS_FLAG", 2);
+		return list_vote_info(pageNo, pageSize, query);
+	}
+
+	private Page<Map<String, Object>> list_vote_info(int pageNo, int pageSize, Map<String, Object> query) {
 		// 计算起始记录
 		int pageStart = (pageNo - 1) * pageSize;
 
 		// 获取列表
 		List<Map<String, Object>> items = voteDAO.list_vote(new RowBounds(pageStart, pageSize), query);
 		// 获取列表个数
-		int count = listCount_vote(query);
+		int count = voteDAO.listCount_vote(query);
 
 		// 创建分页对象
 		Page<Map<String, Object>> page = new Page<Map<String, Object>>();
@@ -303,30 +279,14 @@ public class VoteBusinessImpl implements VoteBusiness {
 
 	@Override
 	public List<Map<String, Object>> list_vote(Map<String, Object> query) throws BusinessException {
-		List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "vote" + query);
+		List<Map<String, Object>> list_data = null;
 		if (list_data == null || list_data.size() == 0) {
 			list_data = voteDAO.list_vote(query);
-			CacheKit.put("ehcache10", "vote" + query, list_data);
 		}
 		return list_data;
 	}
 
 	@Override
-	public int listCount_vote(Map<String, Object> query) throws BusinessException {
-		return voteDAO.listCount_vote(query);
-	}
-
-	@Override
-	public int listCount_ongoing(Map<String, Object> query) throws BusinessException {
-		return voteDAO.listCount_vote(query);
-	}
-
-	@Override
-	public int listCount_ended(Map<String, Object> query) throws BusinessException {
-		return voteDAO.listCount_vote(query);
-	}
-
-	@Override
 	public List<Map<String, Object>> list_ongoing(Map<String, Object> query) throws BusinessException {
 
 		return voteDAO.list_vote(query);
@@ -344,12 +304,12 @@ public class VoteBusinessImpl implements VoteBusiness {
 	}
 
 	@Override
-	public List<Map<String, Object>> list_userchecked(Map<String, Object> query) throws BusinessException {
-		return voteDAO.list_userchecked(query);
+	public List<Map<String, Object>> list_userChecked(Map<String, Object> query) throws BusinessException {
+		return voteDAO.list_userChecked(query);
 	}
 
 	@Override
-	public void update_endvote(Map<String, Object> entity) throws BusinessException {
+	public void update_endVote(Map<String, Object> entity) throws BusinessException {
 		// 动态传值修改
 		entity.put("REALLY_END_TIME", new Date());
 		entity.put("UPDATE_TIME", new Date());

src_jwapp/com/jw/app/business/vote/voteDAO.java

@@ -8,34 +8,33 @@ import org.apache.ibatis.session.RowBounds;
 import com.gaowj.business.exception.BusinessException;
 
 public interface voteDAO {
-	
-    void insert_vote(Map<String,Object> entity) throws BusinessException ;
-    
-    void insert_item(Map<String,Object> itemmap) throws BusinessException ;
-    
-    void insert_userVote(Map<String,Object> itemmap) throws BusinessException ;
-	
-	void update_vote(Map<String,Object> entity) throws BusinessException ;
-	
-	void update_item(Map<String,Object> item) throws BusinessException ;
-	
+
+	void insert_vote(Map<String, Object> entity) throws BusinessException;
+
+	void insert_item(Map<String, Object> itemmap) throws BusinessException;
+
+	void insert_userVote(Map<String, Object> itemmap) throws BusinessException;
+
+	void update_vote(Map<String, Object> entity) throws BusinessException;
+
+	void update_item(Map<String, Object> item) throws BusinessException;
+
 	void delete_vote(List<String> list) throws BusinessException;
-	
+
 	void delete_vote_item(List<String> list) throws BusinessException;
-	
+
 	void delete_vote_action(List<String> list) throws BusinessException;
-	
+
 	void delete_item(List<String> list) throws BusinessException;
-	
-    List<Map<String,Object>> list_vote(RowBounds rowbounds, Map<String, Object> query) throws BusinessException ;
-    
-    List<Map<String,Object>> list_vote(Map<String,Object> query) throws BusinessException ;
-    
-    int listCount_vote(Map<String, Object> query) throws BusinessException ;
 
-    List<Map<String,Object>> list_item(Map<String,Object> query) throws BusinessException ;
-    
-    List<Map<String,Object>> list_userchecked(Map<String,Object> query) throws BusinessException ;
+	List<Map<String, Object>> list_vote(RowBounds rowbounds, Map<String, Object> query) throws BusinessException;
+
+	List<Map<String, Object>> list_vote(Map<String, Object> query) throws BusinessException;
+
+	int listCount_vote(Map<String, Object> query) throws BusinessException;
+
+	List<Map<String, Object>> list_item(Map<String, Object> query) throws BusinessException;
 
+	List<Map<String, Object>> list_userChecked(Map<String, Object> query) throws BusinessException;
 
 }

src_jwapp/com/jw/app/business/vote/voteDAO.xml

@@ -2,45 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jw.app.business.vote.voteDAO">
 	<sql id="WHERE">
-	<where>
-		<trim prefixOverrides="and">
-			<if test="UUID != null and UUID != ''">
-				and f.UUID = #{UUID}
-			</if>
-			<if test="USERSELF == 0">
-				and f.vote_count > 0
-			</if>
-			<if test="CONTENT != null and CONTENT != ''">
-				and f.CONTENT like concat('%',#{CONTENT},'%')
-			</if>
-			<if test="CREATE_ID != null and CREATE_ID != ''">
-				and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
-			</if>
-			<if test="START_TIME != null and START_TIME != ''">
-				and f.CREATE_TIME &gt;= #{START_TIME}
-			</if>
-			<if test="END_TIME != null and END_TIME != ''">
-				and f.CREATE_TIME &lt;= #{END_TIME}
-			</if>
-			<if test="UPDATE_ID != null and UPDATE_ID != ''">
-				and f.UPDATE_ID = #{UPDATE_ID}
-			</if>
-			<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
-				and f.UPDATE_TIME = #{UPDATE_TIME}
-			</if>
-			<if test="START_START_TIME != null and START_START_TIME != ''">
-				and f.START_TIME &gt;= #{START_START_TIME}
-			</if>
-			<if test="END_START_TIME != null and END_START_TIME != ''">
-				and f.START_TIME &lt;= #{END_START_TIME}
-			</if>
-			<if test="START_END_TIME != null and START_END_TIME != ''">
-				and f.END_TIME &gt;= #{START_END_TIME}
-			</if>
-			<if test="END_END_TIME != null and END_END_TIME != ''">
-				and f.END_TIME &lt;= #{END_END_TIME}
-			</if>
-		</trim>
+		<where>
+			<trim prefixOverrides="and">
+				<if test="UUID != null and UUID != ''">
+					and f.UUID = #{UUID}
+				</if>
+				<if test="USERSELF == 0">
+					and f.vote_count > 0
+				</if>
+				<if test="CONTENT != null and CONTENT != ''">
+					and f.CONTENT like concat('%',#{CONTENT},'%')
+				</if>
+				<if test="CREATE_ID != null and CREATE_ID != ''">
+					and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
+				</if>
+				<if test="START_TIME != null and START_TIME != ''">
+					and f.CREATE_TIME &gt;= #{START_TIME}
+				</if>
+				<if test="END_TIME != null and END_TIME != ''">
+					and f.CREATE_TIME &lt;= #{END_TIME}
+				</if>
+				<if test="UPDATE_ID != null and UPDATE_ID != ''">
+					and f.UPDATE_ID = #{UPDATE_ID}
+				</if>
+				<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
+					and f.UPDATE_TIME = #{UPDATE_TIME}
+				</if>
+				<if test="START_START_TIME != null and START_START_TIME != ''">
+					and f.START_TIME &gt;= #{START_START_TIME}
+				</if>
+				<if test="END_START_TIME != null and END_START_TIME != ''">
+					and f.START_TIME &lt;= #{END_START_TIME}
+				</if>
+				<if test="START_END_TIME != null and START_END_TIME != ''">
+					and f.END_TIME &gt;= #{START_END_TIME}
+				</if>
+				<if test="END_END_TIME != null and END_END_TIME != ''">
+					and f.END_TIME &lt;= #{END_END_TIME}
+				</if>
+			</trim>
 		</where>
 	</sql>
 	<insert id="insert_vote" parameterType="map">
@@ -142,7 +142,7 @@
 			#{UUID}
 		</foreach>
 	</delete>
-	
+
 	<delete id="delete_vote_action" parameterType="list">
         <![CDATA[
             delete from  VOTE_MANAGE_ACTION where MANAGE_ID IN
@@ -164,67 +164,71 @@
 	</delete>
 
 	<select id="list_vote" parameterType="map" resultType="upperCaseKeyMap">
-	SELECT * FROM
-	(
-	SELECT
+		SELECT * FROM
+		(
+		SELECT
 		manage.*,
-		SUM( CASE WHEN action.uuid IS NULL THEN 0 ELSE 1 END ) AS vote_count 
-	FROM
-		( SELECT * FROM `vote_manage` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="STATUS_FLAG != null and STATUS_FLAG != ''">
-						and STATUS_FLAG = #{STATUS_FLAG}
-					</if>
-				</trim>
-			</where>
+		SUM( CASE WHEN action.uuid IS NULL THEN 0
+		ELSE 1 END ) AS
+		vote_count
+		FROM
+		( SELECT * FROM `vote_manage`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="STATUS_FLAG != null and STATUS_FLAG != ''">
+					and STATUS_FLAG = #{STATUS_FLAG}
+				</if>
+			</trim>
+		</where>
 		) manage
-		LEFT JOIN ( SELECT * FROM `vote_manage_action` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="USER_ID != null and USER_ID != ''">
-						and USER_ID = #{USER_ID}
-					</if>
-				</trim>
-			</where>
-		) action ON manage.uuid = action.manage_id 
-	GROUP BY
+		LEFT JOIN ( SELECT * FROM `vote_manage_action`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="USER_ID != null and USER_ID != ''">
+					and USER_ID = #{USER_ID}
+				</if>
+			</trim>
+		</where>
+		) action ON manage.uuid = action.manage_id
+		GROUP BY
 		manage.uuid
-	) f 
-	
-	<include refid="WHERE"></include>
+		) f
+
+		<include refid="WHERE"></include>
 		order by f.CREATE_TIME DESC
 	</select>
 
 	<select id="listCount_vote" parameterType="map" resultType="int">
-	 SELECT count(*) FROM
-	(
-	SELECT
+		SELECT count(*) FROM
+		(
+		SELECT
 		manage.*,
-		SUM( CASE WHEN action.uuid IS NULL THEN 0 ELSE 1 END ) AS vote_count 
-	FROM
-		( SELECT * FROM `vote_manage` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="STATUS_FLAG != null and STATUS_FLAG != ''">
-						and STATUS_FLAG = #{STATUS_FLAG}
-					</if>
-				</trim>
-			</where>
+		SUM( CASE WHEN action.uuid IS NULL
+		THEN 0 ELSE 1 END ) AS
+		vote_count
+		FROM
+		( SELECT * FROM `vote_manage`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="STATUS_FLAG != null and STATUS_FLAG != ''">
+					and STATUS_FLAG = #{STATUS_FLAG}
+				</if>
+			</trim>
+		</where>
 		) manage
-		LEFT JOIN ( SELECT * FROM `vote_manage_action` 
-			<where>
-				<trim prefixOverrides="and">
-					<if test="USER_ID != null and USER_ID != ''">
-						and USER_ID = #{USER_ID}
-					</if>
-				</trim>
-			</where>
-		) action ON manage.uuid = action.manage_id 
-	GROUP BY
+		LEFT JOIN ( SELECT * FROM `vote_manage_action`
+		<where>
+			<trim prefixOverrides="and">
+				<if test="USER_ID != null and USER_ID != ''">
+					and USER_ID = #{USER_ID}
+				</if>
+			</trim>
+		</where>
+		) action ON manage.uuid = action.manage_id
+		GROUP BY
 		manage.uuid
-	) f 
-	<include refid="WHERE"></include>
+		) f
+		<include refid="WHERE"></include>
 	</select>
 
 	<select id="list_item" parameterType="map" resultType="upperCaseKeyMap">
@@ -233,12 +237,13 @@
 		where manage_id=#{MANAGE_ID}
 		order by sort_num ASC
 	</select>
-	
-	<select id="list_userchecked" parameterType="map" resultType="upperCaseKeyMap">
+
+	<select id="list_userChecked" parameterType="map" resultType="upperCaseKeyMap">
 		select *
 		from VOTE_MANAGE_ACTION
 		where manage_id=#{MANAGE_ID}
-		order by CREATE_TIME ASC
+		order by
+		CREATE_TIME ASC
 	</select>
 
 

src_jwapp/com/jw/app/log/action/actAction.java

@@ -59,7 +59,7 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 插入
 	 * 
@@ -84,7 +84,7 @@ public class actAction extends BasicAction {
 			SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
 			sysbusiness.insert_logBusiness("insertReply", "" + entity, "增加测试数据", (String) entity.get("UUID"),
 					(String) entity.get("CREATE_NAME"), "logdemo1");
-			Map<String, Object> result=Status.getStatusSuccessMessage("保存成功");
+			Map<String, Object> result = Status.getStatusSuccessMessage("保存成功");
 			result.put("UUID", entity.get("UUID"));
 			result.put("REPLY_NAME", entity.get("REPLY_NAME"));
 			result.put("CODE", entity.get("CODE"));
@@ -96,7 +96,6 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
 
 	/**
 	 * 更新
@@ -152,7 +151,7 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 在软删除基础上删除记录
 	 * 

src_jwapp/com/jw/app/log/action/dataAction.java

 package com.jw.app.log.action;
 
-
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.HashMap;
@@ -21,41 +20,48 @@ import com.gaowj.business.util.SessionUtil;
 import com.gaowj.business.util.TestMd5;
 import com.gaowj.standard.utils.CacheKit;
 
-public class dataAction extends BasicAction{
+public class dataAction extends BasicAction {
 	private static final long serialVersionUID = 4416458722090020762L;
 	private JSONObject jsonObject = new JSONObject();
 	private int rows = 20;// 每页显示的记录数
 	private int page = 1;// 当前第几页
+
 	public JSONObject getJsonObject() {
 		return jsonObject;
 	}
+
 	public void setJsonObject(JSONObject jsonObject) {
 		this.jsonObject = jsonObject;
 	}
+
 	public int getRows() {
 		return rows;
 	}
+
 	public void setRows(int rows) {
 		this.rows = rows;
 	}
+
 	public int getPage() {
 		return page;
 	}
+
 	public void setPage(int page) {
 		this.page = page;
 	}
-	
+
 	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String list() throws BusinessException {
 		LogBusiness business = BusinessManager.getBusiness(LogBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		try {	
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_log(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_log(pageNo, pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
@@ -75,43 +81,44 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String listAll() throws BusinessException {
 		LogBusiness business = BusinessManager.getBusiness(LogBusiness.class);
 		try {
-			//表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
-			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-			
-			//把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
-			//主要和前端is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
-			//前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
+			// 表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
+			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+
+			// 把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
+			// 主要和前端is_entity.FIELD_CREATE_TIME =
+			// strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
+			// 前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
 			query = QueryParamUtil.StringToDate(query);
-			
-			//session工具
-			String code = SessionUtil.getCode();//当前用户ID
-			String emid = SessionUtil.getEmid();//当前用户帐号
-			String emname = SessionUtil.getEmname();//当前用户名称
-			String emdepart = SessionUtil.getEmdepart();//当前用户部门id
-			String emdepartname = SessionUtil.getEmdepartname();//当前用户部门名称
-			String emsex = SessionUtil.getEmsex();//当前用户性别
-			String loginip = SessionUtil.getLoginip();//当前用户登录IP
-			
-			String clientip = SessionUtil.getClientIp();//获取客户端IP
-			String quanxian = SessionUtil.getQuanxian();//获取当前用户使用模块清单
-			String sessionid = SessionUtil.getSessionid();//获取当前用户sessionID
-			String currenttimme = SessionUtil.getCurrenttime();//当前用户本次登录时间
-			String beforetime = SessionUtil.getBeforetime();//当前用户上次登录时间
-			
-			//配置文件工具
-			//表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
+
+			// session工具
+			String code = SessionUtil.getCode();// 当前用户ID
+			String emid = SessionUtil.getEmid();// 当前用户帐号
+			String emname = SessionUtil.getEmname();// 当前用户名称
+			String emdepart = SessionUtil.getEmdepart();// 当前用户部门id
+			String emdepartname = SessionUtil.getEmdepartname();// 当前用户部门名称
+			String emsex = SessionUtil.getEmsex();// 当前用户性别
+			String loginip = SessionUtil.getLoginip();// 当前用户登录IP
+
+			String clientip = SessionUtil.getClientIp();// 获取客户端IP
+			String quanxian = SessionUtil.getQuanxian();// 获取当前用户使用模块清单
+			String sessionid = SessionUtil.getSessionid();// 获取当前用户sessionID
+			String currenttimme = SessionUtil.getCurrenttime();// 当前用户本次登录时间
+			String beforetime = SessionUtil.getBeforetime();// 当前用户上次登录时间
+
+			// 配置文件工具
+			// 表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
 			String tt = PropUtil.getValue("login_main_url", "quartz_service", "");
-			
-			
+
 			List<Map<String, Object>> listData = business.list_log(query);
 			int listDataCount = listData.size();
 			Map<String, Object> data = new HashMap<String, Object>();
@@ -132,15 +139,26 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
 
 	public String listItem() throws BusinessException {
 		LogBusiness business = BusinessManager.getBusiness(LogBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			List<Map<String, Object>> listItems=business.list_reply(query);
+			query = QueryParamUtil.StringToDate(query);
+			Page<Map<String, Object>> pageRows = business.list_reply(pageNo, pageSize, query);
+			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
+			Map<String, Object> data = new HashMap<String, Object>();
+			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
+			data.put("pageNo", pageNo);
+			data.put("pageSize", pageSize);
+			data.put("pageCount", pageCount);
+			data.put("rows", data.get("rowSet"));
+			data.put("total", pageRows.getCount());
 			jsonObject = new JSONObject();
-			jsonObject.put("listItems", listItems);
+			jsonObject.putAll(data);
+//			List<Map<String, Object>> listItems = business.list_reply(query);
+//			jsonObject = new JSONObject();
+//			jsonObject.put("listItems", listItems);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

src_jwapp/com/jw/app/log/action/viewAction.java

 package com.jw.app.log.action;
 
-
 import java.util.Map;
 
 import com.gaowj.business.action.BasicAction;
@@ -19,13 +18,13 @@ public class viewAction extends BasicAction {
 		request.setAttribute("is_row", query);
 		return "logTabDetail";
 	}
-	
+
 	public String replyTabDetail() throws BusinessException {
 		Map<String, Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		request.setAttribute("is_row", query);
 		return "replyTabDetail";
 	}
-	
+
 	public String replyTab() throws BusinessException {
 		return "replyTab";
 	}

src_jwapp/com/jw/app/meeting/action/actAction.java

@@ -59,7 +59,7 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 插入
 	 * 

src_jwapp/com/jw/app/meeting/action/dataAction.java

 package com.jw.app.meeting.action;
 
-
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.HashMap;
@@ -21,42 +20,49 @@ import com.gaowj.business.util.SessionUtil;
 import com.gaowj.business.util.TestMd5;
 import com.gaowj.standard.utils.CacheKit;
 
-public class dataAction extends BasicAction{
+public class dataAction extends BasicAction {
 
 	private static final long serialVersionUID = -3006159112969667743L;
 	private JSONObject jsonObject = new JSONObject();
 	private int rows = 20;// 每页显示的记录数
 	private int page = 1;// 当前第几页
+
 	public JSONObject getJsonObject() {
 		return jsonObject;
 	}
+
 	public void setJsonObject(JSONObject jsonObject) {
 		this.jsonObject = jsonObject;
 	}
+
 	public int getRows() {
 		return rows;
 	}
+
 	public void setRows(int rows) {
 		this.rows = rows;
 	}
+
 	public int getPage() {
 		return page;
 	}
+
 	public void setPage(int page) {
 		this.page = page;
 	}
-	
+
 	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String list() throws BusinessException {
 		MeetingBusiness business = BusinessManager.getBusiness(MeetingBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		try {	
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_meeting(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_meeting(pageNo, pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
@@ -76,13 +82,13 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	public String listCheck_in() throws BusinessException {
 		MeetingBusiness business = BusinessManager.getBusiness(MeetingBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			List<Map<String, Object>> listchecks=business.list_check_in(query);
-//			listchecks = QueryParamUtil.StringToDate(listchecks);
+			List<Map<String, Object>> listchecks = business.list_check_in(query);
+			// listchecks = QueryParamUtil.StringToDate(listchecks);
 			jsonObject = new JSONObject();
 			jsonObject.put("listchecks", QueryParamUtil.DateTimeToString(listchecks));
 		} catch (Exception e) {
@@ -92,43 +98,43 @@ public class dataAction extends BasicAction{
 		return "json";
 	}
 
-	
 	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String listAll() throws BusinessException {
 		MeetingBusiness business = BusinessManager.getBusiness(MeetingBusiness.class);
 		try {
-			//表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
-			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-			
-			//把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
-			//主要和前端is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
-			//前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
+			// 表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
+			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+
+			// 把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
+			// 主要和前端is_entity.FIELD_CREATE_TIME =
+			// strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
+			// 前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
 			query = QueryParamUtil.StringToDate(query);
-			
-			//session工具
-			String code = SessionUtil.getCode();//当前用户ID
-			String emid = SessionUtil.getEmid();//当前用户帐号
-			String emname = SessionUtil.getEmname();//当前用户名称
-			String emdepart = SessionUtil.getEmdepart();//当前用户部门id
-			String emdepartname = SessionUtil.getEmdepartname();//当前用户部门名称
-			String emsex = SessionUtil.getEmsex();//当前用户性别
-			String loginip = SessionUtil.getLoginip();//当前用户登录IP
-			
-			String clientip = SessionUtil.getClientIp();//获取客户端IP
-			String quanxian = SessionUtil.getQuanxian();//获取当前用户使用模块清单
-			String sessionid = SessionUtil.getSessionid();//获取当前用户sessionID
-			String currenttimme = SessionUtil.getCurrenttime();//当前用户本次登录时间
-			String beforetime = SessionUtil.getBeforetime();//当前用户上次登录时间
-			
-			//配置文件工具
-			//表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
+
+			// session工具
+			String code = SessionUtil.getCode();// 当前用户ID
+			String emid = SessionUtil.getEmid();// 当前用户帐号
+			String emname = SessionUtil.getEmname();// 当前用户名称
+			String emdepart = SessionUtil.getEmdepart();// 当前用户部门id
+			String emdepartname = SessionUtil.getEmdepartname();// 当前用户部门名称
+			String emsex = SessionUtil.getEmsex();// 当前用户性别
+			String loginip = SessionUtil.getLoginip();// 当前用户登录IP
+
+			String clientip = SessionUtil.getClientIp();// 获取客户端IP
+			String quanxian = SessionUtil.getQuanxian();// 获取当前用户使用模块清单
+			String sessionid = SessionUtil.getSessionid();// 获取当前用户sessionID
+			String currenttimme = SessionUtil.getCurrenttime();// 当前用户本次登录时间
+			String beforetime = SessionUtil.getBeforetime();// 当前用户上次登录时间
+
+			// 配置文件工具
+			// 表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
 			String tt = PropUtil.getValue("login_main_url", "quartz_service", "");
-			
-			
+
 			List<Map<String, Object>> listData = business.list_meeting(query);
 			int listDataCount = listData.size();
 			Map<String, Object> data = new HashMap<String, Object>();
@@ -149,6 +155,5 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
 
 }

src_jwapp/com/jw/app/meeting/action/viewAction.java

 package com.jw.app.meeting.action;
 
-
 import java.util.Map;
 
 import com.gaowj.business.action.BasicAction;
@@ -14,7 +13,7 @@ public class viewAction extends BasicAction {
 	public String meetingTab() throws BusinessException {
 		return "meetingTab";
 	}
-	
+
 	public String check_inTab() throws BusinessException {
 		return "check_inTab";
 	}
@@ -30,7 +29,7 @@ public class viewAction extends BasicAction {
 		request.setAttribute("is_row", query);
 		return "meetingAdvsearch";
 	}
-	
+
 	public String check_userList() throws BusinessException {
 		Map<String, Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		request.setAttribute("is_row", query);

src_jwapp/com/jw/app/vote/action/actAction.java

@@ -28,31 +28,32 @@ public class actAction extends BasicAction {
 	public void setJsonObject(JSONObject jsonObject) {
 		this.jsonObject = jsonObject;
 	}
-	
+
 	/**
 	 * 插入
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String insertVote() throws BusinessException {
 
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+
 		jsonObject = new JSONObject();
 		try {
 			entity = QueryParamUtil.StringToDate(entity);
-				
-			//去除不要更新的字段
+
+			// 去除不要更新的字段
 			entity.remove("OPETYPE");
-			//新增
+			// 新增
 			business.insert_vote(entity);
-			
+
 			// 操作日志
-			//sysbusiness.insert_logBusiness(具体方法，操作内容，操作描述，操作记录ID，操作记录中文描述，分类)
+			// sysbusiness.insert_logBusiness(具体方法，操作内容，操作描述，操作记录ID，操作记录中文描述，分类)
 			SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
-				sysbusiness.insert_logBusiness("insertVote", "" + entity,
-						"增加投票主题", (String) entity.get("UUID"), (String) entity.get("CONTENT"), "votedemo1");
+			sysbusiness.insert_logBusiness("insertVote", "" + entity, "增加投票主题", (String) entity.get("UUID"),
+					(String) entity.get("CONTENT"), "votedemo1");
 			jsonObject.putAll(Status.getStatusSuccessMessage("保存成功"));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatusErrorMessage("保存失败"));
@@ -60,26 +61,27 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 插入用户投票
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String insertUserVote() throws BusinessException {
 
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+
 		jsonObject = new JSONObject();
 		try {
 			entity = QueryParamUtil.StringToDate(entity);
-				
-			//去除不要更新的字段
+
+			// 去除不要更新的字段
 			entity.remove("OPETYPE");
-			//新增
+			// 新增
 			business.insert_userVote(entity);
-			
+
 			jsonObject.putAll(Status.getStatusSuccessMessage("保存成功"));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatusErrorMessage("保存失败"));
@@ -87,27 +89,28 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 更新
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String updateVote() throws BusinessException {
 
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			
-			//去除不要更新的字段
+
+			// 去除不要更新的字段
 			entity.remove("OPETYPE");
-			//修改
+			// 修改
 			entity = QueryParamUtil.StringToDate(entity);
 			business.update_vote(entity);
 			// 操作日志
 			SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
-			sysbusiness.insert_logBusiness("updateVote", "" + entity, 
-					"修改投票主题",(String) entity.get("UUID"), (String) entity.get("CONTENT"),"votedemo1");
+			sysbusiness.insert_logBusiness("updateVote", "" + entity, "修改投票主题", (String) entity.get("UUID"),
+					(String) entity.get("CONTENT"), "votedemo1");
 			jsonObject.putAll(Status.getStatusSuccessMessage("修改成功"));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatusErrorMessage("修改失败"));
@@ -115,23 +118,24 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 更新
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String endVote() throws BusinessException {
 
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			
-			//去除不要更新的字段
+
+			// 去除不要更新的字段
 			entity.remove("OPETYPE");
-			//修改
+			// 修改
 			entity = QueryParamUtil.StringToDate(entity);
-			business.update_endvote(entity);
+			business.update_endVote(entity);
 			jsonObject.putAll(Status.getStatusSuccessMessage("修改成功"));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatusErrorMessage("修改失败"));
@@ -139,25 +143,25 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 在软删除基础上删除记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String deleteVote() throws BusinessException {
 
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		String deletekey = (String) entity.get("CODE");
 		List<String> ListKey = QueryParamUtil.StringToList(deletekey);
-		
+
 		try {
 			business.delete_vote(ListKey);
 			// 操作日志
 			SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
-			sysbusiness.insert_logBusiness("deleteVote", "" + ListKey,
-					"删除投票主题", deletekey, "多个流水号","votedemo1");
+			sysbusiness.insert_logBusiness("deleteVote", "" + ListKey, "删除投票主题", deletekey, "多个流水号", "votedemo1");
 			jsonObject.putAll(Status.getStatusSuccessMessage("删除成功"));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatusErrorMessage("删除失败"));
@@ -165,6 +169,5 @@ public class actAction extends BasicAction {
 		}
 		return "json";
 	}
-	
-	
+
 }

src_jwapp/com/jw/app/vote/action/dataAction.java

 package com.jw.app.vote.action;
 
-
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.HashMap;
@@ -21,41 +20,48 @@ import com.gaowj.business.util.SessionUtil;
 import com.gaowj.business.util.TestMd5;
 import com.gaowj.standard.utils.CacheKit;
 
-public class dataAction extends BasicAction{
+public class dataAction extends BasicAction {
 	private static final long serialVersionUID = 1829141492939513911L;
-    private JSONObject jsonObject = new JSONObject();
+	private JSONObject jsonObject = new JSONObject();
 	private int rows = 20;// 每页显示的记录数
 	private int page = 1;// 当前第几页
+
 	public JSONObject getJsonObject() {
 		return jsonObject;
 	}
+
 	public void setJsonObject(JSONObject jsonObject) {
 		this.jsonObject = jsonObject;
 	}
+
 	public int getRows() {
 		return rows;
 	}
+
 	public void setRows(int rows) {
 		this.rows = rows;
 	}
+
 	public int getPage() {
 		return page;
 	}
+
 	public void setPage(int page) {
 		this.page = page;
 	}
-	
+
 	/**
 	 * 分页获取记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String list() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		try {	
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_vote(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_vote(pageNo, pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
@@ -78,10 +84,10 @@ public class dataAction extends BasicAction{
 
 	public String list_ongoing() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		try {	
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_ongoing(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_ongoing(pageNo, pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
@@ -101,13 +107,13 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	public String list_ended() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-		try {	
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_ended(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_ended(pageNo, pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
@@ -127,43 +133,44 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	/**
 	 * 获取所有记录
+	 * 
 	 * @param entity
 	 * @throws BusinessException
 	 */
 	public String listAll() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
 		try {
-			//表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
-			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
-			
-			//把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
-			//主要和前端is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
-			//前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
+			// 表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
+			Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+
+			// 把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
+			// 主要和前端is_entity.FIELD_CREATE_TIME =
+			// strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
+			// 前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
 			query = QueryParamUtil.StringToDate(query);
-			
-			//session工具
-			String code = SessionUtil.getCode();//当前用户ID
-			String emid = SessionUtil.getEmid();//当前用户帐号
-			String emname = SessionUtil.getEmname();//当前用户名称
-			String emdepart = SessionUtil.getEmdepart();//当前用户部门id
-			String emdepartname = SessionUtil.getEmdepartname();//当前用户部门名称
-			String emsex = SessionUtil.getEmsex();//当前用户性别
-			String loginip = SessionUtil.getLoginip();//当前用户登录IP
-			
-			String clientip = SessionUtil.getClientIp();//获取客户端IP
-			String quanxian = SessionUtil.getQuanxian();//获取当前用户使用模块清单
-			String sessionid = SessionUtil.getSessionid();//获取当前用户sessionID
-			String currenttimme = SessionUtil.getCurrenttime();//当前用户本次登录时间
-			String beforetime = SessionUtil.getBeforetime();//当前用户上次登录时间
-			
-			//配置文件工具
-			//表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
+
+			// session工具
+			String code = SessionUtil.getCode();// 当前用户ID
+			String emid = SessionUtil.getEmid();// 当前用户帐号
+			String emname = SessionUtil.getEmname();// 当前用户名称
+			String emdepart = SessionUtil.getEmdepart();// 当前用户部门id
+			String emdepartname = SessionUtil.getEmdepartname();// 当前用户部门名称
+			String emsex = SessionUtil.getEmsex();// 当前用户性别
+			String loginip = SessionUtil.getLoginip();// 当前用户登录IP
+
+			String clientip = SessionUtil.getClientIp();// 获取客户端IP
+			String quanxian = SessionUtil.getQuanxian();// 获取当前用户使用模块清单
+			String sessionid = SessionUtil.getSessionid();// 获取当前用户sessionID
+			String currenttimme = SessionUtil.getCurrenttime();// 当前用户本次登录时间
+			String beforetime = SessionUtil.getBeforetime();// 当前用户上次登录时间
+
+			// 配置文件工具
+			// 表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
 			String tt = PropUtil.getValue("login_main_url", "quartz_service", "");
-			
-			
+
 			List<Map<String, Object>> listData = business.list_vote(query);
 			int listDataCount = listData.size();
 			Map<String, Object> data = new HashMap<String, Object>();
@@ -184,12 +191,12 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	public String listItem() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			List<Map<String, Object>> listItems=business.list_item(query);
+			List<Map<String, Object>> listItems = business.list_item(query);
 			jsonObject = new JSONObject();
 			jsonObject.put("listItems", listItems);
 		} catch (Exception e) {
@@ -198,12 +205,12 @@ public class dataAction extends BasicAction{
 		}
 		return "json";
 	}
-	
+
 	public String listUserChecked() throws BusinessException {
 		VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
-		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request, RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
-			List<Map<String, Object>> listusercheckeds=business.list_userchecked(query);
+			List<Map<String, Object>> listusercheckeds = business.list_userChecked(query);
 			jsonObject = new JSONObject();
 			jsonObject.put("listusercheckeds", listusercheckeds);
 		} catch (Exception e) {

src_jwapp/com/jw/app/vote/action/viewAction.java

 package com.jw.app.vote.action;
 
-
 import java.util.Map;
 
 import com.gaowj.business.action.BasicAction;
@@ -10,33 +9,33 @@ import com.gaowj.business.util.RequestUtils;
 public class viewAction extends BasicAction {
 	private static final long serialVersionUID = -6259964352154128000L;
 
-    public String ongoingVoteTab() throws BusinessException{
+	public String ongoingVoteTab() throws BusinessException {
 		return "ongoingVoteTab";
 	}
-    
-    public String endedVoteTab() throws BusinessException{
+
+	public String endedVoteTab() throws BusinessException {
 		return "endedVoteTab";
 	}
-    
-    public String voteTab() throws BusinessException{
+
+	public String voteTab() throws BusinessException {
 		return "voteTab";
 	}
-    
-    public String userVoteTabDetail() throws BusinessException{
-		Map<String,Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
-	    request.setAttribute("is_row", query);
+
+	public String userVoteTabDetail() throws BusinessException {
+		Map<String, Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		request.setAttribute("is_row", query);
 		return "userVoteTabDetail";
 	}
-	
-	public String voteTabDetail() throws BusinessException{
-		Map<String,Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
-	    request.setAttribute("is_row", query);
+
+	public String voteTabDetail() throws BusinessException {
+		Map<String, Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		request.setAttribute("is_row", query);
 		return "voteTabDetail";
 	}
-	
-	public String voteAdvsearch() throws BusinessException{
-		Map<String,Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
-	    request.setAttribute("is_row", query);
+
+	public String voteAdvsearch() throws BusinessException {
+		Map<String, Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
+		request.setAttribute("is_row", query);
 		return "voteAdvsearch";
 	}