diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java index 1b277e7..37989a2 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java @@ -44,6 +44,9 @@ public class OrganGroup implements Serializable { */ @TableField(value = "CLIENTADDRESS") private String clientaddress; + + @TableField(exist=false) + private String orgIds; /** * 0:可用 1:不可用 @@ -99,4 +102,13 @@ public class OrganGroup implements Serializable { this.ifdel = ifdel; } + public String getOrgIds() { + return orgIds; + } + + public void setOrgIds(String orgIds) { + this.orgIds = orgIds; + } + + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java index 481eb76..0fa2599 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java @@ -58,5 +58,5 @@ public interface OrganGroupService extends BaseService { *
  • 修改时间： */ public boolean updateGroup(OrganGroup organGrooup) throws SystemException; - + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java index 47f6da6..4af8779 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java @@ -1,16 +1,24 @@ package com.lyms.base.common.service.organ.impl; import java.io.Serializable; +import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.organ.OrganGroupMapper; +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; import com.lyms.base.common.service.organ.OrganGroupService; import com.lyms.exception.SystemException; +import com.lyms.util.InstanceUtils; +import com.lyms.util.StrUtils; /** *

    @@ -22,18 +30,37 @@ import com.lyms.exception.SystemException; */ @Service public class OrganGroupServiceImpl extends ServiceImpl implements OrganGroupService { + + @Autowired + private OrganGroupMapsMapper organGroupMapsMapper; + @Transactional public Integer deleteLogicById(Serializable id) { + organGroupMapsMapper.delete(new EntityWrapper().where("GROUP_ID={0}", id)); return baseMapper.deleteLogicById(id); } @Override @Transactional public boolean create(OrganGroup organGroup) throws SystemException { - if (organGroup == null) return false; + organGroup.setId(StrUtils.uuid()); + if(StrUtils.isNotEmpty(organGroup.getOrgIds())){ + String[] ids = organGroup.getOrgIds().split(","); + List mapsList = InstanceUtils.newArrayList(); + for(String id : ids){ + OrganGroupMaps maps = new OrganGroupMaps(); + maps.setId(StrUtils.uuid()); + maps.setGroupId(organGroup.getId()); + maps.setOrganId(id); + mapsList.add(maps); + organGroupMapsMapper.insert(maps); + } + organGroup.setOrgnumber(mapsList.size()); + } Integer tag = baseMapper.insert(organGroup); + return tag != null && tag > 0; } @@ -52,11 +79,25 @@ public class OrganGroupServiceImpl extends ServiceImpl 0; + if (organGroup == null) + return false; + organGroupMapsMapper.delete(new EntityWrapper().where("GROUP_ID={0}", organGroup.getId())); + if(StrUtils.isNotEmpty(organGroup.getOrgIds())){ + String[] ids = organGroup.getOrgIds().split(","); + List mapsList = InstanceUtils.newArrayList(); + for(String id : ids){ + OrganGroupMaps maps = new OrganGroupMaps(); + maps.setId(StrUtils.uuid()); + maps.setGroupId(organGroup.getId()); + maps.setOrganId(id); + mapsList.add(maps); + organGroupMapsMapper.insert(maps); + } + organGroup.setOrgnumber(mapsList.size()); + } + Integer tag = baseMapper.updateById(organGroup); + + return tag != null && tag > 0; } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java index 4da7a0b..5d80fef 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java @@ -15,7 +15,11 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.organ.OrganGroup; import com.lyms.base.common.enums.ValidityEnum; +import com.lyms.base.common.service.organ.OrganGroupMapsService; import com.lyms.base.common.service.organ.OrganGroupService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; /** @@ -32,6 +36,9 @@ public class SysOrganGroupController extends BaseController { @Autowired private OrganGroupService groupService; + + @Autowired + private OrganGroupMapsService organGroupMapsService; /** *

  • @Description:跳转到租列表 @@ -76,9 +83,40 @@ public class SysOrganGroupController extends BaseController { if (!StringUtils.isBlank(id)) { OrganGroup group = groupService.selectById(id); model.addAttribute("group", group); - + } return "/group/group_edit"; } + @ResponseBody + @RequestMapping(value = "/create", method = { RequestMethod.POST }) + public AjaxResult create(OrganGroup organGroup, AjaxResult ajaxResult) { + boolean tag = groupService.create(organGroup); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + @ResponseBody + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + public AjaxResult update(OrganGroup organGroup, AjaxResult ajaxResult) { + boolean tag = groupService.updateGroup(organGroup); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + } + + @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + int tag = groupService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + + + @ResponseBody + @RequestMapping(value = "/listGroupOrg/{groupId}", method = { RequestMethod.GET, RequestMethod.POST }) + public Map listGroupOrg(@PathVariable String groupId) { + Page page = getPage(); + if(StrUtils.isNotEmpty(groupId)){ + page = organGroupMapsService.getOrgList(page,groupId); + } + return toGridData(page); + } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java index af1ba57..43f3226 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java @@ -65,6 +65,9 @@ public class SysOrganizationsController extends BaseController { String provinceId = organizations.getProvinceId(); String cityId = organizations.getCityId(); String areaId = organizations.getAreaId(); + if(StringUtils.isNotBlank(organizations.getName())){ + ew.where("NAME like {0}", "%"+organizations.getName()+"%"); + } if (StringUtils.isNotBlank(provinceId)) { ew.where("PROVINCE_ID={0}", provinceId); } 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 c166dab..b20971b 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 @@ -28,7 +28,14 @@ - +
    + + +
    +
    + +
    +
    @@ -40,11 +47,60 @@
    -
    -
    +
    +
    +
    + +
    +
    + 查询 +
    +
    + 添加 +
    +
    +
    +
    #end -#extends("/common/base_list.html") \ No newline at end of file +#extends("/common/base_list.html") + + \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html index 7f539fd..cc75425 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/group/group_list.html @@ -1,39 +1,41 @@ #override("body") -
    -
    -
    -
    -
    -
    -
    -
    - 机构组 - -
    -
    -
    -
    - -
    -
    - 查询 -
    -
    -
    -
    -
    -
    -
    - - - -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + 查询 +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    #end diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html index ac1fbf8..276df42 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/organ/org_list.html @@ -42,13 +42,13 @@ var controllerRequestMappint = "/sysOrganizations/"; function add() { - popWindow("添加结构", APP.PATH + controllerRequestMappint + "/toEdit?orgId=",700,550); + fullWindow("添加机构", APP.PATH + controllerRequestMappint + "/toEdit?orgId="); } function edit(){ var id = getSingleSelectedValue("dataTable","id"); if(id){ - popWindow("修改机构", APP.PATH + controllerRequestMappint + "toEdit?orgId="+id,700,550); + fullWindow("修改机构", APP.PATH + controllerRequestMappint + "toEdit?orgId="+id); } } diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html index 5eb4cb8..36ccd9c 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html @@ -12,6 +12,10 @@
    +
    + 所属区域 + #extends("/organ/org.html") +
    @@ -105,3 +109,11 @@ var default_dataColumns = [{ #end #extends("/common/base_list.html") + + diff --git a/parent/pom.xml b/parent/pom.xml index dfd3b55..e9d9be6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ 5.1.34 4.2.5.RELEASE 1.8.9 - 2.0.1 + 2.0.5 1.2.8 1.7.21 1.0.13