Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/pom.xml

@@ -16,9 +16,9 @@
     <dependencies>
         <!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 -->
         <!--<dependency>-->
-            <!--<groupId>com.oracle</groupId>-->
-            <!--<artifactId>ojdbc</artifactId>-->
-            <!--<version>0.0.1</version>-->
+        <!--<groupId>com.oracle</groupId>-->
+        <!--<artifactId>ojdbc</artifactId>-->
+        <!--<version>0.0.1</version>-->
         <!--</dependency>-->
         <!--<dependency>
             <groupId>com.oracle</groupId>
@@ -74,17 +74,18 @@
             <version>4.2.3.RELEASE</version>
         </dependency>
 
+
         <!--去除swagger-->
-       <!-- <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.8.0</version>
-        </dependency>-->
+        <!-- <dependency>
+             <groupId>io.springfox</groupId>
+             <artifactId>springfox-swagger2</artifactId>
+             <version>2.8.0</version>
+         </dependency>
+         <dependency>
+             <groupId>io.springfox</groupId>
+             <artifactId>springfox-swagger-ui</artifactId>
+             <version>2.8.0</version>
+         </dependency>-->
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -442,7 +443,7 @@
     <profiles>
         <profile>
             <id>dev</id>
-			  <activation>
+            <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <build>
@@ -454,8 +455,8 @@
                 <env>dev</env>
             </properties>
         </profile>
-        
-        
+
+
         <profile>
             <id>staging</id>
             <build>
@@ -522,13 +523,13 @@
                 <targetPath>${basedir}/target/classes/userTemplate</targetPath>
             </resource>
             <resource>
-            <directory>src/main/resources/vat_excel_template</directory>
-            <includes>
-                <include>**/*.xls</include>
-                <include>**/*.xlsx</include>
-            </includes>
-            <targetPath>${basedir}/target/classes/vat_excel_template</targetPath>
-        </resource>
+                <directory>src/main/resources/vat_excel_template</directory>
+                <includes>
+                    <include>**/*.xls</include>
+                    <include>**/*.xlsx</include>
+                </includes>
+                <targetPath>${basedir}/target/classes/vat_excel_template</targetPath>
+            </resource>
             <resource>
                 <directory>src/main/resources/cit_excel_template</directory>
                 <includes>
@@ -553,6 +554,14 @@
                 </includes>
                 <targetPath>${basedir}/target/classes/user_excel_template</targetPath>
             </resource>
+            <resource>
+                <directory>src/main/resources/analysis_excel_init</directory>
+                <includes>
+                    <include>**/*.xls</include>
+                    <include>**/*.xlsx</include>
+                </includes>
+                <targetPath>${basedir}/target/classes/analysis_excel_init</targetPath>
+            </resource>
         </resources>
         <plugins>
             <plugin>

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

@@ -1649,7 +1649,6 @@ public class ReportServiceImpl extends BaseService {
                     }
                 }
             });
-            modifiedReportCellList = null;
             dataDto.setCellData(cellDataDtoList);
             //将cellData复制给静态变量
             resultDto.setData(dataDto);
@@ -1658,7 +1657,6 @@ public class ReportServiceImpl extends BaseService {
             logger.error(ex.getMessage(), ex);
             resultDto.setResult(false);
         }
-        System.gc();
         return resultDto;
     }
 

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

@@ -209,6 +209,12 @@
         </foreach>
         AND ct.period = #{period,jdbcType=INTEGER}
         AND ct.project_id = #{projectId,jdbcType=VARCHAR}
+        and config.report_template_id IN
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item}
+        </foreach>
+        AND config.period = #{period,jdbcType=INTEGER}
+        AND config.project_id = #{projectId,jdbcType=VARCHAR}
     </select>
 
     <select id="getConfigWithReportTemplateId" resultType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig">