From 9a711dd699e59e85b3fdd55979a90f7c0b4b3eea Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Tue, 21 May 2019 10:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=96=E5=8C=BA=E5=8D=AB=E7=94=9F=E9=99=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/model/Organization.java    | 11 ++++-
 .../mainOrm/master/MasterOrganization.xml          | 15 +++---
 .../web/controller/OrganizationController.java     | 57 ++++++++++++----------
 3 files changed, 49 insertions(+), 34 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 a1dceec..bdcd400 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
@@ -37,6 +37,16 @@ public class Organization {
     private String foreignId;
     private Integer orgType;        //-1 未设置 0 公司 1 医院
     private Integer status;
+    //乡镇卫生院ID
+    private String townOrgId;
+
+    public String getTownOrgId() {
+        return townOrgId;
+    }
+
+    public void setTownOrgId(String townOrgId) {
+        this.townOrgId = townOrgId;
+    }
 
     public Integer getbStatus() {
         return bStatus;
@@ -141,7 +151,6 @@ public class Organization {
     }
 
 
-
     public void setShortCode(String shortCode) {
         this.shortCode = shortCode;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
index f78641a..c919a0f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml
@@ -22,20 +22,20 @@
         <result column="shortCode" property="shortCode" jdbcType="VARCHAR"/>
         <result column="foreign_id" property="foreignId" jdbcType="VARCHAR"/>
         <result column="bStatus" property="bStatus" jdbcType="INTEGER"/>
-
+        <result column="townOrgId" property="townOrgId" jdbcType="VARCHAR"/>
     </resultMap>
 
 
     <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
         <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
         insert into organization
-        (foreign_id,name,type,level,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus
+        (foreign_id,name,type,level,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id,bStatus,townOrgId
         <if test="id != null and id >= 0">
             ,id
         </if>
         )
         values
-        (#{foreignId},#{name},#{type},#{level},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus}
+        (#{foreignId},#{name},#{type},#{level},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId},#{bStatus},#{townOrgId}
         <if test="id != null and id >= 0">
             ,#{id}
         </if>
@@ -103,6 +103,9 @@
             <if test="status != null">
                 status = #{status,jdbcType=INTEGER},
             </if>
+            <if test="townOrgId !=null">
+                townOrgId=#{townOrgId,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -114,7 +117,7 @@ delete from organization where id = #{id,jdbcType=INTEGER}
 
 
     <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
-select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
+select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus,townOrgId
  from organization where id = #{id,jdbcType=INTEGER}
 </select>
 
@@ -218,7 +221,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     <select id="queryOrganization" resultMap="OrganizationResultMap"
             parameterType="com.lyms.platform.permission.model.OrganizationQuery">
         select
-        id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus
+        id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status,bStatus,townOrgId
         from organization
         <include refid="OrganizationCondition"/>
         <include refid="orderAndLimit"/>
@@ -261,7 +264,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     </select>
 
     <select id="getOrganizationByAreaId" parameterType="string" resultType="map">
-        SELECT id, name FROM `organization` where yn = 1 and area_id = #{areaId}
+        SELECT id, name,townOrgId FROM `organization` where yn = 1 and area_id = #{areaId}
     </select>
 
     <select id="getOrganizationName" parameterType="java.lang.String" resultType="java.lang.String">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index e86b5d1..786970e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -59,7 +59,7 @@ public class OrganizationController extends BaseController {
      */
     @RequestMapping(value = "/organization/{id}", method = RequestMethod.DELETE)
     @TokenRequired
-    public void updateOrganization(HttpServletResponse response, @PathVariable(value = "id") Integer id,HttpServletRequest request) {
+    public void updateOrganization(HttpServletResponse response, @PathVariable(value = "id") Integer id, HttpServletRequest request) {
         if (id == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
@@ -133,7 +133,7 @@ public class OrganizationController extends BaseController {
             return;
         }
 
-        if(!organization.getName().equals(name)) {
+        if (!organization.getName().equals(name)) {
             OrganizationQuery organizationQuery = new OrganizationQuery();
             organizationQuery.setYn(YnEnums.YES.getId());
             organizationQuery.setName(name);
@@ -184,7 +184,8 @@ public class OrganizationController extends BaseController {
                                 @RequestParam(value = "streetId", required = false) String streetId,
                                 @RequestParam(value = "address") String address,
                                 @RequestParam(value = "description", required = false) String description,
-                                @RequestParam(value = "shortCode", required = false) String shortCode) {
+                                @RequestParam(value = "shortCode", required = false) String shortCode,
+                                @RequestParam(value = "townOrgId", required = false) String townOrgId) {
 
         //获取登录用户
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
@@ -220,17 +221,19 @@ public class OrganizationController extends BaseController {
         organization.setModified(new Date());
         organization.setPublishName(users.getName());
         organization.setPublishId(users.getId());
+        //乡镇卫生院ID
+        organization.setTownOrgId(townOrgId);
         //默认为建档医院
         organization.setbStatus(1);
-        Integer id=  organizationService.addOrganization(organization);
+        Integer id = organizationService.addOrganization(organization);
 
 
         operateLogFacade.addAddOptLog(getUserId(request), id, organization, OptActionEnums.ADD.getId(), "添加机构");
 
-        AccessPermissionAddRequest  accessPermissionAddRequest =  new AccessPermissionAddRequest();
-        accessPermissionAddRequest.setUserId(loginState.getId()+"");
+        AccessPermissionAddRequest accessPermissionAddRequest = new AccessPermissionAddRequest();
+        accessPermissionAddRequest.setUserId(loginState.getId() + "");
         accessPermissionAddRequest.setBizId(id + "");
-        accessPermissionAddRequest.setType(PermissionTypeEnums.Type.ADMIN.getId()+"");
+        accessPermissionAddRequest.setType(PermissionTypeEnums.Type.ADMIN.getId() + "");
         accessPermissionFacade.addAccessPermission(accessPermissionAddRequest);
         ResultUtils.buildSuccessResultAndWrite(response);
     }
@@ -242,25 +245,25 @@ public class OrganizationController extends BaseController {
     @ResponseBody
     @TokenRequired
     public Map getOrganization(HttpServletRequest request, @RequestParam(value = "page", required = false) Integer page,
-                                          @RequestParam(value = "limit", required = false) Integer limit,
-                                          @RequestParam(value = "keyword", required = false) String keyword,
-                                          @RequestParam(value = "areaId", required = false) String aId) {
+                               @RequestParam(value = "limit", required = false) Integer limit,
+                               @RequestParam(value = "keyword", required = false) String keyword,
+                               @RequestParam(value = "areaId", required = false) String aId) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         Users users = usersService.getUsers(loginState.getId());
 
         List<Integer> areaId = autoMatchFacade.matchAreaOrgId(loginState.getId());
         List<Object> data = new ArrayList<>();
         List<Organization> organizations = new ArrayList<>();
-        PageInfo pageInfo = new PageInfo(0,0,0,1);
+        PageInfo pageInfo = new PageInfo(0, 0, 0, 1);
         if (areaId != null) {
             // 一定要加上自己的机构权限
             areaId.add(users.getOrgId());
             OrganizationQuery organizationQuery = new OrganizationQuery();
-            if(null != page && null!=limit) {
+            if (null != page && null != limit) {
                 organizationQuery.setNeed("true");
                 organizationQuery.setPage(page);
                 organizationQuery.setLimit(limit);
-                if(80 < limit) {    //一次请求大于80 则按树排序
+                if (80 < limit) {    //一次请求大于80 则按树排序
                     organizationQuery.setSort("province_id desc,city_id desc,area_id desc");
                 } else {
                     organizationQuery.setSort("modified desc");
@@ -268,7 +271,7 @@ public class OrganizationController extends BaseController {
             }
 
             BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(aId);
-            if(null != basicConfig) {
+            if (null != basicConfig) {
                 if (SystemConfig.CHINA_BASIC_ID.equals(basicConfig.getParentId())) {
                     organizationQuery.setProvinceId(aId);
                 } else {
@@ -299,9 +302,9 @@ public class OrganizationController extends BaseController {
 //            organizationQuery.setYn(YnEnums.YES.getId());
 //            organizationQuery.setTypeList(list);
             organizations = organizationService.queryOrganization(organizationQuery);
-            pageInfo=organizationQuery.getPageInfo();
+            pageInfo = organizationQuery.getPageInfo();
 
-        } else if(null == areaId && UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())){
+        } else if (null == areaId && UserTypeEnum.SUPPER_ADMIN.getId().equals(users.getType())) {
 //            UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
 //            userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
 //            userOrganizationMapsQuery.setUserId(loginState.getId());
@@ -311,11 +314,11 @@ public class OrganizationController extends BaseController {
 
             OrganizationQuery organizationQuery = new OrganizationQuery();
             organizationQuery.setKeyword(keyword);
-            if(null != page &&null!= limit ) {
+            if (null != page && null != limit) {
                 organizationQuery.setNeed("true");
                 organizationQuery.setPage(page);
                 organizationQuery.setLimit(limit);
-                if(80 < limit) {  //一次请求大于80 则按树排序
+                if (80 < limit) {  //一次请求大于80 则按树排序
                     organizationQuery.setSort("province_id desc,city_id desc,area_id desc");
                 } else {
                     organizationQuery.setSort("modified desc");
@@ -324,7 +327,7 @@ public class OrganizationController extends BaseController {
 
 
             BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(aId);
-            if(null != basicConfig) {
+            if (null != basicConfig) {
                 if (SystemConfig.CHINA_BASIC_ID.equals(basicConfig.getParentId())) {
                     organizationQuery.setProvinceId(aId);
                 } else {
@@ -369,14 +372,14 @@ public class OrganizationController extends BaseController {
                 data.add(organization);
             }
         }
-        Map<String,Object> map = new HashMap<>();
-        map.put("data",data);
-        map.put("errormsg","成功");
-        map.put("errorcode",ErrorCodeConstants.SUCCESS);
-        map.put("pageInfo",pageInfo);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", data);
+        map.put("errormsg", "成功");
+        map.put("errorcode", ErrorCodeConstants.SUCCESS);
+        map.put("pageInfo", pageInfo);
         List<DataPermissionsModel> dataPermissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
         if (dataPermissionsModelList != null && dataPermissionsModelList.size() > 0) {
-            map.put("areaPermission",dataPermissionsModelList.get(0).getAreaPermission());
+            map.put("areaPermission", dataPermissionsModelList.get(0).getAreaPermission());
         }
         return map;
     }
@@ -436,8 +439,8 @@ public class OrganizationController extends BaseController {
             List<Integer> list = autoMatchFacade.matchOrgId(loginState.getId());
             List<String> a = new ArrayList<>();
 
-            if(CollectionUtils.isNotEmpty(list)){
-               a  = organizationService.queryProvinceIdByOrgId(list);
+            if (CollectionUtils.isNotEmpty(list)) {
+                a = organizationService.queryProvinceIdByOrgId(list);
             }
            /* for (Integer integer : list) {
                 Organization organization = organizationService.getOrganization(integer);
-- 
1.8.3.1