1、fixbug

atms-api/pom.xml

@@ -514,6 +514,22 @@
                 </includes>
                 <targetPath>${basedir}/target/classes/cit_excel_template</targetPath>
             </resource>
+            <resource>
+                <directory>src/main/resources/analysis_excel_template</directory>
+                <includes>
+                    <include>**/*.xls</include>
+                    <include>**/*.xlsx</include>
+                </includes>
+                <targetPath>${basedir}/target/classes/analysis_excel_template</targetPath>
+            </resource>
+            <resource>
+                <directory>src/main/resources/user_excel_template</directory>
+                <includes>
+                    <include>**/*.xls</include>
+                    <include>**/*.xlsx</include>
+                </includes>
+                <targetPath>${basedir}/target/classes/user_excel_template</targetPath>
+            </resource>
         </resources>
         <plugins>
             <plugin>

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateGroupDto.java

@@ -8,7 +8,7 @@ import java.util.List;
  */
 public class TemplateGroupDto {
 
-    private String id;
+    private Long id;
     private String name;
     private String serviceTypeId;
     private Date updateTime;
@@ -31,11 +31,11 @@ public class TemplateGroupDto {
         this.reportType = reportType;
     }
 
-    public String getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

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

@@ -106,9 +106,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
     }
 
     public OperationResultDto<Object> updateTemplateGroupName(TemplateGroupDto templateGroupDto) {
-        TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(Long.parseLong(templateGroupDto.getId()));
+        TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
         TemplateGroupExample example = new TemplateGroupExample();
-        example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(Long.parseLong(templateGroupDto.getId())).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
+        example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(templateGroupDto.getId()).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
         List<TemplateGroup> templateGroups = templateGroupMapper.selectByExample(example);
         if (!templateGroups.isEmpty()) {
             OperationResultDto<Object> result = new OperationResultDto<>();
@@ -125,7 +125,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public OperationResultDto<Object> deleteTemplateGroup(TemplateGroupDto templateGroupDto) {
         OperationResultDto<Object> result = new OperationResultDto<>();
-        TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(Long.parseLong(templateGroupDto.getId()));
+        TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
 
         if (templateGroupDb.getIsSystemType()) {
             result.setResult(false);
@@ -133,7 +133,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
             return result;
         }
 
-        List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(Long.parseLong(templateGroupDto.getId()));
+        List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(templateGroupDto.getId());
         if (userOranizationNameList != null && !userOranizationNameList.isEmpty()) {
             result.setResult(false);
             result.setResultMsg(TemplateGroupMessage.ORGANIZATION_USED_TEMPLATE_GROUP);

atms-web/src/main/webapp/app-resources/i18n/en-us/systemConfiguration.json

@@ -92,7 +92,7 @@
     "ReportType": "报表类型：",
     "SelectReport": "报表：",
 
-    "Filter": "筛选:",
+    "Filter": "筛选",
     "KeyValueConfiguration": "关键数据配置",
     "AddKeyValue": "添加关键数据",
     "FinancialStatement": "财务报表",

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

@@ -58,7 +58,7 @@
     "EtsSubjectNameCol": "对应企业科目",
     "ExistMappedOrg": "当前选中机构的科目对应已经存在，是否覆盖？",
     "FillingInstructions": "填报说明",
-    "Filter": "筛选:",
+    "Filter": "筛选",
     "FinancialStatement": "财务报表",
     "Formula": "公式：",
     "FormulaConfig": "公式配置",

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

@@ -18,13 +18,16 @@
             </button>
 
             <div class="account-filter" style="display:inline-block;margin-left: 16px;">
-              
+                <button type="button" style="font-size: 16px;" class="btn btn-in-grid" ng-click="showFilter()">
+                    <i class="fa fa-filter" ng-click="showFilter()"><span>{{'Filter' | translate}}</span></i>
+                </button>
+                <!--
                <span style="height: 25px;display: inline-block;line-height: 25px;vertical-align: middle;">
                    {{'Filter' | translate }}
                </span> 
                 <span>
                     <i class="fa fa-filter" style="font-size: 16px;" aria-hidden="true" ng-click="showFilter()"></i>
-                </span>
+                </span>-->
                 <div class="filter-select" tabindex="-1" style="display:none">
                     <ul ng-repeat=" x in taxPayerFilterList">
                         <li>

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

@@ -81,8 +81,9 @@
                 }
 
             .fa-filter {
-                font-size: 25px;
-                vertical-align: sub;
+                //font-size: 25px;
+                //vertical-align: sub;
+                width: 100%;
             }
         }
 

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2135,21 +2135,21 @@
 
             // 编辑机构其他信息
             $scope.updateOrgExtra = function () {
-                $('.extra-organization-info .col-sm-4 span').attr("hidden", "hidden");
-                $('.extra-organization-info .col-sm-8 span').attr("hidden", "hidden");
+                $('.tax-reg-info-content .col-sm-4 span').attr("hidden", "hidden");
+                $('.tax-extra-info-content .col-sm-8 span').attr("hidden", "hidden");
                 $('.extra-organization-info .right-option .button2position').removeAttr("hidden");
                 $('.extra-organization-info .right-option .updOrgBtn').attr("hidden", "hidden");
-                for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
-                    $('.extra-organization-info .col-sm-4 input')[i].style.display = "inline";
+                for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 input').length; i++) {
+                    $('.tax-reg-info-content .col-sm-4 input')[i].style.display = "inline";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
-                    $('.extra-organization-info .col-sm-4 select')[i].style.display = "inline";
+                for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 select').length; i++) {
+                    $('.tax-reg-info-content .col-sm-4 select')[i].style.display = "inline";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
-                    $('.extra-organization-info .col-sm-8 input')[i].style.display = "inline";
+                for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 input').length; i++) {
+                    $('.tax-extra-info-content .col-sm-8 input')[i].style.display = "inline";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
-                    $('.extra-organization-info .col-sm-8 select')[i].style.display = "inline";
+                for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 select').length; i++) {
+                    $('.tax-extra-info-content .col-sm-8 select')[i].style.display = "inline";
                 }
                 $scope.editOldData = angular.copy($scope.editOrgExtraModel);
                 $scope.comExtraOldData = angular.copy($scope.selectCompanyExtra);
@@ -2164,21 +2164,21 @@
             };
 
             var cancelWebChange = function(){
-                $('.extra-organization-info .col-sm-8 span').removeAttr("hidden");
-                $('.extra-organization-info .col-sm-4 span').removeAttr("hidden");
+                $('.tax-extra-info-content .col-sm-8 span').removeAttr("hidden");
+                $('.tax-reg-info-content .col-sm-4 span').removeAttr("hidden");
                 $('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
                 $('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
-                for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
-                    $('.extra-organization-info .col-sm-4 input')[i].style.display = "none";
+                for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 input').length; i++) {
+                    $('.tax-reg-info-content .col-sm-4 input')[i].style.display = "none";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
-                    $('.extra-organization-info .col-sm-4 select')[i].style.display = "none";
+                for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 select').length; i++) {
+                    $('.tax-reg-info-content .col-sm-4 select')[i].style.display = "none";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
-                    $('.extra-organization-info .col-sm-8 input')[i].style.display = "none";
+                for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 input').length; i++) {
+                    $('.tax-extra-info-content .col-sm-8 input')[i].style.display = "none";
                 }
-                for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
-                    $('.extra-organization-info .col-sm-8 select')[i].style.display = "none";
+                for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 select').length; i++) {
+                    $('.tax-extra-info-content .col-sm-8 select')[i].style.display = "none";
                 }
             };
 

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less

@@ -459,9 +459,12 @@
                     outline: none;
                   }
 
