diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java new file mode 100644 index 0000000..6955eda --- /dev/null +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.java @@ -0,0 +1,28 @@ +package com.lyms.base.common.dao.organ; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.base.common.entity.organ.OrganGroupMaps; + +/** + *

+ * Mapper接口 + *

+ * + * @author fangcheng + * @since 2017-03-09 + */ +@Repository +public interface OrganGroupMapsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + + public List getOrgList(Page page,Serializable groupId); + +} \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml new file mode 100644 index 0000000..0d04b39 --- /dev/null +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapsMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + ID AS id, GROUP_ID AS group_id, ORGAN_ID AS organ_id + + + + diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroupMaps.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroupMaps.java new file mode 100644 index 0000000..4081ae0 --- /dev/null +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroupMaps.java @@ -0,0 +1,57 @@ +package com.lyms.base.common.entity.organ; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

+ * + *

+ * + * @author fangcheng + * @since 2017-04-02 + */ +@TableName("SYS_ORGAN_GROUP_MAPS") +public class OrganGroupMaps implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "ID") + private String id; + /** + * + */ + @TableField(value = "GROUP_ID") + private String groupId; + /** + * 建档方式 + */ + @TableField(value = "ORGAN_ID") + private String organId; + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getGroupId() { + return groupId; + } + public void setGroupId(String groupId) { + this.groupId = groupId; + } + public String getOrganId() { + return organId; + } + public void setOrganId(String organId) { + this.organId = organId; + } + + +} diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java index ef6faad..0daf89d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java @@ -182,4 +182,12 @@ public class Roles implements Serializable { this.enable = enable; } + public String getGrouporgId() { + return grouporgId; + } + + public void setGrouporgId(String grouporgId) { + this.grouporgId = grouporgId; + } + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java new file mode 100644 index 0000000..efd9769 --- /dev/null +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupMapsService.java @@ -0,0 +1,38 @@ +package com.lyms.base.common.service.organ; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.base.common.entity.organ.OrganGroupMaps; +import com.lyms.web.service.BaseService; + +/** + *

+ * 服务类 + *

+ * + * @author fangcheng + * @since 2017-04-02 + */ +public interface OrganGroupMapsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:根据groupid获取所有机构 + *
  • @param groupId + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年4月2日 + *
  • 修改人： + *
  • 修改时间： + */ + public Page getOrgList(Page page,Serializable groupId); + +} diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java new file mode 100644 index 0000000..c7f3e30 --- /dev/null +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupMapsServiceImpl.java @@ -0,0 +1,35 @@ +package com.lyms.base.common.service.organ.impl; + +import java.io.Serializable; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.organ.OrganGroupMapsMapper; +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.base.common.entity.organ.OrganGroupMaps; +import com.lyms.base.common.service.organ.OrganGroupMapsService; + +/** + *

    + * 服务实现类 + *

    + * + * @author fancgheng + * @since 2017-04-02 + */ +@Service +public class OrganGroupMapsServiceImpl extends ServiceImpl implements OrganGroupMapsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + public Page getOrgList(Page page,Serializable groupId) { + page.setRecords(baseMapper.getOrgList(page,groupId)); + return page; + } + +} diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java index bcbc876..627c0be 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java @@ -64,8 +64,10 @@ public class SysRolesController extends BaseController { String id = getParameter("id"); String name = getParameter("name"); String type = getParameter("type"); + String orgId = getParameter("orgId"); + String grouprgId = getParameter("grouprgId"); if (StrUtils.isNotEmpty(id)) { - ew.and("id like {0}", name.trim() + "%"); + ew.and("id like {0}", id.trim() + "%"); } if (StrUtils.isNotEmpty(name)) { ew.and("name like {0}", name.trim() + "%"); @@ -73,6 +75,12 @@ public class SysRolesController extends BaseController { if (StrUtils.isNotEmpty(type)) { ew.and("type={0}", type); } + if (StrUtils.isNotEmpty(orgId)) { + ew.and("org_Id={0}", orgId); + } + if (StrUtils.isNotEmpty(grouprgId)) { + ew.and("grouprg_Id={0}", grouprgId); + } return toGridData(sysRolesService.selectPage(page, ew)); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java index 693bacd..a4613dc 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java @@ -94,6 +94,8 @@ public class SysUsersController extends BaseController { String searchName = getParameter("name"); String searchAccount = getParameter("account"); String searchPhone = getParameter("phone"); + String searchOrgId = getParameter("orgId"); + String searchDeptId = getParameter("deptId"); if (StrUtils.isNotEmpty(searchName)) { ew.and("name like {0}", searchName.trim() + "%"); } @@ -103,6 +105,12 @@ public class SysUsersController extends BaseController { if (StrUtils.isNotEmpty(searchPhone)) { ew.and("phone like {0}", searchPhone.trim() + "%"); } + if (StrUtils.isNotEmpty(searchOrgId)) { + ew.and("org_id = {0}", searchOrgId.trim() ); + } + if (StrUtils.isNotEmpty(searchDeptId)) { + ew.and("dept_Id = {0}", searchDeptId.trim() ); + } page = userService.selectPage(page, ew); return toGridData(page); } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html index f3ccaf9..918ccfb 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html @@ -6,12 +6,12 @@
    - +
    - +
    diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html index 9ffd6f5..f2cbed9 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html @@ -4,8 +4,8 @@
    - 机构组 - + 医院组 +
    @@ -35,13 +35,13 @@ var controllerRequestMappint = "/sysDepartments/"; function add() { - popWindow("添加部门/科室", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550); + popWindow("添加科室/科室", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550); } function edit(){ var id = getSingleSelectedValue("dataTable","id"); if(id){ - popWindow("修改部门/科室", APP.PATH + controllerRequestMappint + "toEdit?id="+id,700,550); + popWindow("修改科室/科室", APP.PATH + controllerRequestMappint + "toEdit?id="+id,700,550); } } @@ -63,10 +63,10 @@ var default_dataColumns = [{ title: '名称' },{ field: 'orgId', - title: '机构' + title: '医院' },{ field: 'parentId', - title: '上级部门' + title: '上级科室' },{ field: 'shortCode', title: '简码' diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html index b20971b..3d9e996 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_edit.html @@ -7,7 +7,7 @@
    - +
    @@ -29,7 +29,7 @@
    - +
    @@ -45,12 +45,12 @@
    - +
    - +
    查询 @@ -195,7 +195,7 @@ var default_dataColumns = [{ #extends("/common/base_list.html") #end -#extends("/common/base_list.html") - - +#extends("/common/base_list.html") \ No newline at end of file