fixed static cell has no value issue

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ManualDataSourceDto.java

@@ -15,4 +15,5 @@ public class ManualDataSourceDto {
     BigDecimal amount;
     String projectId;
     String serviceTypeId;
+    Integer period;
 }

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

@@ -259,9 +259,9 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                                 String colStr = mm.group();
                                 int colNum = FormulaHelper.excelColStrToNum(colStr, colStr.length());
                                 int rowNum = Integer.parseInt(StringUtils.removeStart(findStr, colStr));
-                                Row row = sheet.getRow(rowNum);
+                                Row row = sheet.getRow(rowNum-1);
                                 if (row != null) {
-                                    Cell cell = row.getCell(colNum);
+                                    Cell cell = row.getCell(colNum-1);
                                     if (cell != null) {
                                         //开始取值然后存放到DataSource
                                         DataSource dataSource = new DataSource();

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

@@ -593,6 +593,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
             dataSourceModel.setUpdateTime(new Date());
             dataSourceModel.setCreateBy("admin");
             dataSourceModel.setUpdateBy("admin");
+            dataSourceModel.setPeriod(data.getPeriod());
 
             CellDataSource cellDataSource = new CellDataSource();
             cellDataSource.setId(distributedIDService.nextId());

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

@@ -1426,6 +1426,7 @@
             $scope.handInputModel.description = $scope.taxCellDetail.inputMemo;
             $scope.handInputModel.projectID = vatSessionService.project.id;
             $scope.handInputModel.serviceTypeID = vatSessionService.project.serviceTypeID;
+            $scope.handInputModel.period = vatSessionService.month;
 
             if ($scope.handInputModel.amount || $scope.handInputModel.name) {
                 //日志对象

atms-web/src/main/webapp/bundles/common.js

@@ -34885,6 +34885,7 @@ commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$lo
             $scope.handInputModel.description = $scope.taxCellDetail.inputMemo;
             $scope.handInputModel.projectID = vatSessionService.project.id;
             $scope.handInputModel.serviceTypeID = vatSessionService.project.serviceTypeID;
+            $scope.handInputModel.period = vatSessionService.month;
 
             if ($scope.handInputModel.amount || $scope.handInputModel.name) {
                 //日志对象