[BugFixe] fixed period report join tempate

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

@@ -127,7 +127,9 @@ public interface PeriodReportMapper extends MyVatMapper {
             "  LEFT JOIN PERIOD_TEMPLATE pt ON r.TEMPLATE_ID = pt.TEMPLATE_ID  " +
             "WHERE  " +
             "  r.PROJECT_ID = #{projectId}  " +
-            "  AND r.PERIOD = #{period}  " +
+            "  AND r.PERIOD = #{period}" +
+            "  AND pt.PROJECT_ID = r.PROJECT_ID " +
+            "  AND pt.PERIOD = r.PERIOD  " +
             "ORDER BY  " +
             "  pt.ORDER_INDEX" +
             "")

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

@@ -18,7 +18,7 @@
             //房地产
             //projectID = '0cf0945f-d41c-4df3-8235-ae693d5e724d';
             $q.all([
-                templateGroupService.getGroupTemplateByGroupID(48372654336679936, projectID),
+                templateGroupService.getGroupTemplateByGroupID(vatSessionService.project.templateGroupID, projectID),
                 vatReportService.getFilterTemplate(vatSessionService.project.id, constant.serviceType.VAT, vatSessionService.month)
             ]).then(function (result) {
                 if (!_.isEmpty(result[0]) && !_.isEmpty(result[0].data) && !_.isEmpty(result[0].data.data)