#

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

@@ -177,6 +177,7 @@ public class FormulaAgent {
     public static String _buildSql(String getField, String tableName, String filter, String filterValue, Integer period, FormulaContext formulaContext, String year, boolean bool, boolean getSql) throws Exception {
         String sql = "";
         if(getSql){
+            tableName = tableName.toLowerCase();
             sql = "select  *  from " + tableName + " where 1=1  and " + filter + filterValue;
             return  sql;
         }else{

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

@@ -60,7 +60,7 @@ public class ReportServiceImpl extends BaseService {
     private final static Logger logger = LoggerFactory.getLogger(ReportServiceImpl.class);
     private BlockingQueue<PeriodJob> queue = new LinkedBlockingQueue<>();
     private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "PC", "JXFPMX",
-            "JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME","WPTYPE", "SUM2", "RSUMIF", "TABLESUMIF", "SUM"};
+            "JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME","WPTYPE", "SUM2", "RSUMIF", "SUM"};
 
     @Autowired
     private ReportGeneratorImpl reportGenerator;

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

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

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

@@ -274,7 +274,7 @@
                 case enums.formulaDataSourceType.InvoiceFilter:
                     break;
                 case enums.formulaDataSourceType.CIT_TBAM:
-                    obj.relSql = sourceData.relSql;
+                    obj.relSql = sourceData.rel_sql;
 
             }
 

atms-web/src/main/webapp/app/common/webservices/cellComment.svc.js

@@ -12,7 +12,7 @@ webservices.factory('cellCommentService', ['$http', 'apiConfig', function ($http
             return $http.post('/CellComment/Delete/' + commentId, {}, apiConfig.createVat());
         },
         getCellInformation: function(data){
-            return $http.get('/CellComment/getCellInformation?sql=' + data.relSql, apiConfig.vat());
+            return $http.get('/CellComment/getCellInformation?sql=' + data.relSql, apiConfig.createVat());
         }
     };
 }]);
\ No newline at end of file