From 26cc0e4d77a39cbd84b62a10445a062bb8a91c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= Date: Tue, 7 May 2019 18:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E7=BF=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../train/web/TrainExecutionController.java | 91 +++++++++++++++++-- .../modules/train/trainJoinPerSumList.html | 25 +++-- 2 files changed, 99 insertions(+), 17 deletions(-) diff --git a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java index cfbeaba5..40cd87f0 100644 --- a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java +++ b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java @@ -27,9 +27,7 @@ import com.jsite.common.persistence.Page; import com.jsite.common.web.BaseController; import com.jsite.common.lang.StringUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 培训实施测试Controller @@ -321,14 +319,20 @@ public class TrainExecutionController extends BaseController { public String listPerSum() { return "modules/train/trainJoinPerSumList"; } -// + // @RequiresPermissions("train:execution:view") // @RequestMapping(value = "listPerSumData") // @ResponseBody -// public Page> listPerData(HttpServletRequest request, HttpServletResponse response) { -// Page> page = new Page<>(request, response); -// page.setList(listPerSumData()); -// return page; +// public Map listPerData(HttpServletRequest request, HttpServletResponse response) { +//// Page> page = new Page<>(request, response); +//// page.setList(listPerSumData()); +//// return page; +// Map map = Maps.newLinkedHashMap(); +// map.put("page","1"); +// map.put("total","2"); +// map.put("records","11"); +// map.put("rows",listPerSumData()); +// return map; // } /** @@ -353,7 +357,7 @@ public class TrainExecutionController extends BaseController { //根据用户名查询用户归属部门 TrainExecution u=wagesImplService.getDepName(user); //添加序号 - map.put("序号",ser++); +// map.put("序号",ser++); System.err.println("部门是:"+u); //设置用户归属部门 if(u!=null&&u.getOffice().getName()!=null&&StringUtils.isNoneBlank(u.getOffice().getName())){ @@ -405,4 +409,73 @@ public class TrainExecutionController extends BaseController { return list; } + /** + * 人员签到列数据 + * @return + */ + @RequiresPermissions("train:execution:view") + @RequestMapping(value = "getColumnList") + @ResponseBody + public Map getColumnList(HttpServletRequest request, HttpServletResponse response){ + + //获取所有的请求参数 + Enumeration enu=request.getParameterNames(); + while(enu.hasMoreElements()){ + String paraName=(String)enu.nextElement(); + System.out.println(paraName+": "+request.getParameter(paraName)); + } + + Map finalMap = Maps.newHashMap(); + //1.查询所有计划 + List plans=wagesImplService.getAllPlan(); + //2.查询所有人 + List users=wagesImplService.getAllUser(); + //3准备一个最后集合resultMap + List> resultMap=Lists.newArrayList();//无序 + if (users != null && users.size() > 0){ + int ser = 1; + for (String user : users){ + Map map = Maps.newLinkedHashMap();//有序集合 + List dataList = Lists.newArrayList(); + map.put("id",ser++); + //根据用户名查询用户归属部门 + TrainExecution u=wagesImplService.getDepName(user); + if (u!=null&&u.getOffice().getName()!=null&&StringUtils.isNoneBlank(u.getOffice().getName())){ + dataList.add(u.getOffice().getName()); + }else { + dataList.add(""); + } + //设置职务 + dataList.add(""); + //将用户放入 + dataList.add(user); + + int i=0;//初始化签到次数 + if (plans != null && plans.size() > 0){ + for (String plan : plans){ + //根据人名和计划名称查询，如果查到说明已经参加签到 + int count=wagesImplService.getCountByNameAndPlan(user,plan); + if (count > 0){ + dataList.add("√"); + //签到成功次数加一 + i++; + }else { + dataList.add(""); + } + } + } + //完成一个员工后将次数放入map集合 + map.put("参与培训次数",i); + dataList.add(String.valueOf(i)); + //最后将员工放入Map + map.put("cell",dataList); + resultMap.add(map); + } + finalMap.put("page","1"); + finalMap.put("total",2); + finalMap.put("records","11"); + finalMap.put("rows",resultMap); + } + return finalMap; + } } \ No newline at end of file diff --git a/jsite-web/src/main/resources/views/modules/train/trainJoinPerSumList.html b/jsite-web/src/main/resources/views/modules/train/trainJoinPerSumList.html index c6d25a33..5645187e 100644 --- a/jsite-web/src/main/resources/views/modules/train/trainJoinPerSumList.html +++ b/jsite-web/src/main/resources/views/modules/train/trainJoinPerSumList.html @@ -90,22 +90,27 @@ //此处因为数据源数组中的结构相同且不为空，直接遍历索引为0的数据即可 $.each(jqdata[0], function(key,value) { - names.push(key=='序号'?"":key); + names.push(key); model.push({ name:key, index:key, - width:key=='序号'?40:100, + width:100, align:'center' }); }); //创建jqGrid组件 jQuery("#dataGrid").jqGrid( { + url:'${ctx}/train/execution/getColumnList', datatype : "json",//请求数据返回的类型。可选json,xml,txt colNames : names,//jqGrid的列显示名字 colModel : model, - rowNum : 2,//一页显示多少条 - rowList : [ 10, 20, 30 ],//可供用户选择一页显示多少条 + rowNum : 5,//一页显示多少条 + rowList : [ 5, 10, 15 ],//可供用户选择一页显示多少条 + rowTotal:jqdata.size, + loadonce:true, + rownumbers: true, + rownumWidth: 40, pager : '#dataGridPage',//表格页脚的占位符(一般是div)的id sortorder : "desc",//排序方式,可选desc,asc mtype : "post",//向后台请求数据的ajax的类型。可选post,get @@ -114,10 +119,10 @@ }); //将jqdata的值循环添加进jqGrid - for (var i = 0; i <= jqdata.length; i++) { - - jQuery("#dataGrid").jqGrid('addRowData', i + 1, jqdata[i]); - }; + // for (var i = 0; i <= jqdata.length; i++) { + // + // jQuery("#dataGrid").jqGrid('addRowData', i + 1, jqdata[i]); + // }; //初始化DataGrid对象,初始化用 $('#dataGrid').dataGrid({ @@ -129,7 +134,11 @@ + $("form").submit(function(e){ + + alert("Submitted"); + }); -- Gitee