#

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java

@@ -61,7 +61,6 @@ public class AnalysisJob extends QuartzJobBean {
         logger.info(String.format("开始分析%税种税金计算数据",period));
         analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
 
-
     }
 
 }

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

@@ -1608,7 +1608,7 @@ public class ReportServiceImpl extends BaseService {
                 ebitDataDto.setEbitRate(ebitRate + "%");
             }
             ebitDataDto.setSixAddTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(0.06)));
-            ebitDataDto.setTotalAmountTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(0.16)));
+            ebitDataDto.setTotalAmountTax(ebitDataDto.getTransactionAmount().multiply(new BigDecimal(1.06)));
             ebitDataDto.setSpecialConsiderations(specialConsiderations);
         } catch (Exception e) {
             e.printStackTrace();

atms-api/src/main/resources/applicationContext-job.xml

@@ -13,10 +13,12 @@
         <property name="queueCapacity" value="100"/>
     </bean>
 
+
+
     <bean name="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
         <property name="dataSource" ref="dataSource"/>
     </bean>
-
+    <!-- quartzScheduler -->
     <!-- 配置调度任务-->
     <bean name="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
         <property name="configLocation" value="classpath:job.properties"/>
@@ -49,45 +51,55 @@
         <property name="taskExecutor" ref="executor"/>
     </bean>
 
-    <!-- 配置Job详情 -->
+
+
+
+    <!-- lgGlBalanceJob -->
     <bean name="lgGlBalanceJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
         <property name="jobClass" value="pwc.taxtech.atms.common.schedule.LgGlBalanceJob"/>
         <property name="durability" value="true"/>
         <property name="requestsRecovery" value="false"/>
         <property name="description" value="科目余额数据同步"/>
     </bean>
-
     <!-- 定时任务 -->
     <bean id="lgApiJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
         <property name="jobDetail" ref="lgGlBalanceJob"/>
         <property name="cronExpression" value="0 0 1 3 * ?"/>
     </bean>
 
+
+
+
+
+    <!--orgSyncJob-->
     <bean name="orgSyncJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
         <property name="jobClass" value="pwc.taxtech.atms.common.schedule.OrgSyncJob"/>
         <property name="durability" value="true"/>
         <property name="requestsRecovery" value="false"/>
         <property name="description" value="机构信息同步"/>
     </bean>
+    <!-- 每月1日执行一次-->
+    <bean id="orgSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+        <property name="jobDetail" ref="orgSyncJob"/>
+        <property name="cronExpression" value="0 0 0 1 * ?"/>
+    </bean>
+
+
 
+
+    <!--analysisJob-->
     <bean name="analysisJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
         <property name="jobClass" value="pwc.taxtech.atms.common.schedule.AnalysisJob"/>
         <property name="durability" value="true"/>
         <property name="requestsRecovery" value="false"/>
         <property name="description" value="分析模块"/>
     </bean>
-
-    <!-- 每月1日执行一次-->
-    <bean id="orgSyncJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-        <property name="jobDetail" ref="orgSyncJob"/>
-        <property name="cronExpression" value="0 0 0 1 * ?"/>
-    </bean>
-
     <!-- 每天凌晨一点执行一次-->
     <bean id="analysisJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
         <property name="jobDetail" ref="analysisJob"/>
         <property name="cronExpression" value="0 0 1 * * ?"/>
     </bean>
 
+
     <!-- 分布式事务配置 end -->
 </beans>
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisFileManagementMapper.java

 package pwc.taxtech.atms.analysis.dao;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+
+import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyAnalysisMapper;
 import pwc.taxtech.atms.analysis.entity.AnalysisFileManagement;
@@ -105,4 +105,6 @@ public interface AnalysisFileManagementMapper extends MyAnalysisMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(AnalysisFileManagement record);
+    @Select("#{sql}")
+    List<AnalysisFileManagement> getYHSsql(@Param("sql") String sql );
 }
\ No newline at end of file

atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js

@@ -3117,7 +3117,6 @@
             var glfy = nullToZero(sheet.getValue(15, 2));//管理费用
             var yffy = nullToZero(sheet.getValue(16, 2));//研发费用
             var zcjzss = nullToZero(sheet.getValue(18, 2));//资产减值损失
-
             var ts = nullToZero(sheet.getValue(38, 2));
             var rate = 1;
             if(sheet.getValue(40, 2) != null){