+                  input {
+                    width: 70% !important;
+                  }
+
                   select {
-                    width : 172px;
-                    height : 20px;
+                    width: 70% !important;
                   }
 
                   .divider {
@@ -496,7 +499,17 @@
                     font-weight: 700;
                     font-family: 'Microsoft YaHei Bold', 'Microsoft YaHei Regular', 'Microsoft YaHei';
                   }
+                  .tax-reg-info-table{
+                    .tax-reg-info-content {
+                      .row input {
+                        width: 70%;
+                      }
 
+                      .row select {
+                        width: 70%;
+                      }
+                    }
+                  }
 
 
                   .tax-extra-info-table {

atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.ctrl.js

@@ -495,7 +495,7 @@
                 $scope.userOperateType = constant.Operation.Edit;
                 $scope.isUpdateUser = false;
                 $scope.selectedUser = {
-                    id: user.id
+                    id: $stateParams.id
                 };
             };
 

atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.ctrl.js

@@ -29,13 +29,12 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
                 $scope.editUserModel.Status = userData.status;
                 $scope.editUserModel.OrganizationID = userData.organizationID;
                 $scope.editUserModel.Email = userData.email;
-                $scope.editUserModel.OrgName = userData.orgName;
+                $scope.editUserModel.orgName = userData.orgName;
                 $scope.editUserModel.RoleIDs = userData.roleIDs;
                 $scope.editUserModel.RoleNames = userData.roleNames;
                 $scope.editUserModel.CreateTime = userData.createTime;
                 $scope.editUserModel.Password = userData.password;
                 $scope.editUserModel.isAdmin = userData.isAdmin;
-
             });
             $('.edit-user-modal-wrapper .modal').modal('show');
         };