Skip to content

T
traffic-front
Commit fbc42d8b authored by chase's avatar chase
Browse files
Options

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

parents bf9b83cb e59e12bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 477 additions and 82 deletions
atms-api/pom.xml
View file @ fbc42d8b
......@@ -432,7 +432,7 @@
<profiles>
<profile>
<id>dev</id>
<activation>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
......@@ -444,6 +444,8 @@
<env>dev</env>
</properties>
</profile>
<profile>
<id>staging</id>
<build>
......
atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java
View file @ fbc42d8b
......@@ -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/constant/TemplateHeaderCheck.java
View file @ fbc42d8b
......@@ -21,7 +21,7 @@ public class TemplateHeaderCheck {
};
//职工人数
public static String[] zgrs = {
"公司简称", "正式员工", "实习生", "外包", "合计"
"公司名称", "正式员工", "实习生", "外包", "合计"
};
//司机人数
public static String[] sjrs = {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
View file @ fbc42d8b
......@@ -1244,33 +1244,35 @@ public class CitReportServiceImpl extends BaseService {
cellData.setFormulaExp(data.getAmount().toString());
}
cellData.setData(sumValue);
periodCellDataMapper.updateByPrimaryKeySelective(cellData);
cellData.setUpdateTime(new Date());
int i = periodCellDataMapper.updateByPrimaryKeySelective(cellData);
/*kevin insert */ // TODO: 3/21/2019 需要验证
// PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
// PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
// criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
// criteria.andProjectIdEqualTo(data.getProjectId());
// PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
// periodCellTemplateConfig.setParsedFormula(sumValue);
// periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
// //更改选中行相关数据
// CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
// citJournalEntryAdjust.setIsSelect("1");
// CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
// CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
// criteria1.andProjectIdEqualTo(data.getProjectId());
// criteria1.andSubjectCodeEqualTo(data.getAccountCode());
// citJournalEntryAdjustMapper.updateByExample(citJournalEntryAdjust, example1);
//
// JournalEntry journalEntry = new JournalEntry();
// journalEntry.setIsSelect("1");
// JournalEntryExample example2 = new JournalEntryExample();
// JournalEntryExample.Criteria criteria2 = example2.createCriteria();
// criteria2.andProjectIdEqualTo(data.getProjectId());
// criteria2.andSegment3EqualTo(data.getAccountCode());
// journalEntryMapper.updateByExample(journalEntry, example2);
if(sumValue !=null){
PeriodCellTemplateConfigExample example = new PeriodCellTemplateConfigExample();
PeriodCellTemplateConfigExample.Criteria criteria = example.createCriteria();
criteria.andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()));
criteria.andProjectIdEqualTo(data.getProjectId());
PeriodCellTemplateConfig periodCellTemplateConfig = new PeriodCellTemplateConfig();
periodCellTemplateConfig.setParsedFormula(sumValue);
periodCellTemplateConfigMapper.updateByExampleSelective(periodCellTemplateConfig, example);
//更改选中行相关数据
CitJournalEntryAdjust citJournalEntryAdjust = new CitJournalEntryAdjust();
citJournalEntryAdjust.setIsSelect("1");
CitJournalEntryAdjustExample example1 = new CitJournalEntryAdjustExample();
CitJournalEntryAdjustExample.Criteria criteria1 = example1.createCriteria();
criteria1.andProjectIdEqualTo(data.getProjectId());
criteria1.andSubjectCodeEqualTo(data.getAccountCode());
citJournalEntryAdjustMapper.updateByExampleSelective(citJournalEntryAdjust, example1);
JournalEntry journalEntry = new JournalEntry();
journalEntry.setIsSelect("1");
JournalEntryExample example2 = new JournalEntryExample();
JournalEntryExample.Criteria criteria2 = example2.createCriteria();
criteria2.andProjectIdEqualTo(data.getProjectId());
criteria2.andSegment3EqualTo(data.getAccountCode());
journalEntryMapper.updateByExampleSelective(journalEntry, example2);
}
}
List<DataSourceExtendDto> dataSourceExtendDtos = periodDataSourceMapper.getManualDataSource(data.getCellId());
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ fbc42d8b
......@@ -10,6 +10,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
......@@ -1613,7 +1614,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();
......@@ -2356,11 +2357,9 @@ public class ReportServiceImpl extends BaseService {
if (ebitCellDataMapper.selectByExample(example1).size() != 0) {
ebitCellDataMapper.deleteByExample(example1);
}
;
for (int j = 1; j <= sheet.getLastRowNum(); j++) {
if (j <= 36)
continue;
;
for (int k = 1; k < sheet.getRow(0).getLastCellNum(); k++) {
EbitCellData ebitCellData1 = new EbitCellData();
ebitCellData1.setId(idService.nextId());
......@@ -2444,7 +2443,10 @@ public class ReportServiceImpl extends BaseService {
default:
if (i == 0)
break;
sheetAt.getRow(m).getCell(i + 1).setCellValue(getCellStringValue(sheetAt1.getRow(m).getCell(2)));
Cell cell = sheetAt.getRow(m).getCell(i + 1);
cell.setCellValue(getCellStringValue(sheetAt1.getRow(m).getCell(2)));
cell.setCellFormula("B2 + C3");
//cell.setCellType(cellStyle.getAlignment());
}
}
}
......
atms-api/src/main/resources/applicationContext-job.xml
View file @ fbc42d8b
......@@ -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,52 @@
<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-api/src/test/java/pwc/taxtech/atms/service/impl/AnalysisTest.java
View file @ fbc42d8b
......@@ -10,7 +10,9 @@ import pwc.taxtech.atms.constant.enums.EnumTbImportType;
import pwc.taxtech.atms.entity.Organization;
import pwc.taxtech.atms.entity.OrganizationExample;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Auther: Gary J Li
......@@ -76,23 +78,24 @@ public class AnalysisTest extends CommonIT {
analysisJobService.analysisSales(orgs,period, EnumTbImportType.CoverImport.getCode());
}
@Test
public void analysisTaxReturnEnd(){
public void analysisTax(){
Integer period = DateUtils.getPeriodNow();
OrganizationExample e = new OrganizationExample();
//e.createCriteria().andIsActiveEqualTo(true);
List<Organization> orgs = organizationMapper.selectByExample(e);
logger.info(String.format("开始分析%s返还后税数据",period));
analysisJobService.analysisTaxReturnEnd(orgs,period, EnumTbImportType.CoverImport.getCode());
analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
}
@Test
public void analysisTax(){
public void analysisTaxReturnEnd(){
Integer period = DateUtils.getPeriodNow();
OrganizationExample e = new OrganizationExample();
//e.createCriteria().andIsActiveEqualTo(true);
List<Organization> orgs = organizationMapper.selectByExample(e);
logger.info(String.format("开始分析%s返还后税数据",period));
analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
analysisJobService.analysisTaxReturnEnd(orgs,period, EnumTbImportType.CoverImport.getCode());
}
}
atms-dao/etc/generator-mysql/analysisGeneratorConfig.xml
View file @ fbc42d8b
......@@ -41,11 +41,10 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
</javaClientGenerator>
<table tableName="analysis_tax_return_end" domainObjectName="AnalysisTaxReturnEnd">
<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<!--
<table tableName="analysis_actual_tax_return" domainObjectName="AnalysisInternationalTaxData">
<property name="useActualColumnNames" value="false"/>
......
atms-dao/etc/generator-mysql/generatorConfig.xml
View file @ fbc42d8b
......@@ -41,7 +41,7 @@
<property name="rootInterface" value="pwc.taxtech.atms.MyMapper"/>
</javaClientGenerator>
<table tableName="cit_asset_eam_mapping" domainObjectName="CitAssetEamMapping">
<table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisFileManagementMapper.java
View file @ fbc42d8b
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-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisExpectedTaxReturn.java
View file @ fbc42d8b
......@@ -37,7 +37,7 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
/**
* Database Column Remarks:
* 预期返还后增值税 预期返还后增值税_ 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
* 预期返还后税额 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_1
......@@ -68,6 +68,39 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
*/
private BigDecimal segment3;
/**
* Database Column Remarks:
* 预期返还后教育费附加
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
private BigDecimal segment4;
/**
* Database Column Remarks:
* 预期返还后城市教育费附加
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
private BigDecimal segment5;
/**
* Database Column Remarks:
* 预期返还后城建税
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
private BigDecimal segment6;
/**
* Database Column Remarks:
* 创建时间
......@@ -251,6 +284,78 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
this.segment3 = segment3;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_4
*
* @return the value of analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
public BigDecimal getSegment4() {
return segment4;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_4
*
* @param segment4 the value for analysis_expected_tax_return.segment_4
*
* @mbg.generated
*/
public void setSegment4(BigDecimal segment4) {
this.segment4 = segment4;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_5
*
* @return the value of analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
public BigDecimal getSegment5() {
return segment5;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_5
*
* @param segment5 the value for analysis_expected_tax_return.segment_5
*
* @mbg.generated
*/
public void setSegment5(BigDecimal segment5) {
this.segment5 = segment5;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.segment_6
*
* @return the value of analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
public BigDecimal getSegment6() {
return segment6;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column analysis_expected_tax_return.segment_6
*
* @param segment6 the value for analysis_expected_tax_return.segment_6
*
* @mbg.generated
*/
public void setSegment6(BigDecimal segment6) {
this.segment6 = segment6;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column analysis_expected_tax_return.create_time
......@@ -388,6 +493,9 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
sb.append(", segment1=").append(segment1);
sb.append(", segment2=").append(segment2);
sb.append(", segment3=").append(segment3);
sb.append(", segment4=").append(segment4);
sb.append(", segment5=").append(segment5);
sb.append(", segment6=").append(segment6);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", organizationId=").append(organizationId);
......
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisExpectedTaxReturnExample.java
View file @ fbc42d8b
......@@ -506,6 +506,186 @@ public class AnalysisExpectedTaxReturnExample {
return (Criteria) this;
}
public Criteria andSegment4IsNull() {
addCriterion("segment_4 is null");
return (Criteria) this;
}
public Criteria andSegment4IsNotNull() {
addCriterion("segment_4 is not null");
return (Criteria) this;
}
public Criteria andSegment4EqualTo(BigDecimal value) {
addCriterion("segment_4 =", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotEqualTo(BigDecimal value) {
addCriterion("segment_4 <>", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4GreaterThan(BigDecimal value) {
addCriterion("segment_4 >", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_4 >=", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4LessThan(BigDecimal value) {
addCriterion("segment_4 <", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_4 <=", value, "segment4");
return (Criteria) this;
}
public Criteria andSegment4In(List<BigDecimal> values) {
addCriterion("segment_4 in", values, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotIn(List<BigDecimal> values) {
addCriterion("segment_4 not in", values, "segment4");
return (Criteria) this;
}
public Criteria andSegment4Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_4 between", value1, value2, "segment4");
return (Criteria) this;
}
public Criteria andSegment4NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_4 not between", value1, value2, "segment4");
return (Criteria) this;
}
public Criteria andSegment5IsNull() {
addCriterion("segment_5 is null");
return (Criteria) this;
}
public Criteria andSegment5IsNotNull() {
addCriterion("segment_5 is not null");
return (Criteria) this;
}
public Criteria andSegment5EqualTo(BigDecimal value) {
addCriterion("segment_5 =", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotEqualTo(BigDecimal value) {
addCriterion("segment_5 <>", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5GreaterThan(BigDecimal value) {
addCriterion("segment_5 >", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_5 >=", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5LessThan(BigDecimal value) {
addCriterion("segment_5 <", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_5 <=", value, "segment5");
return (Criteria) this;
}
public Criteria andSegment5In(List<BigDecimal> values) {
addCriterion("segment_5 in", values, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotIn(List<BigDecimal> values) {
addCriterion("segment_5 not in", values, "segment5");
return (Criteria) this;
}
public Criteria andSegment5Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_5 between", value1, value2, "segment5");
return (Criteria) this;
}
public Criteria andSegment5NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_5 not between", value1, value2, "segment5");
return (Criteria) this;
}
public Criteria andSegment6IsNull() {
addCriterion("segment_6 is null");
return (Criteria) this;
}
public Criteria andSegment6IsNotNull() {
addCriterion("segment_6 is not null");
return (Criteria) this;
}
public Criteria andSegment6EqualTo(BigDecimal value) {
addCriterion("segment_6 =", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotEqualTo(BigDecimal value) {
addCriterion("segment_6 <>", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6GreaterThan(BigDecimal value) {
addCriterion("segment_6 >", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6GreaterThanOrEqualTo(BigDecimal value) {
addCriterion("segment_6 >=", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6LessThan(BigDecimal value) {
addCriterion("segment_6 <", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6LessThanOrEqualTo(BigDecimal value) {
addCriterion("segment_6 <=", value, "segment6");
return (Criteria) this;
}
public Criteria andSegment6In(List<BigDecimal> values) {
addCriterion("segment_6 in", values, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotIn(List<BigDecimal> values) {
addCriterion("segment_6 not in", values, "segment6");
return (Criteria) this;
}
public Criteria andSegment6Between(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_6 between", value1, value2, "segment6");
return (Criteria) this;
}
public Criteria andSegment6NotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("segment_6 not between", value1, value2, "segment6");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetEamMappingMapper.java
View file @ fbc42d8b
......@@ -105,7 +105,6 @@ public interface CitAssetEamMappingMapper extends MyMapper {
* @mbg.generated
*/
int updateByPrimaryKey(CitAssetEamMapping record);
int insertBatch(List<CitAssetEamMapping> citAssetEamMappings);
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisExpectedTaxReturnMapper.xml
View file @ fbc42d8b
......@@ -11,6 +11,9 @@
<result column="segment_1" jdbcType="DECIMAL" property="segment1" />
<result column="segment_2" jdbcType="DECIMAL" property="segment2" />
<result column="segment_3" jdbcType="DECIMAL" property="segment3" />
<result column="segment_4" jdbcType="DECIMAL" property="segment4" />
<result column="segment_5" jdbcType="DECIMAL" property="segment5" />
<result column="segment_6" jdbcType="DECIMAL" property="segment6" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
......@@ -88,8 +91,8 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, seq_no, segment_1, segment_2, segment_3, create_time, update_time, organization_id,
company_name, period
id, seq_no, segment_1, segment_2, segment_3, segment_4, segment_5, segment_6, create_time,
update_time, organization_id, company_name, period
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisExpectedTaxReturnExample" resultMap="BaseResultMap">
<!--
......@@ -143,11 +146,13 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into analysis_expected_tax_return (id, seq_no, segment_1,
segment_2, segment_3, create_time,
segment_2, segment_3, segment_4,
segment_5, segment_6, create_time,
update_time, organization_id, company_name,
period)
values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{segment1,jdbcType=DECIMAL},
#{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{segment4,jdbcType=DECIMAL},
#{segment5,jdbcType=DECIMAL}, #{segment6,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER})
</insert>
......@@ -173,6 +178,15 @@
<if test="segment3 != null">
segment_3,
</if>
<if test="segment4 != null">
segment_4,
</if>
<if test="segment5 != null">
segment_5,
</if>
<if test="segment6 != null">
segment_6,
</if>
<if test="createTime != null">
create_time,
</if>
......@@ -205,6 +219,15 @@
<if test="segment3 != null">
#{segment3,jdbcType=DECIMAL},
</if>
<if test="segment4 != null">
#{segment4,jdbcType=DECIMAL},
</if>
<if test="segment5 != null">
#{segment5,jdbcType=DECIMAL},
</if>
<if test="segment6 != null">
#{segment6,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -254,6 +277,15 @@
<if test="record.segment3 != null">
segment_3 = #{record.segment3,jdbcType=DECIMAL},
</if>
<if test="record.segment4 != null">
segment_4 = #{record.segment4,jdbcType=DECIMAL},
</if>
<if test="record.segment5 != null">
segment_5 = #{record.segment5,jdbcType=DECIMAL},
</if>
<if test="record.segment6 != null">
segment_6 = #{record.segment6,jdbcType=DECIMAL},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
......@@ -285,6 +317,9 @@
segment_1 = #{record.segment1,jdbcType=DECIMAL},
segment_2 = #{record.segment2,jdbcType=DECIMAL},
segment_3 = #{record.segment3,jdbcType=DECIMAL},
segment_4 = #{record.segment4,jdbcType=DECIMAL},
segment_5 = #{record.segment5,jdbcType=DECIMAL},
segment_6 = #{record.segment6,jdbcType=DECIMAL},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
......@@ -313,6 +348,15 @@
<if test="segment3 != null">
segment_3 = #{segment3,jdbcType=DECIMAL},
</if>
<if test="segment4 != null">
segment_4 = #{segment4,jdbcType=DECIMAL},
</if>
<if test="segment5 != null">
segment_5 = #{segment5,jdbcType=DECIMAL},
</if>
<if test="segment6 != null">
segment_6 = #{segment6,jdbcType=DECIMAL},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -341,6 +385,9 @@
segment_1 = #{segment1,jdbcType=DECIMAL},
segment_2 = #{segment2,jdbcType=DECIMAL},
segment_3 = #{segment3,jdbcType=DECIMAL},
segment_4 = #{segment4,jdbcType=DECIMAL},
segment_5 = #{segment5,jdbcType=DECIMAL},
segment_6 = #{segment6,jdbcType=DECIMAL},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
organization_id = #{organizationId,jdbcType=VARCHAR},
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.xml
View file @ fbc42d8b
......@@ -923,6 +923,9 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.isSelect != null">
is_select = #{record.isSelect,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/JournalEntryMapper.xml
View file @ fbc42d8b
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-orangeheap/.env.development
View file @ fbc42d8b
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file
atms-orangeheap/.env.production
View file @ fbc42d8b
VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com/OrangeHeap/
\ No newline at end of file
VUE_APP_TABLEAU_API=/OrangeHeap/
\ No newline at end of file
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ fbc42d8b
......@@ -63,7 +63,7 @@
<!--@Html.AntiForgeryToken()-->
<div class="wrapper">
<app-nav></app-nav>
<div class="page-wrapper" style="position:relative;overflow:scroll;margin-top:55px">
<div class="page-wrapper" style="position:relative;overflow-x:hidden;overflow-y:auto;margin-top:55px">
<div class="main-contents" ui-view></div>
<div class="data-import-contents" ui-view="importContent"></div><!--style="display: none"-->
</div>
......
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ fbc42d8b
......@@ -310,7 +310,7 @@
dataField: "companyName",
width: '28%',
allowHeaderFiltering: false,
caption: $translate.instant('CompanySimpleName')
caption: $translate.instant('CompanyName')
}, {
dataField: "segment1",
allowHeaderFiltering: false,
......@@ -411,7 +411,7 @@
dataField: "companyName",
width: '25%',
allowHeaderFiltering: false,
caption: $translate.instant('CompanySimpleName')
caption: $translate.instant('CompanyName')
}, {
dataField: "segment1",
allowHeaderFiltering: false,
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ fbc42d8b
......@@ -29,7 +29,7 @@
</li>
</ul>
</div>
<span class="text-bold" translate="Period"></span>:
<span class="text-bold" style="margin-left: 39px;" translate="Period"></span>:
<div class="period-picker" style="margin-left:10px; width:141px;">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style=" width: 111px;"
readonly="readonly" ng-model="UploadPeriodTime"/>
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js
View file @ fbc42d8b
......@@ -2940,7 +2940,6 @@
}).error(function (error) {
});*/
calculateEbitAndInsert($scope.relation.sheet, true);
spreadTODb();
}
var spreadTODb = function (front) {
......@@ -2948,7 +2947,8 @@
SweetAlert.error("请选择机构");
return;
}
var json = $scope.spread.toJSON({includeBindingSource: true});
//{includeBindingSource: true}
var json = $scope.spread.toJSON({includeBindingSource: true});
var excelIo = new GC.Spread.Excel.IO();
var url = apiInterceptor.webApiHostUrl + '/Report/spreadToDb?orgId=' + $scope.relation.orgId + "&period=" + $scope.relation.period;
//var apiTokenObj = JSON.parse(getCookie('AtmsApiToken'));
......@@ -2997,6 +2997,8 @@
return;
}
file = file[0];
// 转圈圈
$('#busy-indicator-container').show();
frontImport(file);//前端导入
/*if(file.length == 0)
return
......@@ -3074,8 +3076,7 @@
if ($scope.spread != undefined && $scope.spread) {
var excelIo = new GC.Spread.Excel.IO();
excelIo.open(file, function (json) {
var workbookObj = json;
$scope.spread.fromJSON(workbookObj);
$scope.spread.fromJSON(json);
var sheet = $scope.spread.sheets[0];
$scope.relation.sheet = $scope.spread.sheets[0];
/*vatReportService.saveAndRefresh($scope.relation.orgId, $scope.relation.period, 0, "1").success(function (res) {
......@@ -3089,7 +3090,10 @@
$scope.relation.addEbitRow(sheet);
calculateEbitAndInsert(sheet, true);
$scope.relation.lockCell($scope.spread);
$('#busy-indicator-container').hide();
//关闭弹出层
spreadTODb(true);
}, function (e) {
alert(e.errorMessage);
if (e.errorCode === 2/*noPassword*/ || e.errorCode === 3 /*invalidPassword*/) {
......@@ -3117,7 +3121,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){
......@@ -3135,7 +3138,7 @@
$scope._ebitResult.rate = rate;
$scope._ebitResult.gljyye = Number(((rate/ 100) * $scope._ebitResult.kltsys).toFixed(4));
$scope._ebitResult.sixAddtax = Number((0.06 * $scope._ebitResult.gljyye).toFixed(4));
$scope._ebitResult.tsklys = Number(($scope._ebitResult.gljyye * 0.106).toFixed(4));
$scope._ebitResult.tsklys = Number(($scope._ebitResult.gljyye * 1.06).toFixed(4));
if (insert) {
sheet.setValue(37, 2, $scope._ebitResult.klzcjsz);
sheet.setValue(38, 2, $scope._ebitResult.tsyskl);
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
View file @ fbc42d8b
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="col-sm-5 bar-export navRight" style=" margin-top: 20px;width: 30%; float: right;">
<div class="col-sm-5 bar-export navRight" style=" margin-top: 20px;width: 38%; float: right;">
<span ngf-select="" ngf-change="upload($files)" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="" ><i class="fa fa-file">&nbsp;{{'uploadProfileTable' | translate}}</i></span>
<span ng-click="saveAndRefresh()"><i class="fa fa-refresh"></i>&nbsp;{{'saveAndRefresh' | translate}}</span>
......@@ -51,8 +51,7 @@
</table-report-sheet>
<form name="myform" style="disply:none;" id="myform" enctype="multipart/form-data" method="post">
    
   </form>
</form>
<a href="#" id = "a"></a>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
View file @ fbc42d8b
......@@ -897,7 +897,8 @@
};
$scope.exportReportTreeOptions = {
dataSource: [{id: '0', templateId: '0', name: '纳税申报表', items: [], expanded: true}],
dataSource: [{id: '0', templateId: '0', name: '纳税申报表', items: [], expanded: true},
{id: '1', templateId: '1', name: '工作底稿', items: [], expanded: true}],
displayExpr: 'name',
keyExpr: 'id',
selectionMode: 'Multiple',
......@@ -916,7 +917,7 @@
$scope.openExportPop = function (evenType) {
$scope.evenType = evenType;
var grp = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'TaxReturnType' || g.name == 'WorkingPaperType';
return g.name == 'TaxReturnType';
});
if (!grp || !grp.children) {
......@@ -928,6 +929,19 @@
return {id: item.reportId, templateId: item.id, name: item.name, parentId: '0'};
});
var grp2 = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'WorkingPaperType'
});
if (!grp2 || !grp2.children) {
return;
}
$scope.exportReportTreeOptions.dataSource[1].items = [];
$scope.exportReportTreeOptions.dataSource[1].items = _.map(grp2.children, function (item) {
return {id: item.reportId, templateId: item.id, name: item.name, parentId: '0'};
});
var parentElem = angular.element($('#exportReportFilesContainer'));
$scope.exportReportInstance = $uibModal.open({
ariaLabelledBy: 'modal-title',
......@@ -958,7 +972,7 @@
//批量导出EXCEL
$scope.export = function () {
debugger;
var grp = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'TaxReturnType';
});
......@@ -967,6 +981,14 @@
return;
}
var grp2 = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'WorkingPaperType'
});
if (!grp2 || !grp2.children) {
return;
}
if (!$scope.selectedReportIds || $scope.selectedReportIds.length == 0) {
SweetAlert.warning($translate.instant('ExportReportRequiredCheck'));
return;
......@@ -978,6 +1000,10 @@
item.orderIndex = orderIndex;
orderIndex++;
});
_.each(grp2.children, function (item) {
item.orderIndex = orderIndex;
orderIndex++;
});
var reportArray = $scope.selectedReportIds;
......@@ -996,7 +1022,10 @@
var node = _.first(_.where(grp.children, {reportId: currentVal}));
if (!node) {
return;
node = _.first(_.where(grp2.children, {reportId: currentVal}));
if (!node) {
return;
}
}
var reportPromiss = citReportService.getReportData(node.reportId).success(function (reportData) {
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ fbc42d8b
......@@ -1442,7 +1442,14 @@ constant.GroupTypeList = [
{code: 4, type: "教育费附加"},
{code: 5, type: "地方教育费附加"},
{code: 6, type: "个人所得税"},
{code: 7, type: "国际税"}
{code: 7, type: "水利建设基金"},
{code: 8, type: "文化事业建设费"},
{code: 9, type: "房产税"},
{code: 10, type: "城建土地使用税"},
{code: 11, type: "工会经费"},
{code: 12, type: "残疾人就业保障基金"},
{code: 13, type: "代扣代缴税费"},
{code: 14, type: "国际税"}
];
constant.InvoiceTypeList = [
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ fbc42d8b
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.7e09d0db.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.7e09d0db.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.c8b0fed0.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.39b13767.js></script><script src=js/app.c8b0fed0.js></script></body></html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment