Merge remote-tracking branch 'origin/zhouwq' into develop

WebContent/jwapp/pages/bgmk/js/bgmkEmployeeTab.js

@@ -56,9 +56,9 @@ var v_typequery_data = standardModel.dataAction.listAllCache(v_typequery);
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="报工模块  ";
+var ls_title="员工报工  ";
 var is_column = [ [
-				{field : 'CONTENT',title : '工作内容',width : 300,align : 'center'},
+				{field : 'CONTENT',title : '工作内容',width : 400,align : 'center'},
 				{field : 'BG_TIME',title : '报工时间',width : 80,align : 'center'},
 				{field : 'GZYS',title : '工作用时',width : 80,align : 'center'},		
 				] ];

WebContent/jwapp/pages/bgmk/js/bgmkTab.js

@@ -56,11 +56,11 @@ var v_typequery_data = standardModel.dataAction.listAllCache(v_typequery);
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="报工模块  ";
+var ls_title="报工管理  ";
 var is_column = [ [
 				{field : 'USER_NAME',title : '人员姓名',width : 100,align : 'center'},
 				{field : 'DEPT_NAME',title : '人员部门',width : 80,align : 'center'},
-				{field : 'CONTENT',title : '工作内容',width : 300,align : 'center'},
+				{field : 'CONTENT',title : '工作内容',width : 400,align : 'left', halign:'center'},
 				{field : 'BG_TIME',title : '报工时间',width : 80,align : 'center'},
 				{field : 'GZYS',title : '工作用时',width : 80,align : 'center'},		
 				{field : 'USER_TYPE',title : '人员类型',width : 100,align : 'center',
@@ -68,8 +68,6 @@ var is_column = [ [
 						return getCodeName(v_typequery_data.rowSet, value);
 					}
 				},
-				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
-				{field : 'CREATE_TIME',title : '创建时间',width : 100,align : 'center'}
 				] ];
 //列表加载完成回调
 function dataOnLoadSuccess(){

WebContent/jwapp/pages/friendlink/js/friendlinkTab.js

@@ -45,13 +45,13 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="友情链接";
+var ls_title="快速链接";
 var is_column = [ [
-				{field : 'TITLE',title : '标题',width : 380,align : 'left'},
-				{field : 'URL',title : '链接',width : 380,align : 'left'},
-				{field : 'SORT',title : '排序',width : 50,align : 'left'},
-				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
-				{field : 'CREATE_TIME',title : '创建时间',width : 120,align : 'center'}
+				{field : 'TITLE',title : '标题',width : 300,align : 'left', halign:'center'},
+				{field : 'URL',title : '链接',width : 300,align : 'left', halign:'center'},
+				{field : 'SORT',title : '排序',width : 80,align : 'center'},
+				{field : 'CREATE_USER_NAME',title : '创建人员',width : 100,align : 'center'},
+				{field : 'CREATE_TIME',title : '创建时间',width : 100,align : 'center'}
 				] ];
 //列表加载完成回调
 function dataOnLoadSuccess(){
@@ -167,7 +167,7 @@ function deleteRow(index){
 	$.messager.confirm('提示', '确定删除?', function(r) {
 		if (r) {
 			var v_query = {};
-		    v_query.UUID = code;
+		    v_query.FIELD_CODE = code;
 		    var v_result = friendlinkModule.act.removeFriendLinkInfo(v_query);
 			$.messager.alert('提示',v_result.VALUE);
 			$('#list').datagrid('reload');
@@ -202,7 +202,7 @@ function deleteBatchRow(){
 	$.messager.confirm('提示', '确定删除?', function(r) {
 		if (r) {
 			var v_query = {};
-		    v_query.UUID = code;
+		    v_query.FIELD_CODE = code;
 		    var v_result = friendlinkModule.act.removeFriendLinkInfo(v_query);
 			$.messager.alert('提示',v_result.VALUE);
 			$('#list').datagrid('reload');

WebContent/jwapp/pages/notice/js/noticeTab.js

@@ -45,11 +45,11 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="友情链接";
+var ls_title="快速链接";
 var is_column = [ [
-				{field : 'TITLE',title : '标题',width : 380,align : 'center'},
+				{field : 'TITLE',title : '标题',width : 380,align : 'left', halign:'center'},
 				{field : 'RELEASE_TIME',title : '发布时间',width : 120,align : 'center'},
-				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
+				{field : 'CREATE_USER_NAME',title : '创建人员',width : 100,align : 'center'},
 				{field : 'CREATE_TIME',title : '创建时间',width : 120,align : 'center'}
 				] ];
 //列表加载完成回调
@@ -174,7 +174,7 @@ function deleteRow(index){
 	$.messager.confirm('提示', '确定删除?', function(r) {
 		if (r) {
 			var v_query = {};
-		    v_query.UUID = code;
+		    v_query.FIELD_CODE = code;
 		    var v_result = noticeModule.act.removeNoticeInfo(v_query);
 			$.messager.alert('提示',v_result.VALUE);
 			$('#list').datagrid('reload');
@@ -209,7 +209,7 @@ function deleteBatchRow(){
 	$.messager.confirm('提示', '确定删除?', function(r) {
 		if (r) {
 			var v_query = {};
-		    v_query.UUID = code;
+		    v_query.FIELD_CODE = code;
 		    var v_result = noticeModule.act.removeNoticeInfo(v_query);
 			$.messager.alert('提示',v_result.VALUE);
 			$('#list').datagrid('reload');

WebContent/jwapp/pages/notice/noticeTabDetail.jsp

@@ -5,26 +5,18 @@
 	<input type="hidden" name="FIELD_USER_ID" id="USER_ID" value="${is_row.USER_ID}" />
 	<table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 30px;">
 		<tr>
-			<td style="width: 15%;" class="tableStyleLable"><span>标题:</span>
-			</td>
+			<td style="width: 15%;" class="tableStyleLable"><span>标题:</span></td>	
 			<td style="width: 85%">
 				<input class="easyui-textbox" data-options="required:true" id="TITLE" name="FIELD_TITLE" style="width:300px" />
 			</td>
 		</tr>
+		
 		<tr>
-			<td style="width: 15%;" class="tableStyleLable"><span>正文:</span>
-			</td>
+			<td style="width: 15%;" class="tableStyleLable"><span>正文:</span></td>	
 			<td style="width: 85%">
 				<div id="TEXT" name="FIELD_TEXT">
 				</div>
 			</td>
 		</tr>
-			<tr>
-			<td style="width: 15%;" class="tableStyleLable"><span>发布时间:</span>
-			</td>
-			<td style="width: 85%">
-				<input class="easyui-datetimebox" data-options="required:true" id="RELEASE_TIME" name="FIELD_RELEASE_TIME" style="width:150px" />
-			</td>
-		</tr>
 	</table>
 </form>
\ No newline at end of file

src_jwapp/com/jw/app/bgmk/dataAction.java

@@ -93,7 +93,7 @@ public class dataAction extends BasicAction{
 		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_bgmk_employee(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_bgmk(pageNo,pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateToString(pageRows.getItems())); 

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

 package com.jw.app.business;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;
@@ -12,6 +13,6 @@ public interface FriendLinkBusiness {
 
 	Map<String, Object> save_friendlink(Map<String, Object> info) throws BusinessException;
 
-	void delete_friendlink(String uuid) throws BusinessException;
+	void delete_friendlink(List<String> list) throws BusinessException;
 
 }

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

 package com.jw.app.business;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;
@@ -12,6 +13,6 @@ public interface NoticeBusiness {
 
 	Map<String, Object> save_notice(Map<String, Object> info) throws BusinessException;
 
-	void delete_notice(String uuid) throws BusinessException;
+	void delete_notice(List<String> list) throws BusinessException;
 
 }

src_jwapp/com/jw/app/business/bgmk/BgmkBusinessImpl.java

@@ -46,8 +46,8 @@ public class BgmkBusinessImpl implements BgmkBusiness {
 		if(entity.get("USER_NAME")==null){
 			entity.put("USER_NAME", SessionUtil.getCode());
 		}
-		if(entity.get("CREATOR_ID")==null){
-			entity.put("CREATOR_ID", SessionUtil.getCode());
+		if(entity.get("CREATE_ID")==null){
+			entity.put("CREATE_ID", SessionUtil.getCode());
 		}
 		
 		if(entity.get("DEPT_NAME")==null){

src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml

@@ -35,9 +35,7 @@
 		        <if test="USER_TYPE != null and USER_TYPE != ''">
 					and f.USER_TYPE = #{USER_TYPE}
 		        </if>
-		        <if test="CREATOR_ID != null and CREATOR_ID != ''">
-					and f.CREATOR_ID = #{CREATOR_ID}
-		        </if>
+		        
 		        <if test="CREATE_TIME != null and CREATE_TIME != ''">
 					and f.CREATE_TIME = #{CREATE_TIME}
 		        </if>
@@ -46,6 +44,8 @@
 	</sql>
 
 
+
+
 	<insert id="insert_bgmk" parameterType="map">
 		insert into WORK_BG(
 		<trim prefix="" suffixOverrides=",">
@@ -90,8 +90,7 @@
 
 	<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
 		 <![CDATA[
-		  select f.* 
-		  from WORK_BG f where 1=1 
+		select f.* from WORK_BG f  
 	     ]]>		
 			<include refid="where_bg" />       
 			order by f.CREATE_TIME DESC
@@ -99,7 +98,7 @@
 	
 	<select id="listCount_bgmk" parameterType="map" resultType="int">
 		 <![CDATA[
-		   select count(*) c from WORK_BG f where 1=1 
+		    select count(*) from WORK_BG f 
 	     ]]>
 		<include refid="where_bg" />
 	</select>

src_jwapp/com/jw/app/business/friendlink/FriendLinkBusinessImpl.java

@@ -36,7 +36,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
 		
 		if (query.get("USER_ID") == null || "".equals(query.get("USER_ID"))) {
 			// 默认查询当前登陆人
-			query.put("USER_ID", SessionUtil.getEmid());
+			query.put("USER_ID", SessionUtil.getCode());
 		}
 
 		// 计算起始记录
@@ -58,7 +58,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
 		if (info.get("UUID") == null || "".equals(info.get("UUID"))) {
 			//判断目前总条数是不是<=8条
 			Map<String, Object> query=new HashMap<String, Object>();
-			query.put("CREATE_ID", SessionUtil.getEmid());
+			query.put("USER_ID", SessionUtil.getCode());
 			int count = friendlinkDAO.list_count_friendlink(query);
 			if(count>=8){
 				info.put("ERROR", "-1");
@@ -68,12 +68,12 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
 			info.put("UUID", UUID.randomUUID().toString());
 			if (info.get("USER_ID") == null || "".equals(info.get("USER_ID"))) {
 				// 如果没有传USER_ID过来，则使用当前登录人id
-				info.put("USER_ID", SessionUtil.getEmid());
+				info.put("USER_ID", SessionUtil.getCode());
 			}
 
-			info.put("CREATE_ID", SessionUtil.getEmid());
+			info.put("CREATE_ID", SessionUtil.getCode());
 			info.put("CREATE_TIME", new Date());
-			info.put("UPDATE_ID", SessionUtil.getEmid());
+			info.put("UPDATE_ID", SessionUtil.getCode());
 			info.put("UPDATE_TIME", new Date());
 			List<Map<String, Object>> listField = new ArrayList<Map<String, Object>>();
 			for (String k : info.keySet()) {
@@ -108,9 +108,7 @@ public class FriendLinkBusinessImpl implements FriendLinkBusiness {
 	}
 
 	@Override
-	public void delete_friendlink(String uuid) throws BusinessException {
-		for (String u : uuid.split(",")) {
-			friendlinkDAO.delete_friendlink(u);
-		}
+	public void delete_friendlink(List<String> list) throws BusinessException {						
+		friendlinkDAO.delete_friendlink(list);
 	}
 }

src_jwapp/com/jw/app/business/friendlink/friendlinkDAO.java

@@ -18,5 +18,5 @@ public interface friendlinkDAO {
 
 	void update_friendlink(Map<String, Object> info) throws BusinessException;
 
-	void delete_friendlink(String uuid) throws BusinessException;
+	void delete_friendlink(List<String> list) throws BusinessException;
 	}

src_jwapp/com/jw/app/business/friendlink/friendlinkDAO.xml

@@ -22,7 +22,11 @@
 
 	<select id="list_friendlink" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
-	   select * from friendlink t
+	   select t.* , 
+	   uu1.REAL_NAME AS CREATE_USER_NAME
+	   from friendlink t
+	   LEFT JOIN uicm_user_info uu1 ON t.CREATE_ID = uu1.USER_ID
+	  
      ]]>
 		<include refid="where" />
 		ORDER BY t.sort 
@@ -30,7 +34,9 @@
 
 	<select id="list_count_friendlink" parameterType="map" resultType="int">
 	 <![CDATA[
-	   select count(*) from friendlink t
+	   select count(*) 
+	   from friendlink t
+	   LEFT JOIN uicm_user_info uu1 ON t.CREATE_ID = uu1.USER_ID
      ]]>
 		<include refid="where" />
 		ORDER BY t.sort 
@@ -62,7 +68,14 @@
 		where UUID=#{UUID}
 	</update>
 	
-	<delete id="delete_friendlink" parameterType="String">
-		delete from friendlink where UUID=#{uuid}
+	<delete id="delete_friendlink" parameterType="list">
+        <![CDATA[
+           delete from friendlink where UUID IN
+         ]]>
+		<foreach collection="list" item="UUID" open="(" separator=","
+			close=")">
+			#{UUID} 
+         </foreach>
 	</delete>
+	
 </mapper>
\ No newline at end of file

src_jwapp/com/jw/app/business/notice/NoticeBusinessImpl.java

@@ -37,7 +37,7 @@ public class NoticeBusinessImpl implements NoticeBusiness {
 		
 		if (query.get("USER_ID") == null || "".equals(query.get("USER_ID"))) {
 			// 默认查询当前登陆人
-			query.put("USER_ID", SessionUtil.getEmid());
+			query.put("USER_ID", SessionUtil.getCode());
 		}
 
 		// 计算起始记录
@@ -61,12 +61,14 @@ public class NoticeBusinessImpl implements NoticeBusiness {
 			info.put("UUID", UUID.randomUUID().toString());
 			if (info.get("USER_ID") == null || "".equals(info.get("USER_ID"))) {
 				// 如果没有传USER_ID过来，则使用当前登录人id
-				info.put("USER_ID", SessionUtil.getEmid());
+				info.put("USER_ID", SessionUtil.getCode());
 			}	
-			info.put("CREATE_ID", SessionUtil.getEmid());
+			info.put("CREATE_ID", SessionUtil.getCode());
 			info.put("CREATE_TIME", new Date());
-			info.put("UPDATE_ID", SessionUtil.getEmid());
+			info.put("UPDATE_ID", SessionUtil.getCode());
 			info.put("UPDATE_TIME", new Date());
+			info.put("RELEASE_TIME", new Date());
+			
 			List<Map<String, Object>> listField = new ArrayList<Map<String, Object>>();
 			for (String k : info.keySet()) {
 				Map<String, Object> field = new HashMap<String, Object>();
@@ -100,9 +102,7 @@ public class NoticeBusinessImpl implements NoticeBusiness {
 	}
 
 	@Override
-	public void delete_notice(String uuid) throws BusinessException {
-		for (String u : uuid.split(",")) {
-			noticeDAO.delete_notice(u);
-		}
+	public void delete_notice(List<String> list) throws BusinessException {
+			noticeDAO.delete_notice(list);
 	}
 }

src_jwapp/com/jw/app/business/notice/noticeDAO.java

@@ -18,5 +18,5 @@ public interface noticeDAO {
 
 	void update_notice(Map<String, Object> info) throws BusinessException;
 
-	void delete_notice(String uuid) throws BusinessException;
+	void delete_notice(List<String> list) throws BusinessException;
 	}

src_jwapp/com/jw/app/business/notice/noticeDAO.xml

@@ -22,7 +22,11 @@
 
 	<select id="list_notice" parameterType="map" resultType="upperCaseKeyMap">
 	 <![CDATA[
-	   select * from notice t
+	   select t.* , 
+	   uu1.REAL_NAME AS CREATE_USER_NAME
+	   from notice t
+	   LEFT JOIN uicm_user_info uu1 ON t.CREATE_ID = uu1.USER_ID
+	   
      ]]>
 		<include refid="where" />
 		ORDER BY t.CREATE_TIME 
@@ -31,6 +35,7 @@
 	<select id="list_count_notice" parameterType="map" resultType="int">
 	 <![CDATA[
 	   select count(*) from notice t
+	   LEFT JOIN uicm_user_info uu1 ON t.CREATE_ID = uu1.USER_ID
      ]]>
 		<include refid="where" />
 		ORDER BY t.CREATE_TIME 
@@ -63,6 +68,12 @@
 	</update>
 
 	<delete id="delete_notice" parameterType="String">
-		delete from notice where UUID=#{uuid}
+		<![CDATA[
+           delete from notice where UUID IN
+         ]]>
+		<foreach collection="list" item="UUID" open="(" separator=","
+			close=")">
+			#{UUID} 
+         </foreach>
 	</delete>
 </mapper>
\ No newline at end of file

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

 package com.jw.app.friendlink.action;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import com.gaowj.business.StudentBusiness;
+import com.gaowj.business.SystemOpeBusiness;
 import com.gaowj.business.action.BasicAction;
 import com.gaowj.business.comp.BusinessManager;
 import com.gaowj.business.exception.BusinessException;
@@ -28,7 +31,7 @@ public class actAction extends BasicAction {
 	}
 
 	/**
-	 * 保存友情链接信息
+	 * 保存快速链接信息
 	 * 
 	 * @return
 	 * @throws BusinessException
@@ -55,15 +58,19 @@ public class actAction extends BasicAction {
 	}
 
 	/**
-	 * 删除友情链接信息
+	 * 删除快速链接信息
 	 * 
 	 * @return
 	 * @throws BusinessException
 	 */
 	public String removeFriendLinkInfo() throws BusinessException {
 		FriendLinkBusiness business = BusinessManager.getBusiness(FriendLinkBusiness.class);
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		String deletekey = (String) entity.get("CODE");
+		List<String> ListKey = QueryParamUtil.StringToList(deletekey);
+		
 		try {
-			business.delete_friendlink(RequestUtils.getString(request, "UUID"));
+			business.delete_friendlink(ListKey);
 			jsonObject.putAll(Status.getStatus(Status.DELETE_OK));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatus(Status.DELETE_ERR));

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

 package com.jw.app.notice.action;
 
+import java.util.List;
 import java.util.Map;
 
 import com.gaowj.business.action.BasicAction;
@@ -59,8 +60,11 @@ public class actAction extends BasicAction {
 	 */
 	public String removeNoticeInfo() throws BusinessException {
 		NoticeBusiness business = BusinessManager.getBusiness(NoticeBusiness.class);
+		Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
+		String deletekey = (String) entity.get("CODE");
+		List<String> ListKey = QueryParamUtil.StringToList(deletekey);	
 		try {
-			business.delete_notice(RequestUtils.getString(request, "UUID"));
+			business.delete_notice(ListKey);
 			jsonObject.putAll(Status.getStatus(Status.DELETE_OK));
 		} catch (Exception e) {
 			jsonObject.putAll(Status.getStatus(Status.DELETE_ERR));