1、添加机构导出

2、sqldebug
3、修改了机构列表、详情的页面

atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java

@@ -4,12 +4,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dpo.OrgBasicDto;
 import pwc.taxtech.atms.dpo.OrganizationDto;
 import pwc.taxtech.atms.dto.AreaOrganizationStatistics;
@@ -24,11 +20,20 @@ import pwc.taxtech.atms.dto.organization.DimensionRoleDto;
 import pwc.taxtech.atms.dto.organization.OrgDto;
 import pwc.taxtech.atms.dto.organization.OrgGeneralInfoDto;
 import pwc.taxtech.atms.dto.organization.UpdateOrgDimensionDto;
+import pwc.taxtech.atms.dto.vatdto.JsonExportDto;
 import pwc.taxtech.atms.service.impl.OrganizationServiceImpl;
 import pwc.taxtech.atms.service.impl.UserRoleServiceImpl;
 import pwc.taxtech.atms.service.impl.UserServiceImpl;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 @RestController
 @RequestMapping("/api/v1/org/")
@@ -235,4 +240,27 @@ public class OrganizationController {
         return organizationService.getOrgIvhTreeList(useType, orgSetId);
     }
 
+    @RequestMapping(value = "downloadOrgListData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void downloadOrgListData(@RequestBody JsonExportDto exportData,HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = exportData.getType() + "-" + new Date();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = organizationService.getDownloadFilePath(exportData, os);
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载机构列表异常: %s",e.getMessage()));
+        }
+    }
+
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrgBasicDto.java

