Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

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

@@ -185,6 +185,7 @@ public class TemplateController extends BaseController {
                                @RequestParam(name = "projectId") String projectId,
                                HttpServletResponse response) throws URISyntaxException {
 
+        period = 0;
         String filePath;
         File templateFile;
         InputStream inputStream = null;

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

@@ -273,6 +273,9 @@
                     break;
                 case enums.formulaDataSourceType.InvoiceFilter:
                     break;
+                case enums.formulaDataSourceType.CIT_TBAM:
+                    obj.relSql = sourceData.relSql;
+
             }
 
             if (sourceData.type === 0 && sourceData.dataSourceType === enums.cellDataSourceType.RelatedModel) {