[Bugfix] fixed select period report mapper

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodReportMapper.java

@@ -126,8 +126,8 @@ public interface PeriodReportMapper extends MyVatMapper {
             "  PERIOD_REPORT r  " +
             "  LEFT JOIN PERIOD_TEMPLATE pt ON r.TEMPLATE_ID = pt.TEMPLATE_ID  " +
             "WHERE  " +
-            "  r.PROJECT_ID = '1'  " +
-            "  AND r.PERIOD = 10  " +
+            "  r.PROJECT_ID = #{projectId}  " +
+            "  AND r.PERIOD = #{period}  " +
             "ORDER BY  " +
             "  pt.ORDER_INDEX" +
             "")

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

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

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

@@ -164,7 +164,7 @@
                         <table class="table">
                             <caption>审核意见</caption>
                             <tr>
-                                <td><textarea rows="3" class="form-control" ng-model="voucherComments">{{approvalComment}}</textarea>
+                                <td><textarea rows="3" class="form-control" ng-model="comment">{{comment}}</textarea>
                                 </td>
                             </tr>
                             <tr>

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

@@ -22,7 +22,7 @@
         },
 
         checkTask:function(taskId,decide,comment){
-            return $http.put('/approval/check/'+taskId+'?decide='+decide+'&comment='+comment);
+            return $http.put('/approval/check/'+taskId+'?decide='+decide+'&comment='+comment, {}, apiConfig.createVat());
         }
     };
 }]);
\ No newline at end of file