Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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

@@ -2070,16 +2070,17 @@ public class ReportServiceImpl extends BaseService {
             PeriodDataSource dataSourceModel = null;
             if (dataSourceExtendDtos.size() > 0) {
                 dataSourceModel = dataSourceExtendDtos.get(0).getDataSource();
+                dataSourceModel= periodDataSourceMapper.selectByPrimaryKey(dataSourceModel.getId());
                 if (StringUtils.isBlank(data.getKeyinData()))
                     updateCellValueForDataSourceChange(dataSourceModel, data.getAmount());
                 originalAmount = dataSourceModel.getAmount() != null ? dataSourceModel.getAmount() : new BigDecimal("0");
                 dataSourceModel.setName(data.getName());
                 dataSourceModel.setDescription(data.getDescription());
-                dataSourceModel.setAmount(data.getAmount());
+                dataSourceModel.setAmount(data.getAmount()==null?new BigDecimal(0):data.getAmount());
                 dataSourceModel.setUpdateBy("Admin");
                 dataSourceModel.setKeyinData(data.getKeyinData());
                 dataSourceModel.setUpdateTime(new Date());
-                periodDataSourceMapper.updateByPrimaryKeySelective(dataSourceModel);
+                periodDataSourceMapper.updateByPrimaryKey(dataSourceModel);
             } else {
                 dataSourceModel = new PeriodDataSource();
                 Long cellDataSourceId = distributedIdService.nextId();

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

 infrastructureModule
-    .controller('OrganizationManageController', ['$scope', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
-        function ($scope, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
+    .controller('OrganizationManageController', ['$scope', '$location', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
+        function ($scope, $location, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
             'use strict';
 
             $scope.expanded = false;
@@ -2388,6 +2388,15 @@
                 });
             };
 
+            // TODO 跳转到账套界面
+            $scope.jumpToAccount = function (enterpriseAccountSetID) {
+                // $location.path("/financialData/enterpriseAccountManage?enterpriseAccountSetID=" + enterpriseAccountSetID);
+                $location.path("/financialData/enterpriseAccountManage").search({
+                    jumpingEnterpriseAccountSetID: enterpriseAccountSetID
+                });
+
+            };
+
             // 选中机构
             $scope.selectOrganization = function (branch) {
 

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

@@ -1438,7 +1438,7 @@
 
                                                     <!-- 账套名称 -->
                                                     <span class="block-span"
-                                                        ng-show="!selectCompany.isUpdate">{{set.enterpriseAccountSetName}}</span>
+                                                        ng-show="!selectCompany.isUpdate" ng-click="jumpToAccount(set.enterpriseAccountSetID)">{{set.enterpriseAccountSetName}}</span>
 
                                                     <select ng-show="selectCompany.isUpdate"
                                                         class="form-control account-set-select"

atms-web/src/main/webapp/app/cit/report/cit-report-layout/cit-report-layout.ctrl.js

@@ -202,6 +202,15 @@
                 $scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
                 $scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
                 $scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
+
+                // 将查看纳税申报表权限都赋上
+                $scope.hasBsPlPermission = true;
+                $scope.hasBsPermission = true;
+                $scope.hasPlPermission = true;
+                $scope.hasTaxReturnPermission = true;
+                $scope.hasQueryTaxReturnPermission = true;
+                $scope.hasEditTaxReturnPermission = true;
+
             });
         };
         var toggleGroup = function (group) {

atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js

@@ -204,9 +204,7 @@
                 $scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
                 $scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
 
-
-
-                // TODO 临时代码,待删除
+                // 将查看纳税申报表权限都赋上
                 $scope.hasBsPlPermission = true;
                 $scope.hasBsPermission = true;
                 $scope.hasPlPermission = true;
@@ -214,7 +212,6 @@
                 $scope.hasQueryTaxReturnPermission = true;
                 $scope.hasEditTaxReturnPermission = true;
 
-
             });
         };
         var toggleGroup = function (group) {