Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/pom.xml

@@ -31,6 +31,7 @@
             <artifactId>atms-dao</artifactId>
             <version>0.1.1</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

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

@@ -142,7 +142,6 @@ public class ReportServiceImpl extends BaseService {
                 operationResult.setResultMsg("NoOrganization");
                 return operationResult;
             }
-
             Long templateGroupId;
 
         /*
@@ -484,15 +483,12 @@ public class ReportServiceImpl extends BaseService {
         MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING);
         String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
         MyAsserts.assertTrue(status == null || !status.equals(Constant.APPROVAL_COMMITTED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
-
         try {
             if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {
                 operationResultDto.setResultMsg("PeriodRequiredForVAT");
                 return operationResultDto;
             }
-
             List<Template> templates = getTemplatesByProjectId(projectId);
-
             PeriodJob genJob = WrapPeriodJobDto.createReportGenJob(projectId, periodParam, templates);
             periodJobMapper.insert(genJob);
             new Thread(new Runnable() {

atms-web/pom.xml

@@ -17,6 +17,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>pwc.taxtech.atms</groupId>
+            <artifactId>atms-api</artifactId>
+            <version>0.1.1</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.security</groupId>

atms-web/src/main/webapp/app/admin/infrastructure/organizationAreaView/organization-area-view.ctrl.js

@@ -659,8 +659,7 @@
                 $scope.closeUserCard();
 
                 $scope.areaORGGridList.data = [];
-                $scope.
-                    = [];
+                $scope.commonCountDataSource= [];
                 if ($scope.panelArea.organizationList && $scope.panelArea.organizationList.length > 0) {
                     parseDataGridOnlyOrg();
                 } else {

atms-web/src/main/webapp/app/cit/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -79,7 +79,6 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api
                 item.text = $translate.instant(statusTmp);
 
                 calcProgress(item.name);
-
             }
         }
     };
@@ -489,8 +488,8 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api
             //        break;
             //    default:
             //        item.isSelected = false;
-
             //}
+
             var newTask = new task(item.id, constant.DataProccessStatus.Unstarted, item.name, item.tasklevel, item.parentId, item.hasButton, item.seqNo);
             newTask.btTitle = $translate.instant('DataProcessData_Generate');// item.btTitle;
             newTask.isSelected = true;//item.isSelected;

atms-web/src/main/webapp/app/cit/reduction/vat-caculate-data/vat-caculate-data.html

 <div id="vat-caculate-data">
     <div style="font-family:'Microsoft YaHei';font-size:18px;margin-top:10px">{{'vatCaculateDataDesc' | translate}}</div>
-    <div class="vat-caculate-data-title">     
+    <div class="vat-caculate-data-title">
         <button id="calAll" class="btn btn-vat-primary" style="background-color: #B4122A;" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate($event)"></button>
 
         <span ng-click="showOperateLogPop()" class="right"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
@@ -106,7 +106,7 @@
                 </form>
             </div>
         </perfect-scrollbar>
-    </div>    
+    </div>
 
 
     <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog" service-type="serviceType"></vat-operate-log>

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -2333,11 +2333,22 @@
 
         });
 
-        var dataGrid ={}
+        $scope._gridData =[];
         $scope.cellAttachmentDataGirdOptions = {
-            dataSource: [],
             columns: [{caption: '序号', dataField: "xh"},
-                {caption: '文件名', dataField: "fileName"},
+                {caption: '文件名', dataField: "fileName",cellTemplate: function (container, options) {
+                        try {
+                            $('<i class="fa fa-pencil-square-o" style="cursor: pointer"></i>&nbsp;&nbsp;')
+                                .on('click', function () {
+                                    location.href = options.data.fileUrl;
+                                });
+
+                        }
+                        catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
                 {caption: '文件大小', dataField: "size"},
                 {caption: '备注信息', dataField: "remarks"},
                 {caption: '用户', dataField: "uploadUser"},
@@ -2351,12 +2362,15 @@
                 allowDeleting: true
             },
             onInitialized : function(e){
-                dataGrid = e.component;
+                $scope.dataGrid = e.component;
+            },
+            bindingOptions : {
+                dataSource: '_gridData'
             }
         };
         //加载附件信息列表
         $scope.loadAttach = function () {
-            $scope.cellAttachmentDataGirdOptions.dataSource = [];
+            $scope._gridData = [];
             if ($scope.activeSheet.activeRow && $scope.activeSheet.activeCol && $scope.activeSheet.activeTemplateId) {
                 //获取附件信息
                 vatReportService.loadAttachList($scope.activeSheet).success(function (data) {
@@ -2371,13 +2385,12 @@
                             createTime : data[i].createTime
 
                         }
-                        $scope.cellAttachmentDataGirdOptions.dataSource.push(_data);
+                        $scope._gridData.push(_data);
                         _xh = i+1;
                     }
                     $scope.xh = _xh;
                     //刷新附件列表
-                    dataGrid.refresh();
-
+                   // $scope.dataGrid.refresh();
                    // dataGrid.refresh();
                 }).error(function(error){
                     SweetAlert.error("附件列表数据加载失败")
@@ -2431,8 +2444,8 @@
                 createTime : dataSource.data.createTime
 
             }
-            $scope.cellAttachmentDataGirdOptions.dataSource.push(_data);
-            dataGrid.refresh();
+            $scope._gridData.push(_data);
+           // $scope.dataGrid.refresh();
         }
         //上传附件
         var uploadfile = function (file) {

atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js

@@ -186,7 +186,7 @@
                 showClearButton: true,
                 searchEnabled: true,
                 noDataText: $translate.instant('RevenueNoOrgData'),
-                showSelectionControls: true,
+                showSelectionControls: true
             };
 
             //税率下拉框

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -239,7 +239,6 @@
                     taskList = taskList.concat(item.items);
                 });
 
-                $scope.tasks = result;
                 getInitTaskStatus();
             });
         };
@@ -370,7 +369,7 @@
                                 text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
                                 type: "warning",
                                 showCancelButton: true,
-                                confirmButtonColor: "#DD6B55",
+                                confirmButtonColor: "#dd6b55",
                                 confirmButtonText: $translate.instant('Yes'),
                                 cancelButtonText: $translate.instant('No'),
                                 closeOnConfirm: true,
@@ -582,9 +581,7 @@
              }else if(updateConfig.status == 'Begin'){
                 $scope.tasks[0].items[0].status = 'processing';
              }
-
              $scope.tasks[0].items[0].text= $translate.instant($scope.tasks[0].items[0].status);
-
               items.forEach(function(item,index){
                  tasks.forEach(function(task){
                     if(task.code==item.code){

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.html

@@ -33,7 +33,6 @@
             <ul ng-if="group.items.length > 1" ng-repeat="task in group.items track by $index">
                 <li ng-include="'task_template'" />
             </ul>
-
             <div ng-if="group.items.length == 1" ng-repeat="task in group.items track by $index" style="height:42px;" ng-include="'task_template'" />
     </script>