1、fixbug

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

@@ -226,7 +226,7 @@ public class DataImportService extends BaseService {
                 Sheet sheet = workbook.getSheetAt(i);
                 if (isSheetEmpty(sheet)) continue;
                 List<ProfitLossStatement> pls = Lists.newArrayList();
-                String companyCode = sheet.getRow(5).getCell(1).getStringCellValue();
+                String companyCode = getCellStringValue(sheet.getRow(5).getCell(1));
                 OrganizationExample example = new OrganizationExample();
                 example.createCriteria().andCodeEqualTo(companyCode);
                 List<Organization> organizations = organizationMapper.selectByExample(example);
@@ -325,7 +325,7 @@ public class DataImportService extends BaseService {
                     if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
                         ProfitLossStatementExample profitLossStatementExample = new ProfitLossStatementExample();
                         profitLossStatementExample.createCriteria().andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period);
-                        profitLossStatementMapper.deleteByExample(profitLossStatementExample);
+                        profitLossStatementManualMapper.deleteByExample(profitLossStatementExample);
                         if (profitLossStatementFinalMapper.countByExample(profitLossStatementExample) > 0) {
                             profitLossStatementFinalMapper.deleteByExample(profitLossStatementExample);
                         }
@@ -1560,7 +1560,8 @@ public class DataImportService extends BaseService {
         if (cell.getCellTypeEnum().equals(CellType.STRING)) {
             return cell.getStringCellValue();
         } else if(cell.getCellTypeEnum().equals(CellType.NUMERIC)) {
-            return String.valueOf(cell.getNumericCellValue());
+            // 取整
+            return String.valueOf((int)cell.getNumericCellValue());
         }
         logger.warn("获取单元格数据类型未匹配");
         return null;

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

@@ -111,4 +111,5 @@ public interface AdjustmentTableMapper extends MyVatMapper {
     int insertBatch(List<AdjustmentTable> rlits);
 
     List<AdjustmentTable> selectBeforeAdjustData(Map<String,Object> map1);
+
 }
\ No newline at end of file

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

@@ -113,4 +113,5 @@ public interface CashFlowMapper extends MyVatMapper {
     Integer selectCountByCondition(@Param("cfCondition") CashFlowCondition condition);
 
     int insertBatch(List<CashFlow> cfs);
+
 }
\ No newline at end of file

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

@@ -124,6 +124,10 @@
           <when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
           <otherwise>CURRENT_TIMESTAMP,</otherwise>
         </choose>
+        <choose>
+          <when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
       </trim>
     </foreach>;
     SELECT 1 FROM DUAL;

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

@@ -57,6 +57,10 @@
           <when test="item.organizationId != null">#{item.organizationId,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
         <choose>
           <when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
           <otherwise>CURRENT_TIMESTAMP,</otherwise>

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

@@ -50,6 +50,14 @@
           <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.fillInDate != null">#{item.fillInDate,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.subjectNum != null">#{item.subjectNum,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
@@ -62,10 +70,6 @@
           <when test="item.redLetterInvoiceInfoTableNum != null">#{item.redLetterInvoiceInfoTableNum,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
-        <choose>
-          <when test="item.fillInDate != null">#{item.fillInDate,jdbcType=TIMESTAMP},</when>
-          <otherwise>CURRENT_TIMESTAMP,</otherwise>
-        </choose>
         <choose>
           <when test="item.salesTaxNumber != null">#{item.salesTaxNumber,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html

@@ -56,15 +56,12 @@
                     <button type="button" atms-permission permission-control-type="ngIf"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="AddImportBtn"
-                            ng-click="doUploadPL(importEnum.AddImport)"></button>
+                            ng-click="doUploadAT(importEnum.AddImport)"></button>
 
                     <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
                             class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
                             translate="CoverImportBtn"
-                            ng-click="doUploadPL(importEnum.CoverImport)"></button>
-
-
-
+                            ng-click="doUploadAT(importEnum.CoverImport)"></button>
                     <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
                         <button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
                                  permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"