Merge branch 'dev_oracle_neo' into 'dev_oracle'

[dev] add projectid from tax payer report rule

See merge request root/atms!125

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

@@ -155,7 +155,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
 //            dataSourceMapper.clearDataSourceWithPeriod(period);
 //            dataSourceMapper.clearCellDataWithPeriod(strExceptTemplateIds, period);
 //            dataSourceMapper.clearReportWithPeriod(period);
-                dataSourceMapper.clearDataWithPeriod(strExceptTemplateIds, period);
+                dataSourceMapper.clearDataWithPeriod(strExceptTemplateIds, period, projectId);
                 // 根据templategroupid 把 template 插入到 periodTemplate
                 TemplateExample example = new TemplateExample();
                 example.createCriteria().andTemplateGroupIdEqualTo(templateGroupId);

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

@@ -119,7 +119,7 @@ public interface DataSourceMapper extends MyVatMapper {
 
     void clearTemplateWithPeriod(@Param("period") Integer period, @Param("exceptReportTemplateIDs") String exceptReportTemplateIDs);
 
-    void clearTaxPayerReportWithPeriod(@Param("period") Integer period);
+    void clearTaxPayerReportWithPeriod(@Param("period") Integer period, @Param("projectId") String projectId);
 
     void clearDataSourceWithPeriod(@Param("period") Integer period);
 
@@ -131,7 +131,8 @@ public interface DataSourceMapper extends MyVatMapper {
 
     void clearReportWithPeriod(Integer period);
 
-    void clearDataWithPeriod(@Param("exceptReportTemplateIDs") String exceptReportTemplateIDs, @Param("period") Integer period);
+    void clearDataWithPeriod(@Param("exceptReportTemplateIDs") String exceptReportTemplateIDs, @Param("period") Integer period,
+                             @Param("projectId") String projectId);
 
     List<DataSourceExtendDto> getFormulaDataSource(Long reportID);
 

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="pwc.taxtech.atms.vat.dao.PeriodTaxPayerReportRuleMapper">
+<mapper namespace="pwc.taxtech.atms.vat.dao.apper">
   <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.PeriodTaxPayerReportRule">
     <!--
       WARNING - @mbg.generated

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

@@ -59,7 +59,8 @@
         DELETE FROM
         PERIOD_TAX_PAYER_REPORT_RULE
         WHERE
-        PERIOD= #{period,jdbcType=INTEGER} ;
+        PERIOD= #{period,jdbcType=INTEGER}
+        AND PROJECT_ID= #{projectId,jdbcType=VARCHAR} ;
     </delete>
 
     <delete id="clearDataSourceWithPeriod">
@@ -155,7 +156,8 @@
         DELETE FROM
         PERIOD_TAX_PAYER_REPORT_RULE
         WHERE
-        PERIOD= #{period,jdbcType=INTEGER} ;
+        PERIOD= #{period,jdbcType=INTEGER}
+        AND PROJECT_ID= #{projectId,jdbcType=VARCHAR};
         DELETE
         D FROM
         DATA_SOURCE_DETAIL D
@@ -279,12 +281,14 @@
         <association property="cellData" javaType="pwc.taxtech.atms.vat.entity.CellData">
             <id column="CELL_DATA_ID" jdbcType="BIGINT" property="id"/>
             <result column="CELL_DATA_DATA" property="data" javaType="java.lang.String" jdbcType="VARCHAR"/>
-            <result column="CELL_DATA_TEMPLATE_ID" property="cellTemplateId" javaType="java.lang.Long" jdbcType="BIGINT"/>
+            <result column="CELL_DATA_TEMPLATE_ID" property="cellTemplateId" javaType="java.lang.Long"
+                    jdbcType="BIGINT"/>
             <result column="CELL_DATA_REPORT_ID" property="reportId" javaType="java.lang.Long" jdbcType="BIGINT"/>
         </association>
         <association property="cellDataSource" javaType="pwc.taxtech.atms.vat.entity.CellDataSource">
             <id column="CELL_DATA_SOURCE_ID" jdbcType="BIGINT" property="id"/>
-            <result column="CELL_DATA_SOURCE_OPERATION_TYPE" property="operationType" javaType="java.lang.Integer" jdbcType="INTEGER"/>
+            <result column="CELL_DATA_SOURCE_OPERATION_TYPE" property="operationType" javaType="java.lang.Integer"
+                    jdbcType="INTEGER"/>
         </association>
     </resultMap>