[DEV] fixe get template by id not user period template

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.common.util.MyAsserts;
 import pwc.taxtech.atms.dto.approval.ApprovalDto;
 import pwc.taxtech.atms.dto.approval.ApprovalTask;
+import pwc.taxtech.atms.entity.Template;
 import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.vat.dpo.ApprovalTaskInfo;
 import pwc.taxtech.atms.vat.entity.PeriodTemplate;
@@ -59,7 +60,7 @@ public class ApprovalController {
 
     @ResponseBody
     @RequestMapping(value = "/templateInfo/{templateId}")
-    public PeriodTemplate getFirstTemplate(@PathVariable Long templateId) {//accountant manager
+    public Template getFirstTemplate(@PathVariable Long templateId) {//accountant manager
         return approvalService.getTemplateInfo(templateId);
     }
 

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

@@ -13,7 +13,9 @@ import org.springframework.transaction.annotation.Transactional;
 import pwc.taxtech.atms.common.AuthUserHelper;
 import pwc.taxtech.atms.common.util.MyAsserts;
 import pwc.taxtech.atms.constant.Constant;
+import pwc.taxtech.atms.dao.TemplateMapper;
 import pwc.taxtech.atms.dto.approval.ApprovalDto;
+import pwc.taxtech.atms.entity.Template;
 import pwc.taxtech.atms.exception.BadParameterException;
 import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.vat.dao.PeriodApproveMapper;
@@ -40,7 +42,7 @@ public class ApprovalService {
     @Autowired
     AuthUserHelper authUserHelper;
     @Autowired
-    PeriodTemplateMapper periodTemplateMapper;
+    TemplateMapper templateMapper;
 
 
     @Transactional
@@ -154,7 +156,7 @@ public class ApprovalService {
 
     }
 
-    public PeriodTemplate getTemplateInfo(Long templateId) {
-       return periodTemplateMapper.selectByPrimaryKey(templateId);
+    public Template getTemplateInfo(Long templateId) {
+       return templateMapper.selectByPrimaryKey(templateId);
     }
 }

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

@@ -600,18 +600,20 @@
         };
 
          $scope.goToService = function (approvalInfo) {
-              projectService.getProjectByID(approvalInfo.projectId).success(function(result){
+              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(result){
-                    $state.go('vat.generateReport.reportView',{
+                vatApproveService.getApprovalTemplateInfo(approvalInfo.templateIds.split(",")[0]).success(
+                function(template){
+                    $state.go('vat.generateReport.reportView', {
                             id: approvalInfo.reportIds.split(",")[0],
-                            templateid: result.templateId,
-                            name: result.name,
-                            templatecode: result.code
+                            templateid: template.templateId,
+                            name: template.name,
+                            templatecode: template.code
                         });
                    });
                 });

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

 vatModule.controller('VatLayoutController', ['$scope', '$rootScope', '$q', '$log', '$timeout', '$state', '$translate', 'projectService', 'SweetAlert', 'loginContext'
-    , 'vatSessionService', 'vatCommonService', 'vatWorkflowService', 'application', 'enums', '$uibModal','  ',
+    , 'vatSessionService', 'vatCommonService', 'vatWorkflowService', 'application', 'enums', '$uibModal','vatApproveService',
 function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectService, SweetAlert, loginContext
-    , vatSessionService, vatCommonService, vatWorkflowService, application, enums, $uibModal,   ) {
+    , vatSessionService, vatCommonService, vatWorkflowService, application, enums, $uibModal,  vatApproveService) {
     'use strict';
     $log.debug('VatLayoutController.ctor()...');
 
@@ -438,7 +438,7 @@ function ($scope, $rootScope, $q, $log, $timeout, $state, $translate, projectSer
        var approveParam={};
        approveParam.projectId = vatSessionService.project.id;
        approveParam.periodDate = vatSessionService.project.periodDate;
-         .commitNewApproval(approveParam);
+       vatApproveService.commitNewApproval(approveParam);
     }
 
     $scope.showProjectStatus = function () {