From bc3865bb9b5eabc3b985641a7a90c86112ae9534 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Sun, 26 Apr 2020 12:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AB=8B=E5=88=BB=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emrApprove/ApproveController.java | 31 ++++++++++--------- .../approve/AppleApproveServiceImpl.java | 7 +++++ .../service/approve/ApplyApproveService.java | 5 +++ .../WEB-INF/views/otherManage/lockList.jsp | 1 - 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java index cfb76d6..bb21a71 100644 --- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java +++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java @@ -22,9 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.HttpClients; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -41,8 +38,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.multipart.MultipartResolver; -import org.springframework.web.multipart.commons.CommonsMultipartResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -182,8 +177,10 @@ public class ApproveController { } } //推送给权限系统下发审批人通知 - sendPowerApproveInterface(applyApprove.getApplyType(),commomtables.size()); - + String applyStateTemp = "2"; + if(applyApprove.getApplyState().equals(applyStateTemp)){ + sendPowerApproveInterface(applyApprove.getApplyType(),commomtables.size()); + } } else { return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); } @@ -201,7 +198,7 @@ public class ApproveController { private void sendPowerApproveInterface(String applyType,Integer count) throws Exception{ //查询申请类型 List dictionaryList = dictionaryMapper.selectDictionaryByTypeCode("apply_type"); - /*String applyTypeName = ""; + String applyTypeName = ""; if(null != dictionaryList && !dictionaryList.isEmpty()){ for(Emr_Dictionary dictionary : dictionaryList){ if(dictionary.getCode().equals(applyType)){ @@ -210,9 +207,8 @@ public class ApproveController { } } } - String url = POWER_URLHEAD+"/font/sendEmrRecordApproveNotice?applyType="+applyTypeName+"&count="+count; - // 执行请求 - HttpClients.createDefault().execute(new HttpGet(url));*/ + //发送通知 + applyApproveService.sendNotice(applyTypeName,count); } /** @@ -349,15 +345,20 @@ public class ApproveController { applyApprove.setApproveState(""); applyApprove.setApproveNotes(""); } + applyApproveService.updateEmrApplyApprove(applyApprove); }else{ boolean flag = FormTokenFlagUtil.isFlag(request); if (flag) { applyApproveService.addEmrApplyApprove(applyApprove,request); + //是确认提交情况下发送通知 + String applyStateTemp = "2"; + if(applyApprove.getApplyState().equals(applyStateTemp)){ + sendPowerApproveInterface(applyApprove.getApplyType(),1); + } }else{ return ResultUtil.error("请不要重复提交!"); } - } return ResultUtil.ok(); }catch(Exception e){ @@ -1067,6 +1068,8 @@ public class ApproveController { }else{ //有出错数据 String msgStr = excelEntity.getWorkBookKey()+"@已成功导入"+excelEntity.getSuccessCount()+"条,失败"+excelEntity.getWrongCount()+"条,随后将导出错误记录!"; + //是确认提交情况下发送通知 + sendPowerApproveInterface(applyType,excelEntity.getSuccessCount()); return new ResponseEntity(msgStr, responseHeaders, HttpStatus.OK); } }catch (Exception e){ @@ -1104,9 +1107,7 @@ public class ApproveController { if (null != applyApproves && !applyApproves.isEmpty()) { //调用权限系统推送通知 String applyTypeName = "申请"; - String url = POWER_URLHEAD + "/font/sendEmrRecordApproveNotice?applyType=" + applyTypeName + "&count=" + applyApproves.size(); - // 执行请求 - HttpClients.createDefault().execute(new HttpGet(url)); + applyApproveService.sendNotice(applyTypeName,applyApproves.size()); } }catch (Exception e){ e.printStackTrace(); diff --git a/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java b/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java index b42f744..2973be1 100644 --- a/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java +++ b/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java @@ -163,4 +163,11 @@ public class AppleApproveServiceImpl implements ApplyApproveService{ public int SimpleUpdate(Emr_Apply_Approve record, String idsStr) { return applyApproveMapper.SimpleUpdate(record,idsStr); } + + @Override + public void sendNotice(String applyType, int count) throws Exception{ + String url = POWER_URLHEAD + "/font/sendEmrRecordApproveNotice?applyType=" + applyType + "&count=" + count; + // 执行请求 + HttpClients.createDefault().execute(new HttpGet(url)); + } } diff --git a/src/main/java/com/emr/service/approve/ApplyApproveService.java b/src/main/java/com/emr/service/approve/ApplyApproveService.java index 7bd0d9d..c9514f2 100644 --- a/src/main/java/com/emr/service/approve/ApplyApproveService.java +++ b/src/main/java/com/emr/service/approve/ApplyApproveService.java @@ -23,4 +23,9 @@ public interface ApplyApproveService { int SimpleInsert(List list); int SimpleUpdate(Emr_Apply_Approve record,String idsStr); + + /** + * 发送通知 + * */ + void sendNotice(String applyType,int count) throws Exception; } diff --git a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp index a46ac3d..d1c6a5c 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp @@ -37,7 +37,6 @@ } .dateSearchInput{ width:30%; - margin-left:2%; } .dateLabelDiv{ width: 30%;