Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock

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

@@ -310,7 +310,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
             Workbook workbook = WorkbookFactory.create(inputStream);
             List<Template> filePathList = Lists.newArrayList();
             Date now = new Date();
-            for (int i = 0; i <= workbook.getNumberOfSheets(); i++) {
+            for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
                 String sheetName = workbook.getSheetName(i);
                 String newName = sheetName + CommonUtils.getUUID() + POIUtil.getFileSuffix(fileName).get();
                 Sheet sheet = workbook.getSheetAt(i);
@@ -338,7 +338,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 templateMapper.insertSelective(template);
                 List<CellTemplate> cellTemplateList = Lists.newArrayList();
                 List<CellTemplateConfig> cellTemplateConfigList = Lists.newArrayList();
-                for (int r = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
+                for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                     Row row = sheet.getRow(r);
                     for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
                         Cell cell = row.getCell(c);

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/DataSourceExtendsMapper.xml

@@ -251,7 +251,7 @@
         SELECT
         CDS.CELL_DATA_ID,
         DS.ID,
-        DS.T_Y_P_E,
+        DS.TYPE,
         DS.NAME,
         DS.AMOUNT,
         DS.DESCRIPTION,

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml

@@ -279,7 +279,7 @@
         SELECT
         CDS.CELL_DATA_ID,
         DS.ID,
-        DS.T_Y_P_E,
+        DS.TYPE,
         DS.NAME,
         DS.AMOUNT,
         DS.DESCRIPTION,