From 18ba58f88fe098677d99f5bcdc7e8864226a4e01 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 8 Apr 2020 10:11:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=94=B9=E5=9B=9E=E7=A7=91?= =?UTF-8?q?=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/DeptController.java | 17 +++++++++++ .../RoleAndUserPowerController.java | 2 +- .../webapp/WEB-INF/views/deptDir/dept.jsp | 14 ++++----- .../webapp/WEB-INF/views/userDir/user.jsp | 2 +- .../src/main/webapp/static/js/blood.js | 4 +-- power-admin/src/main/webapp/static/js/dept.js | 2 +- power-admin/src/main/webapp/static/js/user.js | 2 +- ...> 用户列表导入模板(脐血库).xls} | Bin 19456 -> 19456 bytes ...¿â).xls => 用户列表导入模板.xls} | Bin 19456 -> 19456 bytes .../template/科室列表导入模板.xls | Bin 0 -> 18944 bytes ...°å.xls => 角色列表导入模板.xls} | Bin 19456 -> 19456 bytes ...°å.xls => 部门列表导入模板.xls} | Bin 18944 -> 18944 bytes ...Ã÷.txt => 权限系统版本说明.txt} | 0 .../com/manage/service/Power_DeptService.java | 6 ++++ .../service/ipml/Power_DeptServiceImpl.java | 28 ++++++++++++++++++ .../service/ipml/Power_UserServiceImpl.java | 2 +- 16 files changed, 65 insertions(+), 14 deletions(-) rename power-admin/src/main/webapp/static/template/{Óû§ÁÐ±íµ¼ÈëÄ£°å.xls => 用户列表导入模板(脐血库).xls} (99%) rename power-admin/src/main/webapp/static/template/{Óû§ÁÐ±íµ¼ÈëÄ£°å(ÆêѪ¿â).xls => 用户列表导入模板.xls} (62%) create mode 100644 power-admin/src/main/webapp/static/template/科室列表导入模板.xls rename power-admin/src/main/webapp/static/template/{½ÇÉ«ÁÐ±íµ¼ÈëÄ£°å.xls => 角色列表导入模板.xls} (99%) rename power-admin/src/main/webapp/static/template/{²¿ÃÅÁÐ±íµ¼ÈëÄ£°å.xls => 部门列表导入模板.xls} (99%) rename power-admin/src/main/webapp/{ȨÏÞϵͳ°æ±¾ËµÃ÷.txt => 权限系统版本说明.txt} (100%) diff --git a/power-admin/src/main/java/com/manage/controller/DeptController.java b/power-admin/src/main/java/com/manage/controller/DeptController.java index a6f94d0..7d7ff0d 100644 --- a/power-admin/src/main/java/com/manage/controller/DeptController.java +++ b/power-admin/src/main/java/com/manage/controller/DeptController.java @@ -304,6 +304,23 @@ public class DeptController { e.printStackTrace(); } } + /** + * @Date 2019-4-29 + * @Author ly + * @Description 导出Excel + * */ + @OptionalLog(module = "导出excel",methods = "部门管理") + @RequiresPermissions(value="/dept/exportBlood") + @RequestMapping("/exportBlood") + public void exportBlood(Power_DeptVo powerDept,HttpServletRequest request,HttpServletResponse response){ + try { + powerDeptService.exportBlood(powerDept,request,response); + CacheManager.addExcCount("noExc"); + }catch (Exception e){ + CacheManager.addExcCount("exc"); + e.printStackTrace(); + } + } /** * @Date 2019-4-22 * @Author ly diff --git a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java index 181f86c..b8658b3 100644 --- a/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java +++ b/power-admin/src/main/java/com/manage/controller/RoleAndUserPowerController.java @@ -281,7 +281,7 @@ public class RoleAndUserPowerController { * @UpdateRemark: 更新说明 * @Version: 1.0 */ - @RequestMapping(value = "getUserTreeByHospitalId") + @RequestMapping(value = "getUserTreeByHospitalId",produces = {"text/json;charset=UTF-8"}) @ResponseBody public String getUserTreeByHospitalId(Integer hospitalId){ try { diff --git a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp index c698595..09511f7 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp @@ -4,7 +4,7 @@ <%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %> - 部门管理 + 科室管理 @@ -81,12 +81,12 @@
-

基本管理/部门管理

+

基本管理/科室管理

- +
@@ -146,7 +146,7 @@
- +
@@ -188,7 +188,7 @@ id="form1">
- +
@@ -196,12 +196,12 @@
+ onclick="importExcel('/dept/importExcel','科室')">
-
1、部门名不能为空,不能重复,内容最多16个字。
+
1、科室名不能为空,不能重复,内容最多16个字。
2、是否有效不能为空,内容最多9个字。
3、备注可为空,内容最多50个字。
4、值包含逗号必须单元格设置为文本类型。
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp index 09358b2..f4af3e7 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp @@ -121,7 +121,7 @@
- +