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

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

@@ -65,7 +65,7 @@ public class ApprovalController {
     }
 
     @ResponseBody
-    @RequestMapping(value = "/check/{taskId}")
+    @RequestMapping(value = "/check/{taskId}",method = RequestMethod.PUT)
     public void check(@PathVariable String taskId, @RequestParam String decide, @RequestParam String comment) {//only for manager role
         approvalService.checkTask(taskId, decide,comment);
     }

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -2566,11 +2566,15 @@
          }
 
          $scope.rejectApproval =function(){
-              $("#ApprovalComment").modal('hide');
+               vatApproveService.checkTask(vatSessionService.approveInfo.instanceId,'disagreed',$scope.comment).success(function(){
+                   $("#ApprovalComment").modal('hide');
+               });
          }
 
          $scope.agreeApproval =function(){
-              $("#ApprovalComment").modal('hide');
+               vatApproveService.checkTask(vatSessionService.approveInfo.instanceId,'agreed',$scope.comment).success(function(){
+                   $("#ApprovalComment").modal('hide');
+               });
           }
 
         //排序

atms-web/src/main/webapp/app/common/vatservices/vatApproveService.js

@@ -21,112 +21,8 @@
             return $http.get('/approval/templateInfo/'+templateId, apiConfig.createVat());
         },
 
-        getExportOutputInvoiceList: function (param) {
-            return $http.post('/outputInvoiceImport/getExportOutputInvoiceList', {
-                PageInfo: param.pageInfo,
-                PeriodStart: param.periodStart,
-                PeriodEnd: param.periodEnd,
-                InvoiceType: param.invoiceType,
-                StartInvoiceDate: param.invoiceDateStart,
-                EndInvoiceDate: param.invoiceDateEnd,
-                ClassCode: param.classCode,
-                InvoiceNumber: param.invoiceNumber,
-                BuyerName: param.buyerName,
-                ProductName: param.productName,
-                AmountStart: param.amountStart,
-                AmountEnd: param.amountEnd,
-                TaxAmountStart: param.taxAmountStart,
-                TaxAmountEnd: param.taxAmountEnd,
-            }, apiConfig.createVat({ responseType: 'arraybuffer' }));
-        },
-
-
-        queryInputInvoiceList: function (param) {
-            return $http.post('/inputInvoiceImport/inputInvoicePreviewList', {
-                PageInfo: param.pageInfo,
-                PeriodStart: param.periodStart,
-                PeriodEnd: param.periodEnd,
-                CertificationDateStart: param.certificationDateStart,
-                CertificationDateEnd: param.certificationDateEnd,
-                InvoiceCode: param.invoiceCode,
-                InvoiceNumber: param.invoiceNumber,
-                SellerTaxNumber: param.sellerTaxNumber,
-                AmountStart: param.amountStart,
-                AmountEnd: param.amountEnd,
-                InvoiceType: param.invoiceType,
-                TaxAmountStart: param.taxAmountStart,
-                TaxAmountEnd: param.taxAmountEnd,
-                CertificationStatus: param.certificationStatus
-            }, apiConfig.createVat());
-        },
-
-        queryInputInvoiceItemList: function (inputInvoiceID) {
-            return $http.get('/inputInvoiceImport/inputInvoiceItemPreviewList/' + inputInvoiceID, apiConfig.createVat());
-        },
-
-        //导出进项发票数据
-        getExportInputInvoiceList: function (param) {
-            return $http.post('/inputInvoiceImport/exportQueryData/get', {
-                PageInfo: param.pageInfo,
-                PeriodStart: param.periodStart,
-                PeriodEnd: param.periodEnd,
-                CertificationDateStart: param.certificationDateStart,
-                CertificationDateEnd: param.certificationDateEnd,
-                InvoiceCode: param.invoiceCode,
-                InvoiceNumber: param.invoiceNumber,
-                SellerTaxNumber: param.sellerTaxNumber,
-                AmountStart: param.amountStart,
-                AmountEnd: param.amountEnd,
-                InvoiceType: param.invoiceType,
-                TaxAmountStart: param.taxAmountStart,
-                TaxAmountEnd: param.taxAmountEnd,
-                CertificationStatus: param.certificationStatus
-            }, apiConfig.createVat({ responseType: 'arraybuffer' }));
-        },
- 
-        voucherSelectAdvancedByEntry: function (mainRelation, allJe, pagingInfo, listQueryCondition) {
-            return $http.post('/voucher/voucherSelectAdvancedByEntry', {
-                MainRelation: mainRelation,
-                AllJe: allJe,
-                PagingInfo: pagingInfo,
-                ListQueryCondition: listQueryCondition
-            }, apiConfig.create());
-        },
-        voucherSelectAdvancedByVoucher: function (mainRelation, allJe, pagingInfo, listQueryCondition) {
-            return $http.post('/voucher/voucherSelectAdvancedByVoucher', {
-                MainRelation: mainRelation,
-                AllJe: allJe,
-                PagingInfo: pagingInfo,
-                ListQueryCondition: listQueryCondition
-            }, apiConfig.create());
-        },
-        voucherSelectAdvancedCount: function (mainRelation, isEntryShow, allJe, listQueryCondition) {
-            return $http.post('/voucher/voucherSelectAdvancedCount', {
-                MainRelation: mainRelation,
-                AllJe: allJe,
-                IsEntryShow: isEntryShow,
-                ListQueryCondition: listQueryCondition
-            }, apiConfig.create());
-        },
-        getVoucherByConditon: function (mainRelation, allJe, period, vID, group, listQueryCondition) {
-            return $http.post('/voucher/getVoucherByConditon', {
-                MainRelation: mainRelation,
-                AllJe: allJe,
-                Period: period,
-                VID: vID,
-                Group: group,
-                ListQueryCondition: listQueryCondition
-            }, apiConfig.create());
-        },
-        getSelectWhereString: function (mainRelation, allJe, listQueryCondition) {
-            return $http.post('/voucher/getSelectWhereString', {
-                MainRelation: mainRelation,
-                AllJe: allJe,
-                ListQueryCondition: listQueryCondition
-            }, apiConfig.create());
-        },
-        getEnterpriseAccount: function () {
-            return $http.get('/voucher/getEnterpriseAccount', apiConfig.create());
+        checkTask:function(taskId,decide,comment){
+            return $http.put('/approval/check/'+taskId+'?decide='+decide+'&comment='+comment);
         }
     };
 }]);
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-approve/app-approve.ctrl.js

@@ -602,12 +602,14 @@
          $scope.goToService = function (approvalInfo) {
               projectService.getProjectByID(approvalInfo.projectId).success(
               function(result){
-                vatSessionService.project = result;
-                vatSessionService.project.projectName = approvalInfo.projectName;
-                vatSessionService.project.month = approvalInfo.period;
-                vatSessionService.month = approvalInfo.period;
                 vatApproveService.getApprovalTemplateInfo(approvalInfo.templateIds.split(",")[0]).success(
                 function(template){
+                    vatSessionService.project = result;
+                    vatSessionService.project.projectName = approvalInfo.projectName;
+                    vatSessionService.project.month = approvalInfo.period;
+                    vatSessionService.month = approvalInfo.period;
+                    vatSessionService.approvalInfo=approvalInfo;
+
                     $state.go('vat.generateReport.reportView', {
                             id: approvalInfo.reportIds.split(",")[0],
                             templateid: template.id,