From 30f0e2d0f15c0d30cfe130c26d4ce25124e2db5b Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 13 Oct 2020 09:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201013(?= =?UTF-8?q?=E5=87=BA=E9=99=A2=E6=B5=8F=E8=A7=88=E7=A7=91=E5=AE=A4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=90=9C=E7=B4=A2=E6=8C=89=E6=9D=83=E9=99=90=E3=80=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=E6=98=8E?= =?UTF-8?q?=E6=96=87=E3=80=81=E8=A7=A3=E5=86=B3=E5=BE=85=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=90=9C=E7=B4=A2bug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/LoginController.java | 14 ++-- .../com/emr/entity/Archive_Master_Vo.java | 2 + .../ipml/Archive_MasterServiceImpl.java | 3 +- .../resources/mapper/Archive_MasterMapper.xml | 65 +++++++++++++------ src/main/webapp/WEB-INF/jspf/comm.jspf | 2 +- .../views/beHospitaledDir/beHospList.jsp | 2 +- src/main/webapp/WEB-INF/views/index.jsp | 2 +- .../webapp/static/js/beHospList/beHospList.js | 6 +- src/main/webapp/static/js/comm.js | 20 ++++-- 9 files changed, 79 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java index 936e8df..76610c6 100644 --- a/src/main/java/com/emr/controller/LoginController.java +++ b/src/main/java/com/emr/controller/LoginController.java @@ -81,22 +81,24 @@ public class LoginController { UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456"); Subject subject = SecurityUtils.getSubject(); subject.login(userToken); - model.addAttribute("POWER_URLHEAD", POWER_URLHEAD); - model.addAttribute("POWER_JSP", POWER_JSP); + request.getSession().setAttribute("POWER_URLHEAD", POWER_URLHEAD); + request.getSession().setAttribute("POWER_JSP", POWER_JSP); //传递通知需要的数据 - model.addAttribute("WEBSOCKET_URLHEAD", WEBSOCKET_URLHEAD); - model.addAttribute("STR_SPLIT", STR_SPLIT); + request.getSession().setAttribute("WEBSOCKET_URLHEAD", WEBSOCKET_URLHEAD); + request.getSession().setAttribute("STR_SPLIT", STR_SPLIT); //设置进session ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); ActionScopeUtils.setSessionAttribute("CURRENT_USER",powerUser,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); }else{ return "redirect:"+POWER_URLHEAD+"/login"; } - return "index"; + String contextPath = request.getScheme()+"://"+request.getServerName()+":" + +request.getServerPort() + request.getContextPath(); + return "redirect:"+contextPath+"/index"; } @RequestMapping(value = "/index") - public String Login() { + public String index() { return "index"; } diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 76e2841..7e9e20a 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -38,6 +38,8 @@ public class Archive_Master_Vo extends Archive_Master{ private Integer role;//操作角色1,2,4 + private Integer operRole;//操作角色1,2,4 + private String roles;//操作角色字符串 private Integer infoId;//流转流程的id diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index ee68587..939d4ff 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -228,7 +228,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { "and freg_date is not null"; try{ //执行查询 - List selectList = OracleConnect.selectList(sql); + List selectList = new ArrayList<>(); + selectList = OracleConnect.selectList(sql); for (Archive_Master_Vo masterVo : list) { masterVo.setRemark("未签收"); //赋值 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index ec2d4a6..594527e 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -285,7 +285,16 @@ - LEFT JOIN ( SELECT master_id, COUNT( id ) approveCount FROM archive_flow_info WHERE step_index = 1 GROUP BY master_id HAVING ( COUNT( id )) = 2 ) temp3 ON m.id = temp3.master_id + LEFT JOIN ( + + + select master_id,master_id approveCount from ( select master_id,step_index from archive_flow_info where step_index in (1,2) group by master_id,step_index) temp group by master_id having(COUNT(master_id)) = 2 + + + SELECT master_id,master_id approveCount FROM archive_flow_info WHERE step_index = 1 and oper_role = ${operRole} + + + ) temp3 ON m.id = temp3.master_id INNER JOIN @@ -316,7 +325,7 @@ diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index 34880d3..a4cdfec 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -56,4 +56,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index eddd3bb..d238284 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -750,7 +750,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 27fb9f9..ed5950a 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -354,7 +354,7 @@