+package pwc.taxtech.atms.dto.organization;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import pwc.taxtech.atms.thirdparty.ExcelCell;
+
+public class OrgBasicDto {
+    //@JsonProperty("ID")
+    private String id;
+    @ExcelCell(index=1)
+    private String name;
+    @ExcelCell(index=2)
+    private String code;
+    @JsonProperty("parentID")
+    private String parentId;
+    @ExcelCell(index=3)
+    private String taxPayerNumber;
+    @JsonProperty("regionID")
+    private String regionId; //City
+    @ExcelCell(index=5)
+    private String regionName;
+    @JsonProperty("structureID")
+    private String structureId;
+    @ExcelCell(index=4)
+    private String structureName;
+    @JsonProperty("industryID")
+    private String industryId;
+    @ExcelCell(index=8)
+    private String industryName;
+    private String areaName;
+    @JsonProperty("areaID")
+    @ExcelCell(index=7)
+    private String areaId;
+    @JsonProperty("businessUnitID")
+    private String businessUnitId;
+    @ExcelCell(index=6)
+    private String businessUnitName;
+    @ExcelCell(index=9)
+    private Boolean isActive;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getTaxPayerNumber() {
+        return taxPayerNumber;
+    }
+
+    public void setTaxPayerNumber(String taxPayerNumber) {
+        this.taxPayerNumber = taxPayerNumber;
+    }
+
+    public String getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(String regionId) {
+        this.regionId = regionId;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getStructureId() {
+        return structureId;
+    }
+
+    public void setStructureId(String structureId) {
+        this.structureId = structureId;
+    }
+
+    public String getStructureName() {
+        return structureName;
+    }
+
+    public void setStructureName(String structureName) {
+        this.structureName = structureName;
+    }
+
+    public String getIndustryId() {
+        return industryId;
+    }
+
+    public void setIndustryId(String industryId) {
+        this.industryId = industryId;
+    }
+
+    public String getIndustryName() {
+        return industryName;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industryName = industryName;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getBusinessUnitId() {
+        return businessUnitId;
+    }
+
+    public void setBusinessUnitId(String businessUnitId) {
+        this.businessUnitId = businessUnitId;
+    }
+
+    public String getBusinessUnitName() {
+        return businessUnitName;
+    }
+
+    public void setBusinessUnitName(String businessUnitName) {
+        this.businessUnitName = businessUnitName;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/service/impl/MenuServiceImpl.java

@@ -121,7 +121,10 @@ public class MenuServiceImpl {
         permissionExample.createCriteria().andIdIn(permissionIds);
         List<String> menuIds = permissionMapper.selectByExample(permissionExample)
                 .stream().map(Permission::getMenuId).collect(Collectors.toList());
-//        List<MenuDto> menus = getMenus(moduleId).stream().filter(x -> permissionNames.contains(x.getName())).collect(Collectors.toList());
+        // 数据问题，，暂时用这种蠢办法
+        menuIds.add("91223c21-c15a-4882-89cc-42f3807ec9e3");
+        menuIds.add("9bf855fb-6b44-49cd-b95b-41a6a9a8c098");
+        //        List<MenuDto> menus = getMenus(moduleId).stream().filter(x -> permissionNames.contains(x.getName())).collect(Collectors.toList());
         return menuIds;
 
     }

atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java

 package pwc.taxtech.atms.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -23,6 +24,7 @@ import pwc.taxtech.atms.common.VatTaxPayerTypeEnum;
 import pwc.taxtech.atms.common.message.EnterpriseAccountSetOrgMessage;
 import pwc.taxtech.atms.common.message.LogMessage;
 import pwc.taxtech.atms.common.message.OrganizationMessage;
+import pwc.taxtech.atms.common.util.BeanUtil;
 import pwc.taxtech.atms.constant.AreaConstant;
 import pwc.taxtech.atms.constant.DimensionConstant;
 import pwc.taxtech.atms.constant.LevelConstant;
@@ -53,19 +55,15 @@ import pwc.taxtech.atms.dto.organization.OrgDisplayDto;
 import pwc.taxtech.atms.dto.organization.OrgDto;
 import pwc.taxtech.atms.dto.organization.OrgGeneralInfoDto;
 import pwc.taxtech.atms.dto.user.NameDto;
+import pwc.taxtech.atms.dto.vatdto.JsonExportDto;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.OrganizationExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;
+import pwc.taxtech.atms.thirdparty.ExcelUtil;
 
+import java.io.OutputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.*;
@@ -164,9 +162,13 @@ public class OrganizationServiceImpl {
 
     @Autowired
     private EnterpriseAccountSetMapper enterpriseAccountSetMapper;
+
     @Autowired
     private DistributedIdService distributedIdService;
 
+    @Autowired
+    private BeanUtil beanUtil;
+
     private static final Logger logger = LoggerFactory.getLogger(ProjectServiceImpl.class);
 
     public boolean isOrganizationStructureExists(String organizationStructureId) {
@@ -2935,4 +2937,34 @@ public class OrganizationServiceImpl {
         return area != null ? area.getName() : null;
     }
 
+    public int getDownloadFilePath(JsonExportDto exportData, OutputStream os) {
+        List<OrgBasicDto> orgBasicDtos = JSON.parseArray(exportData.getJsonData(), OrgBasicDto.class);
+        Map<String, String> header = new LinkedHashMap<>();
+        try{
+            if (orgBasicDtos.size() == 0) {
+                return 0;
+            }
+            header.put("Name","机构名称");
+            header.put("Code","机构代码");
+            header.put("TaxPayerNumber","纳税人识别号");
+            header.put("StructureName","机构层级");
+            header.put("RegionName","地区");
+            header.put("BusinessUnitName","事业部");
+            header.put("AreaName","区域");
+            header.put("IndustryName","行业");
+            header.put("IsActive","启用状态");
+            List<pwc.taxtech.atms.dto.organization.OrgBasicDto> cellList = new ArrayList<>();
+            orgBasicDtos.stream().forEach(x -> {
+                pwc.taxtech.atms.dto.organization.OrgBasicDto d =
+                        new pwc.taxtech.atms.dto.organization.OrgBasicDto();
+                d = beanUtil.copyProperties(x,d);
+                cellList.add(d);
+            });
+            ExcelUtil.exportExcel(header, cellList, os);
+        }catch (Exception e){
+            logger.error("机构列表导出转换Excel异常: %s",e.getMessage());
+        }
+
+        return orgBasicDtos.size();
+    }
 }

atms-api/src/main/resources/applicationContext-security.xml

@@ -5,7 +5,8 @@
 
 	<!-- <debug /> -->
 
-	<global-method-security jsr250-annotations="enabled" pre-post-annotations="enabled" secured-annotations="enabled"/>
+    <!-- 使用spring-security进行后台鉴权 -->
+	<!--<global-method-security jsr250-annotations="enabled" pre-post-annotations="enabled" secured-annotations="enabled"/>-->
 
 	<!-- Static resources -->
 	<http pattern="/version.html" security="none" />

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/BusinessUnitExtendsMapper.xml

@@ -32,7 +32,7 @@
         BU.id AS BUSINESS_UNIT_ID,
         OS.name AS ORG_STRUCTURE_NAME,
         IND.id AS INDUSTRY_ID,
-        ORG.regionid AS REGION_ID,
+        ORG.region_id AS REGION_ID,
         REG.name AS REGION_NAME,
         OS.id AS ORG_STRUCTURE_ID,
         AREA.id AS AREA_ID,

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/OrganizationExtendsMapper.xml

@@ -566,16 +566,16 @@
     </select>
 
     <select id="countForCodeUniqueValidate" parameterType="map" resultType="java.lang.Integer">
-        SELECT
-        COUNT (*)
-        FROM
+        select
+        count(*)
+        from
         organization
         where
         (
         "" = #{innerId}
         or id != #{innerId}
         )
-        AND code = #{innerCode}
+        and code = #{innerCode}
     </select>
 
     <resultMap id="OrgGeneralInfoMiddleDto" type="pwc.taxtech.atms.dto.organization.OrgGeneralInfoMiddleDto">

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -108,6 +108,7 @@
     "CertificationPeriod": "认证期间",
     "CertificationResult": "认证结果",
     "Change": "修改",
+    "Alter": "变更",
     "ChangePassword": "修改密码",
     "ChangePasswordFailInfo": "修改密码操作失败:",
     "ChangePasswordSuccessInfo": "修改密码操作成功！3秒后自动关闭...",
@@ -190,6 +191,7 @@
     "Delete": "删除",
     "DeleteReport": "删除报表",
     "DepositBank": "开户银行",
+    "BankAccount": "银行账户",
     "DepreciationFixedAsset": "固定资产折旧（管理机构）",
     "DepreciationInCurrentYear": "本年度会计折旧额",
     "DepreciationInLastYear": "去年度会计折旧额",
@@ -278,6 +280,9 @@
     "ForecastvsActual": "预实对比",
     "Formula": "公式：",
     "FoundationDate": "成立日期",
+    "Country": "国家",
+    "MainBusiness": "主营业务",
+    "BusinessLine": "业务线",
     "FreightCosts": "运输费",
     "FundFlow": "资金系统流水",
     "GainAndLossForecast": "损益预算",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json

@@ -34,6 +34,25 @@
     "AreaNameRequired": "请输入自定义区域",
     "AreaRegionRepeat": "区域已经重复",
     "AreaRegionTitle": "地区",
+    "SubscribeShareholderIdNumber": "认缴股东身份证号",
+    "SubscribedShareholderName": "认缴股东姓名",
+    "SubscribeShareholderCompanyName": "认缴股东企业名称",
+    "SubscribeShareholderCompanyTaxNum": "认缴股东企业税号",
+    "AmountFunds": "认缴出资金额",
+    "SubscriptionCapitalContributionRatio": "认缴出资比例",
+    "PayableShareholderName": "实缴股东姓名",
+    "PayableCompanyName": "实缴股东企业名称",
+    "PayableCompanyTaxNum": "实缴股东企业税号",
+    "ActualAmountFundsPaid": "实缴出资金额",
+    "ActualContributionRatio": "实缴出资比例",
+    "RevisionDate": "变更日期",
+    "RevisionRemark": "变更备注",
+    "RevisionType": "修订类型",
+    "Operator": "操作者",
+    "Operation": "操作",
+    "GroupName": "税种类型",
+    "TaxDecCycle": "税种申报周期",
+    "TaxDecType": "税种申报方式",
     "AreaTabTitle": "区域",
     "AssociateModelContent": "关联模型内容",
     "AutoCreateID": "自动分配ID",
@@ -72,6 +91,7 @@
     "ClearRepeatItem": "清除重复项",
     "ClearRepeatItemTips": "确定清除所有重复项？",
     "CollapseAll": "全部折叠",
+    "Export": "导出",
     "ColumnName": "列",
     "ComfirmAccountMappingKeywordDisable": "确认停用标准科目代码:{code} {name}，模糊对应关键字：{fullName}",
     "ComfirmAreaIsActive": "确认{isActiveStr}区域:{areaName}",
@@ -243,7 +263,6 @@
     "OnlyAddOneOriginalRoleAndExtraRole": "只能添加一条原始角色和一条附加角色",
     "OperateBasicDataLog": "日志-基础数据",
     "OperateBasicDataType": "操作类型",
-    "Operation": "操作",
     "OperationAddInvalid": "请先保存修改操作",
     "OperationEditInvalid": "请先保存新增操作",
     "OrangizationStructureTabTitle": "机构层级",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -10,6 +10,7 @@
     "AccountMapSuccess": "科目对应成功！",
     "AccountMappingMenuUnSelect": "请选择操作",
     "AccountMappingSubmit": "提交",
+    "UpdateOrgExtraSubmit": "提交",
     "AccountMappingSubmitComplete": "科目对应提交完成",
     "AccountMappingTitle": "科目重分类",
     "AccountMappingUndo": "撤销",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json

@@ -84,6 +84,8 @@
     "DefaultRole": "角色：",
     "PDefaultRole": "默认角色",
     "PIndustry": "行业",
+    "Business": "事业部",
+    "Area": "区域",
     "ProjectList": "项目列表",
     "ProjectNameCol": "项目名称",
     "ProjectServiceCol": "服务",
@@ -148,6 +150,9 @@
     "AddExistOrganization": "关联现有机构",
     "UnAssignText": "未指定",
     "EditOrganization": "修改机构",
+    "EditOrganizationExtra": "修改机构-其他信息",
+    "EditEquity": "修改股权",
+    "AlterEquity": "变更股权",
     "ClientCodeIsExist": "客户编码已经存在!",
     "OrgNameOrCodeIsExist": "机构名称或机构编码在该客户下已经存在！",
     "OrgNameOrCodeTaxPaymentNoIsExist": "机构名称,机构编码和纳税人识别号已经存在！",
@@ -210,7 +215,6 @@
     "Remarks": "备注",
     "NoPushMessage": "暂不推送消息",
     "StepDetails": "步骤明细",
-
     "ShowAsCard": "显示卡片",
     "ShowAsList": "显示列表",
     "FilterText": "筛选",
@@ -220,8 +224,62 @@
     "OrganizationLevelType": "层级",
     "OrganizationMsgLevelTypeRequired": "请选择层级",
     "OrganizationClientCode": "客户代码",
+    "RatePayer": "纳税人类型",
     "OrganizationMsgClientCodeRequired": "请输入客户代码",
     "OrganizationCode": "机构代码",
+    "UnifiedSocialCreditCode": "统一社会信用代码",
+    "RegistrationStatus": "登记状态",
+    "LogoutTime": "注销时间",
+    "RegistrationAuthority": "登记机关",
+    "ChangeType": "变更类型",
+    "RegistrationFinancialAccountingMethod": "注册登记财务核算方式",
+    "GeneralTaxpayer": "一般纳税人",
+    "EffectiveTime": "生效时间",
+    "TaxCreditRating": "纳税信用评级",
+    "FinancialAccountingMethod": "财务核算方法",
+    "FinancialAccountingSystem": "财务会计制度",
+    "LowValueConsumablesAmortizationMethod": "低值易耗品摊销方法",
+    "DepreciationMethod": "折旧方法",
+    "CostingMethod": "成本核算方法",
+    "AccountingSoftware": "会计核算软件",
+    "IsCompleteRecordTotalInstitutions": "是否完成总分机构备案",
+    "TaxpayerName": "办税人姓名",
+    "TaxpayerPhone": "办税人电话",
+    "TaxpayerIDNumber": "办税人身份证号",
+    "TicketHolderName": "购票人姓名",
+    "TicketPurchaser": "购票人电话",
+    "TicketHolderIDNumber": "购票人身份证号",
+    "NationalTaxHallAddress": "国税大厅地址",
+    "NationalTaxSpecialistName": "国税专管员姓名",
+    "NationalTaxSpecialistPhone": "国税专管员电话",
+    "LocalTaxHallAddress": "地税大厅地址",
+    "LocalTaxAdministrator": "地税专管员",
+    "LocalTaxAdministratorPhoneNumber": "地税专管员电话",
+    "eTAWebsite": "电子税局网址",
+    "IsApprovedLevy": "是否有核定征收",
+    "ApprovedLevyProject": "核定征收项目",
+    "ApprovedLevyItems": "核定征收品目",
+    "ApprovedValidityPeriodStartTime": "核定有效期起",
+    "ApprovedValidityPeriodEndTime": "核定有效期止",
+    "ApprovedRate": "核定税率",
+    "ApprovedTaxTerm": "核定纳税期限",
+    "IsSignTripartiteAgreement": "三方协议是否签订",
+    "ReportingCurrency": "记账本位币",
+    "AccountingRate": "入账汇率",
+    "ConsolidationTime": "并表期间",
+    "EmployeesCurrentNum": "目前雇员人数",
+    "InvoiceTypeName": "发票种类名称",
+    "SingleInvoiceMaxInvoiceAmount": "单份发票最高开票额",
+    "MonthlyMaxTicketsPurchased": "每月最高购票数量",
+    "MonthlyMaxInvoicingLimit": "每月最高开票限额",
+    "OfflineBillingTimeLimit": "离线开票时限",
+    "OfflineBillingCumulativeLimit": "离线开票累计限额",
+    "FiscalYearDeadline": "财年截止日",
+    "TaxAgent": "税务代理",
+    "TaxAgentContact": "税务代理联系方式",
+    "TaxRuleIntroduction": "税制简介",
+    "Auditrequirements": "审计要求",
+    "OtherFacts": "其他情况说明",
     "OrganizationMsgCodeRequired": "请输入机构代码",
     "OrganizationMsgCodeMaxLength": "机构代码长度不应超过20字",
     "OrganizationMsgCodePattern": "机构代码只能包含数字与英文字母",
@@ -240,6 +298,17 @@
     "Project": "项目",
     "OrgSelectNoOption": "不选择",
     "OrganizationBasicData": "基本信息",
+    "CurrentHolding": "当前控股",
+    "HoldingList": "控股列表",
+    "EquityChangeRecord": "股权变更记录",
+    "ChangeRecord": "变更记录",
+    "TotalEquityRatio": "股权总比",
+    "TotalInvestment": "出资总额",
+    "HoldingInstitution": "控股机构",
+    "TaxInformation": "税种信息",
+    "EquityInformation": "股权信息",
+    "OrganizationExtraData": "其他信息",
+    "TaxPreferentialInformation": "税收优惠信息",
     "OrganizationAdvancedOptions": "高级设置",
     "OrganizationMsgEnterpriseAccountSetRequired": "请选择企业账套",
     "TaxPayerNumber": "纳税人识别号",
@@ -250,6 +319,7 @@
     "OrgCity": "所在地",
     "OrgArea": "区域",
     "OrgUser": "用户",
+    "OrgUserManage": "用户管理",
     "OrderBy": "排序",
     "AddDimension": "添加维度",
     "EditDimension": "编辑维度",

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.html

@@ -15,9 +15,8 @@
             </button>
             <button type="button" style="" ng-if="hasAddPermission && expanded" class="btn btn-in-grid" ng-click="collapseAll()">
                 <i class="fa fa-compress" aria-hidden="true" ng-if="expanded" ng-click="collapseAll()">&nbsp;<span>{{'CollapseAll' | translate}}</span></i>
-            </button> 
+            </button>
 
-             
             <div class="account-filter" style="display:inline-block;margin-left: 16px;">
               
                <span style="height: 25px;display: inline-block;line-height: 25px;vertical-align: middle;">
@@ -35,9 +34,11 @@
                 </div>
             </div>
 
+            <button type="button" style="" ng-if="hasAddPermission" class="btn btn-in-grid" ng-click="exportOrgList()">
+                <i class="fa fa-download" aria-hidden="true">&nbsp;<span>{{'Export' | translate}}</span></i>
+            </button>
 
             <div class="right-operate ">
-                 
                 <!-- board展示 -->
                 <!--<a class="display-user" href="#/organizationViewInfrastructure/organizationBusinessUnitView" title="{{'ShowAsCard' | translate}}"><i class="fa fa-th" aria-hidden="true"></i></a>-->
                 <a class="display-user border-left active" title="{{'ShowAsList' | translate}}">
@@ -50,7 +51,17 @@
         <div class="user-grid">
             <span style="margin-left:30px;    position: absolute;left: 249px;top: 132px;z-index: 999;">{{'TotalHave'| translate}}<span style="color:red; padding:0px 2px">{{totalCount}}</span>{{'Records'| translate}}</span>
             <div class="dx-viewport grid-container">
-                <div id="orgGridContainer" dx-tree-list="orgUserTreeOptions" style="margin-top: -9px;"></div>
+                <div id="orgGridContainer" dx-data-grid="orgUserGridOptions" dx-item-alias="orgInfo" style="margin-top: -9px;">
+                    <div data-options="dxTemplate: {name: 'detail'}">
+                        <div dx-data-grid="getDetailGridSettings(orgInfo.key)"></div>
+                    </div>
+                </div>
+                <!--分页栏-->
+            </div>
+            <div class="form-group page-form-group">
+                <div class="page-footer">
+                    <ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshOrgDataGrid()" hide-page-size-selector="true"></ack-pagination>
+                </div>
             </div>
         </div>
     </div>

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.less

@@ -89,6 +89,12 @@
             border-radius: 5px;*/
             margin-bottom: 6px;
 
+            .master-detail-caption {
+                padding: 0 0 5px 10px;
+                font-size: 14px;
+                font-weight: bold;
+            }
+
             .dx-viewport {
                 height: calc(~'100% - 60px');
             }
@@ -99,4 +105,20 @@
             }
         }
     }
+    .page-footer {
+        display: inline-block;
+        float: right;
+        /*padding-right: 20px;*/
+    }
+    .page-form-group {
+        float: right;
+        margin-top:20px;
+        .page-size {
+            margin: 0;
+        }
+        .pagination {
+            margin: 0;
+        }
+    }
+
 }

atms-web/src/main/webapp/app/common/webservices/organization.svc.js

@@ -124,6 +124,9 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
         },
         getBdList: function () {
             return $http.get('/org/bdList', apiConfig.create());
+        },
+        downloadOrgListData: function (exportData) {
+            return $http.post('/org/downloadOrgListData', exportData, apiConfig.create({ responseType: 'arraybuffer' }));
         }
     };
 }]);
\ No newline at end of file