CIT查看报表修改bug

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

@@ -171,11 +171,9 @@ public class CitReportServiceImpl extends BaseService {
         try {
             //根据projectId获取相关报表
             List<Template> templates = getTemplatesByProjectId(projectId);
+
+            //因WrapPeriodJobDto.createReportGenJob方法需要传入数组，但CIT并不需要所以传入一个空数组
             List<String> dataValidateArray = new ArrayList<String>();
-            /*dataValidateArray.add("DA001");
-            dataValidateArray.add("DA002");
-            dataValidateArray.add("DA003");*/
-            dataValidateArray.add("DA004");
             PeriodJob genJob = WrapPeriodJobDto.createReportGenJob(projectId, periodParam, templates, dataValidateArray);
 
             periodJobMapper.insert(genJob);
@@ -186,7 +184,7 @@ public class CitReportServiceImpl extends BaseService {
                         updateConfig(projectId, periodParam, isMergeManualData, templates, genJob);
 
                         // TODO 进行数据校验
-                        DataValidation(periodParam, projectId, genJob);
+//                        DataValidation(periodParam, projectId, genJob);
 
                         PeriodResources resources = reportGenerator.getPeriodResources(projectId, periodParam,
                                 templates.stream().map(Template::getId).collect(Collectors.toList()));
@@ -199,6 +197,9 @@ public class CitReportServiceImpl extends BaseService {
                         FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
                         evaluator.evaluateAll();
 
+                        setStatus(genJob, STATUS_END);
+                        periodJobMapper.updateByPrimaryKey(genJob);
+
                         reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
                         setStatus(genJob, STATUS_END);
                         periodJobMapper.updateByPrimaryKey(genJob);
@@ -362,8 +363,7 @@ public class CitReportServiceImpl extends BaseService {
         clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
         //复制配置
         copyTemplateAndConfigFromAdmin(projectId, templates, period);
-        setStatus(job, STATUS_END);
-        periodJobMapper.updateByPrimaryKey(job);
+
     }
 
     /**

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -1047,7 +1047,7 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
 
             $stateProvider.state({
                 name: 'cit.generateReport.reportView',
-                url: '/reportView?{id:string}&{templateid:string}&{name:string}&{templatecode:string}&{initrow:any}&{initcol:any}&{parentviewid:string}',
+                url: '/reportView?{id:string}&{templateid:string}&{name:string}&{templatecode:string}',
                 views: {
                     '@cit.generateReport': {
                         controller: ['$scope', '$stateParams', 'appTranslation',
@@ -1056,13 +1056,9 @@ init-row="initRow" init-col="initCol" service-type="\'6\'" is-document-list="tru
                                 $scope.templateId = $stateParams.templateid;
                                 $scope.templateName = $stateParams.name;
                                 $scope.templateCode = $stateParams.templatecode;
-                                $scope.initRow = $stateParams.initrow;
-                                $scope.initCol = $stateParams.initcol;
-                                $scope.parentViewId = $stateParams.parentviewid;
                                 appTranslation.load([appTranslation.cit]);
                             }],
-                        template: '<vat-report-view report-id="reportId" template-id="templateId" template-name="templateName" template-code="templateCode" \
-init-row="initRow" init-col="initCol" service-type="\'6\'" show-col="false" is-read-only="true" parent-view-id="parentViewId"></vat-report-view>',
+                        template: '<cit-report-view report-id="reportId" template-id="templateId" template-name="templateName" template-code="templateCode" service-type="\'6\'"></cit-report-view>',
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.cit),

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

@@ -212,9 +212,9 @@ debugger;
                 result[result.length - 1].items.forEach(function (t) { t.seqNo = result.length - 1 });
 
                 //数据校验
-                var reItem  = [];
-                reItem.push( new task(Math.ceil(Math.random()*1000000).toString(), "unstarted","上期导入调整表是否等于本期调整日记账发生额（摘要中包含“调表不调账”关键字）", "DA004"));
-                result.push({ name: $translate.instant('dataValidate'),isReportTask: true, items : reItem});
+                // var reItem  = [];
+                // reItem.push( new task(Math.ceil(Math.random()*1000000).toString(), "unstarted","上期导入调整表是否等于本期调整日记账发生额（摘要中包含“调表不调账”关键字）", "DA004"));
+                // result.push({ name: $translate.instant('dataValidate'),isReportTask: true, items : reItem});
 
                 fixedRef = [];
                 if (report && report.data && report.data.data) {
@@ -578,6 +578,7 @@ debugger;
             var tasks = JSON.parse(job.status);
             debugger;
             if(job.jobStatus == 'End'){
+                debugger;
               items.forEach(function(item,index){
                   debugger;
                   item.status = 'completed';
@@ -586,8 +587,8 @@ debugger;
 
                $scope.tasks[0].items[0].status = 'completed';
                $scope.tasks[0].items[0].text= $translate.instant('completed');
-               $scope.tasks[tasks.length-1].items[items.length-1].status = 'completed';
-               $scope.tasks[tasks.length-1].items[items.length-1].status.text = $translate.instant(_task.status);
+               // $scope.tasks[tasks.length-1].items[items.length-1].status = 'completed';
+               // $scope.tasks[tasks.length-1].items[items.length-1].status.text = $translate.instant(_task.status);
               if($scope.timer){
                 $interval.cancel($scope.timer);
                 vatCommonService.setProjectStatus(vatSessionService.project.id, vatSessionService.month, constant.ProjectStatusEnum.Generated

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

@@ -161,7 +161,7 @@
                         var firstSubNode = _.first(firstNode.children);
                         if(firstSubNode.id!==undefined) {
                             $scope.selectedTemplateId = firstSubNode.id;
-                            $state.go('vat.generateReport.reportView', {
+                            $state.go('cit.generateReport.reportView', {
                                 id: firstSubNode.reportId,
                                 templateid: firstSubNode.id,
                                 name: firstSubNode.name,

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

+commonModule.directive('citReportView', ['$log', 'enums',
+    function ($log, enums) {
+        'use strict';
+        $log.debug('citReportView.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: 'app/cit/report/cit-report-view/cit-report-view.html' + '?_=' + Math.random(),
+            scope: {
+                templateId: '=',
+                reportId: '=',
+                templateName:'=',
+                templateCode: '=',
+                isDocumentList: '=',
+                serviceType: '=',
+                initRow: '=?',
+                initCol: '=?',
+                instanceId: '='
+            },
+            controller: 'citReportViewController',
+            link: function ($scope, $ele, $attr) {
+                $ele.find("#tax-cell-detail").draggable({
+                    scroll: true,
+                    cancel: '#dataSourceGrid,.hand-input-container,.add-voucher-range-propover,.add-invoice,.tab-type,.dx-texteditor-input,input,.btn'
+                });
+
+                var saveFunc = $scope.$on('saveReportSheet', function (event, args) {
+                    $scope.saveReportCache();
+                });
+
+                $scope.$on('$destroy', function () {
+                    saveFunc();
+                });
+            }
+        };
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.less

+@import "~/app-resources/less/theme.less";
+
+@color-red:#e20;
+@color-gray:#939598-#222;
+
+.cit-report-view {
+    height: calc(~"100% - 20px");
+    min-height: 500px;
+    margin: 10px 10px 10px 20px;
+    .report-container {
+        border: @thin-border solid @color-border;
+        height:  calc(~"100% - 36px");
+        margin: 0;
+        width: 100%;
+        white-space: normal;
+        display: inline-block;
+    }
+
+    .row {
+        margin-left: 0px;
+        margin-bottom:10px;
+
+        &>span {
+            float: right;
+            margin-right: 15px;
+            cursor: pointer;
+        }
+    }
+
+    #addCertificatePop {
+        .modal-dialog {
+            width: 700px;
+            .add-certificate-pop-body {
+                height: 240px;
+                #add-certificate-grid {
+                    height: 210px;
+                }
+            }
+
+            .modal-footer {
+                .template-1-button {
+                    background-color: @color-red;
+                    color: white;
+                    margin-right:30px;
+                }
+
+                .template-2-button {
+                    background-color: @color-gray;
+                    color: white;
+                    margin-right: 30px;
+                }
+            }
+        }
+    }
+}
+
+.model-report-approve-popup {
+     width: 400px;
+     height:500px;
+     position:fixed;
+     top:25%;
+     left:40%;
+
+     .modal-dialog {
+        width: 100%;
+        height: 90%;
+        margin: 20px auto;
+
+        .modal-content {
+            width: 100%;       
+            .modal-body {
+                height: 90%;
+            }
+        }
+    }
+}
+
+
+.model-report-remarks-popup {
+     width: 400px;
+     height:500px;
+     position:fixed;
+     top:25%;
+     left:40%;
+
+     .modal-dialog {
+        width: 100%;
+        height: 90%;
+        margin: 20px auto;
+
+        .modal-content {
+            width: 100%;       
+            .modal-body {
+                height: 90%;
+            }
+        }
+    }
+}
+

atms-web/src/main/webapp/app/dataImport/data-import-layout/data-import-layout.js

@@ -5,7 +5,7 @@
         console.log('dataImpLayoutctor');
         return {
             restrict: 'E',
-            templateUrl: '/app/dataImport/data-import-layout/data-import-layout..html' + '?_=' + Math.random(),
+            templateUrl: '/app/dataImport/data-import-layout/data-import-layout.html' + '?_=' + Math.random(),
             replace: true,
             scope: {
             },