From 282f6e23d0b644aca99d6924e6e502359a5c5300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= Date: Fri, 31 May 2019 17:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=AD=BE=E5=88=B0=E6=B1=87?= =?UTF-8?q?=E6=80=BBSQL=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/train/entity/TrainExecution.java | 2 +- .../jsite/modules/train/entity/TrainUser.java | 2 +- .../train/web/TrainExecutionController.java | 50 +++++++++++++------ .../modules/train/TrainExecutionDao.xml | 8 ++- .../modules/train/trainExecutionForm.html | 2 +- .../modules/train/trainExecutionList.html | 16 +++++- .../views/modules/train/trainPlanList.html | 7 ++- 7 files changed, 65 insertions(+), 22 deletions(-) diff --git a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java index 000520bb..9ef824e9 100644 --- a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java +++ b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java @@ -78,7 +78,7 @@ public class TrainExecution extends DataEntity { super(id); } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM") @ExcelField(title="计划实施日期", align=2, sort=1) public Date getImplTime() { return implTime; diff --git a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainUser.java b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainUser.java index 89018889..7dcd049d 100644 --- a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainUser.java +++ b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainUser.java @@ -9,7 +9,7 @@ public class TrainUser extends DataEntity { private User user; - @ExcelField(title="培训计划名称", align=2, sort=1) + @ExcelField(title="培训名称", align=2, sort=1) public TrainExecution getTrainExecution() { return trainExecution; } 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 663cc170..ce77314b 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 @@ -277,7 +277,7 @@ public class TrainExecutionController extends BaseController { @ResponseBody public Page> listPerData(String selectedUser, HttpServletRequest request, HttpServletResponse response,Model model) { Page> page = new Page<>(request, response); - List> list = listPerSumData("",selectedUser); + List> list = listPerSumData("",selectedUser,page); page.setCount(list.size()); int fromIndex = (page.getPageNo() - 1) * page.getPageSize(); int toIndex = page.getPageNo() * page.getPageSize() > list.size() ? fromIndex + list.size() - page.getPageSize() * (page.getPageNo() - 1) : page.getPageNo() * page.getPageSize(); @@ -289,10 +289,10 @@ public class TrainExecutionController extends BaseController { * 人员签到汇总 * @return */ - @RequiresPermissions("train:execution:view") - @RequestMapping(value = "listPerSumData") - @ResponseBody - public List> listPerSumData(String year, String userId) { +// @RequiresPermissions("train:execution:view") +// @RequestMapping(value = "listPerSumData") +// @ResponseBody + public List> listPerSumData(String year, String userId,Page> page) { //2.查询所有人 List users = Lists.newArrayList(); if (StringUtils.isBlank(userId)){ @@ -303,21 +303,39 @@ public class TrainExecutionController extends BaseController { //3准备一个最后集合resultMap List> resultMap=Lists.newArrayList();//无序 //4遍历 - for (User user:users) { - Map map = Maps.newLinkedHashMap();//有序集合 - map.put("部门",user.getOffice().getName()); - map.put("姓名",user.getName()); - - List trainExecutionList = wagesImplService.getTranByUserIdAndYear(user.getId(), year); + for (int i = 0; i < users.size(); i++) { + User user = users.get(i); + Map map = Maps.newLinkedHashMap();//有序集合 + map.put("部门", user.getOffice().getName()); + map.put("姓名", user.getName()); + + if (page != null) { + int fromIndex = (page.getPageNo() - 1) * page.getPageSize(); + int toIndex = page.getPageNo() * page.getPageSize() > users.size() ? fromIndex + users.size() - page.getPageSize() * (page.getPageNo() - 1) : page.getPageNo() * page.getPageSize(); + List trainExecutionList = Lists.newArrayList(); + if (i >= fromIndex && i < toIndex) { + trainExecutionList = wagesImplService.getTranByUserIdAndYear(user.getId(), year); + + + for (TrainExecution plan : trainExecutionList) { + map.put(plan.getTrainingName(), "√"); + } + //完成一个员工后将次数放入map集合 + } + map.put("参与培训次数", trainExecutionList.size()); + resultMap.add(map); + } else { + List trainExecutionList = wagesImplService.getTranByUserIdAndYear(user.getId(), year); - for(TrainExecution plan:trainExecutionList){ - map.put(plan.getTrainingName(),"√"); + for (TrainExecution plan : trainExecutionList) { + map.put(plan.getTrainingName(), "√"); } //完成一个员工后将次数放入map集合 - map.put("参与培训次数",trainExecutionList.size()); + map.put("参与培训次数", trainExecutionList.size()); resultMap.add(map); } + } return resultMap; } @@ -340,7 +358,7 @@ public class TrainExecutionController extends BaseController { @RequestMapping(value = "listPerExport") public String listPerExport(String year, HttpServletResponse response) { try { - List> wagesImpl = listPerSumData(year,""); + List> wagesImpl = listPerSumData(year,"",null); List trainExecutionList = wagesImplService.getAllPlan(year); List list = Lists.newArrayList(); list.add("部门"); @@ -349,7 +367,7 @@ public class TrainExecutionController extends BaseController { list.add(trainExecution.getTrainingName()); } list.add("参与培训次数"); - ExportExcel exportExcel = new ExportExcel("人员参与汇总", list).setDataList(wagesImpl); + ExportExcel exportExcel = new ExportExcel("人员参与汇总", list); for (int i = 0;i < wagesImpl.size(); i++){ Row row = exportExcel.addRow(); Map map = wagesImpl.get(i); diff --git a/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml b/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml index 2dcf5fad..ac19f462 100644 --- a/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml +++ b/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml @@ -45,9 +45,15 @@ a.del_flag = #{DEL_FLAG_NORMAL} + + AND a.impl_time = #{implTime} + AND a.training_theme = #{trainingTheme} + + AND a.training_type = #{trainingType} + AND a.training_name = #{trainingName} @@ -67,7 +73,7 @@ AND a.status = #{status} - and a.real_time = #{realTime} + AND a.real_time = #{realTime} AND a.training_people = #{trainingPeople} diff --git a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html index 4787e75a..a5c23ba8 100644 --- a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html +++ b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html @@ -52,7 +52,7 @@
+ value="${wagesImpl.implTime}" onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});" />
diff --git a/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html b/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html index fad9bbd5..21e04c56 100644 --- a/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html +++ b/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html @@ -25,6 +25,19 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -71,7 +84,7 @@
+ value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
@@ -136,6 +149,7 @@ $('#reset').click(function () { $('#userid').val(null).trigger("change"); $('#officeId').val(null); + $('#status').val(null).trigger("change"); }); $('#btnImport').click(function(){ diff --git a/jsite-web/src/main/resources/views/modules/train/trainPlanList.html b/jsite-web/src/main/resources/views/modules/train/trainPlanList.html index a1b2d750..6e438096 100644 --- a/jsite-web/src/main/resources/views/modules/train/trainPlanList.html +++ b/jsite-web/src/main/resources/views/modules/train/trainPlanList.html @@ -26,7 +26,12 @@
- +
+ +
+ <#form:treeselect id="dept" name="dept.id" title="部门选择" url="/sys/office/treeData?type=2" btnClass="btn-sm" allowClear="true" canSelectParent="true" isSubTag="false"/> +
+
-- Gitee