From ffc576eec1310b60771cc737783a2a7a4868820e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 24 Jul 2016 16:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E5=9F=BA=E7=A1=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/Organization.java | 9 +++++ .../permission/model/OrganizationQuery.java | 9 +++++ .../src/main/resources/mainOrm/Organization.xml | 7 ++++ .../com/lyms/platform/pojo/SmsConfigModel.java | 10 ------ .../operate/web/facade/SmsConfigFacade.java | 42 +++++++++++++--------- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java index 14ffc97..6e5efc5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -35,6 +35,15 @@ public class Organization { private Object street; private String foreignId; private Integer orgType; //-1 未设置 0 公司 1 医院 + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } public Integer getOrgType() { return orgType; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java index 69275c0..bc9382b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java @@ -30,6 +30,15 @@ public class OrganizationQuery extends BaseQuery { private List provinceIds; private List typeList; private List idList; + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } public List getProvinceIds() { return provinceIds; diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml index 2d294af..03423a1 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml @@ -85,6 +85,9 @@ values (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{city shortCode = #{shortCode,jdbcType=VARCHAR}, + + status = #{status,jdbcType=INTEGER}, + where id = #{id,jdbcType=INTEGER} @@ -189,6 +192,10 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri #{item} + + + and status = #{status,jdbcType=INTEGER} + diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java index 5a36585..88fd4d4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java @@ -49,8 +49,6 @@ public class SmsConfigModel extends BaseModel { //高危配置 private String highConfig; - //运行状态 0运行 1试运行 2停止 - private Integer status; public String getHighConfig() { return highConfig; @@ -60,14 +58,6 @@ public class SmsConfigModel extends BaseModel { this.highConfig = highConfig; } - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - public String getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index cbb01da..9a9dcb2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -381,7 +381,7 @@ public class SmsConfigFacade { String address = org.getAddress(); allAddress+=address; hospital.put("address", allAddress); - + hospital.put("status",org.getStatus()+""); hospital.put("remark", ""); } SmsConfigQuery query = new SmsConfigQuery(); @@ -394,7 +394,7 @@ public class SmsConfigFacade { if (model != null) { hospital.put("highConfig",model.getHighConfig()); - hospital.put("status",model.getStatus()+""); + } } @@ -424,7 +424,6 @@ public class SmsConfigFacade { if (model != null && StringUtils.isNotEmpty(model.getId())) { model.setHighConfig(highConfig); - model.setStatus(status); smsConfigService.updateSmsConfig(model, model.getId()); isExist = true; } @@ -436,9 +435,13 @@ public class SmsConfigFacade { model.setHospitalId(hid); model.setYn(YnEnums.YES.getId()); model.setHighConfig(highConfig); - model.setStatus(status); smsConfigService.addSmsConfig(model); } + Organization obj = new Organization(); + obj.setId(Integer.parseInt(hid)); + obj.setStatus(status); + organizationService.updateOrganization(obj); + BaseResponse objectResponse = new BaseResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("保存成功"); @@ -490,6 +493,7 @@ public class SmsConfigFacade { organizationQuery.setTypeList(typeList); organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setKeyword(hospitalName); + organizationQuery.setStatus(status); List hospitals = new ArrayList<>(); @@ -546,6 +550,22 @@ public class SmsConfigFacade { String sendTime = ""; String statusStr = ""; + if (org.getStatus() != null) + { + // 0运行 1试运行 2停止 + if (org.getStatus() == 0) + { + statusStr = "正式运行"; + } + else if (org.getStatus() == 1) + { + statusStr = "试运行"; + } + else if (org.getStatus() == 2) { + statusStr = "停止运行"; + } + } + if (StringUtils.isNotEmpty(hid)) { SmsConfigQuery queryConfig = new SmsConfigQuery(); @@ -576,19 +596,7 @@ public class SmsConfigFacade { } } } - // 0运行 1试运行 2停止 - if (model.getStatus() == 0) - { - statusStr = "正式运行"; - } - else if (model.getStatus() == 1) - { - statusStr = "试运行"; - } - else if (model.getStatus() == 2) - { - statusStr = "停止运行"; - } + } } } -- 1.8.3.1