Skip to content

T
traffic-front
Commit 7697d703 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 49952f9e c9e02cd4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 131 deletions
atms-api/pom.xml
View file @ 7697d703
...@@ -456,7 +456,6 @@ ...@@ -456,7 +456,6 @@
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>staging</id> <id>staging</id>
<build> <build>
...@@ -617,7 +616,7 @@ ...@@ -617,7 +616,7 @@
</dependencies> </dependencies>
</plugin> </plugin>
<!-- See: https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven --> <!-- See: https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Maven -->
<plugin> <plugin>ll
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
<version>3.4.0.905</version> <version>3.4.0.905</version>
......
atms-api/src/main/java/pwc/taxtech/atms/common/ThousandConvert.java
View file @ 7697d703
...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; ...@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
...@@ -19,11 +20,13 @@ import java.util.Locale; ...@@ -19,11 +20,13 @@ import java.util.Locale;
* version 1.0 * version 1.0
*/ */
public class ThousandConvert extends JsonSerializer<BigDecimal> { public class ThousandConvert extends JsonSerializer<BigDecimal> {
@Override @Override
public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2) public void serialize(BigDecimal value, JsonGenerator jgen, SerializerProvider arg2)
throws IOException { throws IOException {
jgen.writeString(NumberFormat.getIntegerInstance(Locale.getDefault()).format(value)); NumberFormat integerInstance = NumberFormat.getIntegerInstance(Locale.getDefault());
integerInstance.setMinimumFractionDigits(2);
integerInstance.setRoundingMode(RoundingMode.HALF_UP);
integerInstance.setGroupingUsed(true);
jgen.writeString(integerInstance.format(value));
} }
} }
atms-api/src/main/java/pwc/taxtech/atms/controller/TableauController.java
View file @ 7697d703
...@@ -86,7 +86,7 @@ public class TableauController extends BaseController { ...@@ -86,7 +86,7 @@ public class TableauController extends BaseController {
@ResponseBody @ResponseBody
@GetMapping("dashboard") @GetMapping("dashboard")
public ApiResultDto getDashboard() { public ApiResultDto getDashboard() {
return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY)); return ApiResultDto.success(tableauService.getDashboard().orElse(StringUtils.EMPTY));
} }
} }
atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisActualTaxReturnDto.java
View file @ 7697d703
package pwc.taxtech.atms.dto.analysis; package pwc.taxtech.atms.dto.analysis;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -10,15 +13,19 @@ import java.math.BigDecimal; ...@@ -10,15 +13,19 @@ import java.math.BigDecimal;
public class AnalysisActualTaxReturnDto { public class AnalysisActualTaxReturnDto {
private String companyName; private String companyName;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment1; private BigDecimal segment1;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment2; private BigDecimal segment2;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment3; private BigDecimal segment3;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment4; private BigDecimal segment4;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal segment5; private BigDecimal segment5;
public String getCompanyName() { public String getCompanyName() {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisDriverNumDto.java
View file @ 7697d703
package pwc.taxtech.atms.dto.analysis; package pwc.taxtech.atms.dto.analysis;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -11,6 +14,7 @@ public class AnalysisDriverNumDto { ...@@ -11,6 +14,7 @@ public class AnalysisDriverNumDto {
private String driverType; private String driverType;
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal driverNum; private BigDecimal driverNum;
public String getDriverType() { public String getDriverType() {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/EbitDataDto.java
View file @ 7697d703
package pwc.taxtech.atms.dto.vatdto; package pwc.taxtech.atms.dto.vatdto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.common.ThousandConvert;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
...@@ -10,11 +13,16 @@ import java.math.BigDecimal; ...@@ -10,11 +13,16 @@ import java.math.BigDecimal;
* Version 1.0 * Version 1.0
**/ **/
public class EbitDataDto { public class EbitDataDto {
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal ebitSubtraction; // 1. EBIT（考虑资产减值损失） private BigDecimal ebitSubtraction; // 1. EBIT（考虑资产减值损失）
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal specialFactors; //考虑特殊因素 private BigDecimal specialFactors; //考虑特殊因素
private String ebitRate;// ebit比率 默认1%（可更改） private String ebitRate;// ebit比率 默认1%（可更改）
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal transactionAmount; //关联交易金额 private BigDecimal transactionAmount; //关联交易金额
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal sixAddTax; //6%增值税 private BigDecimal sixAddTax; //6%增值税
@JsonSerialize(using = ThousandConvert.class)
private BigDecimal totalAmountTax;// 价税合计金额 private BigDecimal totalAmountTax;// 价税合计金额
private String specialConsiderations;//特殊因素考虑 private String specialConsiderations;//特殊因素考虑
public String getSpecialConsiderations() { public String getSpecialConsiderations() {
...@@ -26,8 +34,6 @@ public class EbitDataDto { ...@@ -26,8 +34,6 @@ public class EbitDataDto {
} }
public BigDecimal getEbitSubtraction() { public BigDecimal getEbitSubtraction() {
return ebitSubtraction; return ebitSubtraction;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java
View file @ 7697d703
...@@ -57,6 +57,7 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -57,6 +57,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
public PageInfo<CitJournalAdjustDto> getJournalMergeData(CitJournalAdjustDto citJournalAdjustDto) { public PageInfo<CitJournalAdjustDto> getJournalMergeData(CitJournalAdjustDto citJournalAdjustDto) {
CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust()); CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId()); List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
//判断选择的期间是否为12月，若为12月份则需查询出到13期的内容
if (citJournalEntryAdjust.getPeriodEnd() != null && citJournalEntryAdjust.getPeriodEnd() % 100 == 12) { if (citJournalEntryAdjust.getPeriodEnd() != null && citJournalEntryAdjust.getPeriodEnd() % 100 == 12) {
citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd() / 100 * 100 + 13); citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd() / 100 * 100 + 13);
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
View file @ 7697d703
...@@ -234,7 +234,7 @@ public class CitReportServiceImpl extends BaseService { ...@@ -234,7 +234,7 @@ public class CitReportServiceImpl extends BaseService {
setStatus(genJob, STATUS_END); setStatus(genJob, STATUS_END);
periodJobMapper.updateByPrimaryKey(genJob); periodJobMapper.updateByPrimaryKey(genJob);
reportGenerator.citUpdateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob); reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
//===============================================start validation compute========================================================== //===============================================start validation compute==========================================================
//todo: 1.get the data from workbook, then put the data into new workbook //todo: 1.get the data from workbook, then put the data into new workbook
...@@ -1704,7 +1704,7 @@ public class CitReportServiceImpl extends BaseService { ...@@ -1704,7 +1704,7 @@ public class CitReportServiceImpl extends BaseService {
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
Workbook tWorkbook = null; Workbook tWorkbook = null;
try { try {
tWorkbook = reportGenerator.createWorkBookByPeriodTemplate(dataList); tWorkbook = reportGenerator.createCitWorkBookByPeriodTemplate(dataList);
tWorkbook.write(bout); tWorkbook.write(bout);
// FileUpload fileUpload = didiFileUploadService.uploadFile(bout.toByteArray(), "demo.xlsx", FileUploadEnum.BizSource.PERIOD_REPORT_TEMPLATE_UPLOAD.name()); // FileUpload fileUpload = didiFileUploadService.uploadFile(bout.toByteArray(), "demo.xlsx", FileUploadEnum.BizSource.PERIOD_REPORT_TEMPLATE_UPLOAD.name());
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 7697d703
...@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.NumberFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
...@@ -1309,6 +1310,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -1309,6 +1310,7 @@ public class ReportServiceImpl extends BaseService {
CellDataDto cellDataDto = null; CellDataDto cellDataDto = null;
CellDataDto cellDataDto1 = null; CellDataDto cellDataDto1 = null;
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
if(i >=23) continue;//过滤掉多余数据
cellDataDto = new CellDataDto(); cellDataDto = new CellDataDto();
cellDataDto1 = new CellDataDto(); cellDataDto1 = new CellDataDto();
if (list.get(i).getItemName().equals("")) if (list.get(i).getItemName().equals(""))
...@@ -2520,38 +2522,6 @@ public class ReportServiceImpl extends BaseService { ...@@ -2520,38 +2522,6 @@ public class ReportServiceImpl extends BaseService {
} }
@Transactional
public void saveDatasource(String orgId, Integer period, Integer specialConsiderations, String ebitRate,
OperationResultDto<ReportDataDto> operationResultDto,
List<CellDataDto> cellDataList) {
EbitCellDataExample example = null;
List<EbitCellData> ebitCellDataList = new ArrayList<>();
for (int i = 37; i <= 43; i++) {
example = new EbitCellDataExample();
EbitCellDataExample.Criteria criteria = example.createCriteria();
criteria.andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period).andColEqualTo(1).andRowEqualTo(i);
List<EbitCellData> ebitCellData = ebitCellDataMapper.selectByExample(example);
if (ebitCellData.size() == 0) {
for (CellDataDto cellDataDto : cellDataList) {
EbitCellData ebitCellData1 = new EbitCellData();
ebitCellData1.setId(idService.nextId());
ebitCellData1.setOrganizationId(orgId);
ebitCellData1.setPeriod(period);
ebitCellData1.setCreateTime(new Date());
ebitCellData1.setCol(cellDataDto.getColumnIndex());
ebitCellData1.setRow(cellDataDto.getRowIndex());
ebitCellData1.setData(cellDataDto.getCellValue());
ebitCellDataList.add(ebitCellData1);
}
ebitCellDataList.add(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period));
ebitCellDataMapper.insertBatch(ebitCellDataList);
} else {
ebitCellDataMapper.updateByExampleSelective(switchMeth(i, new EbitCellData(), operationResultDto, specialConsiderations, ebitRate, orgId, period), example);
}
}
}
private EbitCellData switchMeth(Integer i, EbitCellData ebitCellData1, OperationResultDto<ReportDataDto> operationResultDto, Integer specialConsiderations, String ebitRate, String orgId, Integer period) { private EbitCellData switchMeth(Integer i, EbitCellData ebitCellData1, OperationResultDto<ReportDataDto> operationResultDto, Integer specialConsiderations, String ebitRate, String orgId, Integer period) {
switch (i) { switch (i) {
case 37: case 37:
...@@ -2671,6 +2641,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2671,6 +2641,7 @@ public class ReportServiceImpl extends BaseService {
@Autowired @Autowired
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
private CellStyle cellStyle1 = null; private CellStyle cellStyle1 = null;
private static final String EBITTemplateCode = "VAT10086";
/** /**
* 批量导出Excel ebit利润表 * 批量导出Excel ebit利润表
...@@ -2685,7 +2656,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2685,7 +2656,7 @@ public class ReportServiceImpl extends BaseService {
File templateFile; File templateFile;
InputStream inputStream = null; InputStream inputStream = null;
TemplateExample templateExample = new TemplateExample(); TemplateExample templateExample = new TemplateExample();
templateExample.createCriteria().andCodeEqualTo("VAT10086").andNameEqualTo("VAT10086");//todo 这里是利润表模板的固定code，禁止重复 templateExample.createCriteria().andCodeEqualTo(EBITTemplateCode).andNameEqualTo(EBITTemplateCode);//todo 这里是利润表模板的固定code，禁止重复
List<Template> templates1 = templateMapper.selectByExample(templateExample); List<Template> templates1 = templateMapper.selectByExample(templateExample);
if (templates1.size() == 0) if (templates1.size() == 0)
throw new Exception("没有利润表模板,无法批量导出,请上传模板"); throw new Exception("没有利润表模板,无法批量导出,请上传模板");
...@@ -2885,7 +2856,9 @@ public class ReportServiceImpl extends BaseService { ...@@ -2885,7 +2856,9 @@ public class ReportServiceImpl extends BaseService {
sheetAt.getRow(row).getCell(col).setCellStyle(cellStyle1); sheetAt.getRow(row).getCell(col).setCellStyle(cellStyle1);
return sheetAt.getRow(row).getCell(col); return sheetAt.getRow(row).getCell(col);
} }
private static final String headerEbitTitle = "汇总利润表"; private static final String headerEbitTitle = "汇总利润表";
public void insertExcelOne(CellStyle headerCellType, XSSFWorkbook workbook1, Sheet sheetAt, Integer _index, RequestParameterDto requestParameterDto) { public void insertExcelOne(CellStyle headerCellType, XSSFWorkbook workbook1, Sheet sheetAt, Integer _index, RequestParameterDto requestParameterDto) {
headerCellType.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直 headerCellType.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直
headerCellType.setAlignment(HorizontalAlignment.CENTER);// 水平 headerCellType.setAlignment(HorizontalAlignment.CENTER);// 水平
...@@ -2949,7 +2922,7 @@ public class ReportServiceImpl extends BaseService { ...@@ -2949,7 +2922,7 @@ public class ReportServiceImpl extends BaseService {
//获取利润表模板Id 利润表固定模板VAT10086 //获取利润表模板Id 利润表固定模板VAT10086
public String getlxbId() throws Exception { public String getlxbId() throws Exception {
try { try {
String sql = "select * from template t where t.name = 'VAT10086' order by t.create_time desc "; String sql = "select * from template t where t.name = '" + EBITTemplateCode + "' order by t.create_time desc ";
Map<String, Object> stringObjectMap = new HashMap<>(); Map<String, Object> stringObjectMap = new HashMap<>();
stringObjectMap = jdbcTemplate.queryForList(sql).get(0); stringObjectMap = jdbcTemplate.queryForList(sql).get(0);
return stringObjectMap.get("id").toString(); return stringObjectMap.get("id").toString();
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TBM.java
View file @ 7697d703
...@@ -106,7 +106,7 @@ public class TBM extends FunctionBase implements FreeRefFunction { ...@@ -106,7 +106,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1))); dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
} }
} }
amount = amount.add(dto.getAmount()); amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
dto.setPeriod(period); dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE); dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource); dto.setName(Constant.DataSourceName.ReportDataSource);
...@@ -144,7 +144,7 @@ public class TBM extends FunctionBase implements FreeRefFunction { ...@@ -144,7 +144,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1))); dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
} }
} }
amount = amount.add(dto.getAmount()); amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
dto.setPeriod(period); dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE); dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource); dto.setName(Constant.DataSourceName.ReportDataSource);
...@@ -182,7 +182,7 @@ public class TBM extends FunctionBase implements FreeRefFunction { ...@@ -182,7 +182,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1))); dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
} }
} }
amount = amount.add(dto.getAmount()); amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
dto.setPeriod(period); dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE); dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource); dto.setName(Constant.DataSourceName.ReportDataSource);
......
atms-api/src/main/resources/conf/conf_profile_pub.properties
View file @ 7697d703
jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false jdbc_url=jdbc:mysql://10.88.128.65:8806/fintax_stage?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true&amp;useSSL=false
jdbc_user=fintax_user_test jdbc_user=fintax_user_stage
jdbc_password=Fintaxuser@123Test jdbc_password=Fintaxuser@123Stage
#jdbc_password=111111 #jdbc_password=111111
jdbc_admin_db=taxadmin2018 jdbc_admin_db=taxadmin2018
...@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster ...@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa mail_jdbc_user=sa
mail_jdbc_password=atmsunittestSQL mail_jdbc_password=atmsunittestSQL
web.url=http://dts.erp.didichuxing.com:9001 web.url=http://dts.erp.didichuxing.com
#web.url=* #web.url=*
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg== jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx jwt.powerToken=xxxx
...@@ -33,7 +33,7 @@ max_file_length=104857600 ...@@ -33,7 +33,7 @@ max_file_length=104857600
distributed_id_datacenter=10 distributed_id_datacenter=10
distributed_id_machine=15 distributed_id_machine=15
api.url=http://dts.erp.didichuxing.com:8180 api.url=http://dts.erp.didichuxing.com
# Longi config # Longi config
longi_api_basic_user= longi_api_basic_user=
...@@ -59,20 +59,21 @@ org_sync_token=174af08f ...@@ -59,20 +59,21 @@ org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ== dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
ebs_call_url=http://172.20.3.109:8010/ebs-proxy-test/dts ebs_call_url=http://172.20.2.220:8080/ebs-proxy-test/dts
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://172.20.2.220:8080/trusted?username=%s
tableau_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet8?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet0?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_tax_comparison=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_countries=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_domestic_data=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet40?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_doc_situation=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet9?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-api/src/main/resources/conf/conf_profile_uat.properties
View file @ 7697d703
...@@ -63,16 +63,16 @@ ebs_call_url=http://172.20.201.98:8020/ebs-proxy-test/dts ...@@ -63,16 +63,16 @@ ebs_call_url=http://172.20.201.98:8020/ebs-proxy-test/dts
#tableau config #tableau config
tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
tableau_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet0?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet11?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_tax_comparison=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_tax_comparison=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_countries=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_countries=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet24?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet31?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_other_domestic_data=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_other_domestic_data=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet39?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_doc_situation=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet9?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_doc_situation=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet42?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no tableau_dashboard=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409_MonthlyReport/Dashboard?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisActualTaxReturn.java
View file @ 7697d703
...@@ -3,6 +3,8 @@ package pwc.taxtech.atms.analysis.entity; ...@@ -3,6 +3,8 @@ package pwc.taxtech.atms.analysis.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import pwc.taxtech.atms.entity.BaseEntity; import pwc.taxtech.atms.entity.BaseEntity;
/** /**
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 7697d703
...@@ -434,6 +434,9 @@ ...@@ -434,6 +434,9 @@
<if test="record.description != null and record.description != ''"> <if test="record.description != null and record.description != ''">
and description LIKE CONCAT('%' ,#{record.description},'%') and description LIKE CONCAT('%' ,#{record.description},'%')
</if> </if>
<if test="record.source != null and record.source != ''">
and source LIKE CONCAT('%' ,#{record.source},'%')
</if>
<if test="record.periodStart!=null"> <if test="record.periodStart!=null">
AND account_period >= #{record.periodStart,jdbcType=INTEGER} AND account_period >= #{record.periodStart,jdbcType=INTEGER}
</if> </if>
...@@ -466,6 +469,10 @@ ...@@ -466,6 +469,10 @@
<if test="record.description != null and record.description != ''"> <if test="record.description != null and record.description != ''">
and description LIKE CONCAT('%' ,#{record.description},'%') and description LIKE CONCAT('%' ,#{record.description},'%')
</if> </if>
<if test="record.source != null and record.source != ''">
and source LIKE CONCAT('%' ,#{record.source},'%')
</if>
<if test="record.periodStart!=null"> <if test="record.periodStart!=null">
AND period &gt;= #{record.periodStart,jdbcType=INTEGER} AND period &gt;= #{record.periodStart,jdbcType=INTEGER}
</if> </if>
......
atms-orangeheap/src/components/Panel.vue
View file @ 7697d703
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<v-container ma-0 pa-0> <v-container ma-0 pa-0>
<Tableau :url="chartUrl" <Tableau :url="chartUrl"
width="100%" width="100%"
ref="tableau" ref="tableau"
:apiUrl="tableauApiUrl" :apiUrl="tableauApiUrl"
> >
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
{ {
iconName: '#d-iconyihuankuanbufen', iconName: '#d-iconyihuankuanbufen',
active: false, active: false,
title: '税种未返还税金分析', title: '税负分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax', chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
}, },
{ {
......
atms-orangeheap/src/views/ChartApp.vue
View file @ 7697d703
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<v-bottom-nav <v-bottom-nav
:active.sync="bottomNav" :active.sync="bottomNav"
:value="true" :value="true"
color="#ffffff"
absolute absolute
style=" overflow: hidden; style=" overflow: hidden;
position: fixed; position: fixed;
...@@ -16,25 +17,25 @@ ...@@ -16,25 +17,25 @@
> >
<v-btn <v-btn
color="teal" color="#333333"
flat flat
value="panel" value="panel"
depressed depressed
:to="{name: 'panel'}" :to="{name: 'panel'}"
> >
<span style="font-size:20px ; color:#999999">仪表盘</span> <span style="font-size:20px ; ">仪表盘</span>
<v-icon color="#dddddd">table_chart</v-icon> <v-icon >table_chart</v-icon>
</v-btn> </v-btn>
<v-btn <v-btn
color="teal" color="#333333"
flat flat
value="mine" value="mine"
depressed depressed
:to="{name: 'mine'}" :to="{name: 'mine'}"
> >
<span style="font-size:20px ;color:#999999 " > 我的</span> <span style="font-size:20px ; " > 我的</span>
<v-icon color="#dddddd" >account_box</v-icon> <v-icon >account_box</v-icon>
</v-btn> </v-btn>
</v-bottom-nav> </v-bottom-nav>
......
atms-web/src/main/resources/conf_profile_pub.properties
View file @ 7697d703
api.url=http://dts.erp.didichuxing.com:8180/ api.url=http://dts.erp.didichuxing.com
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg== jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx jwt.powerToken=xxxx
...@@ -21,49 +21,49 @@ longi_api_basic_pwd= ...@@ -21,49 +21,49 @@ longi_api_basic_pwd=
longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
#tableau config #tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
#税种未返还税金 #税种未返还税金
tableau_tax_category_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_tax_category_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区未返还税金 #地区未返还税金
tableau_district_unreturned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#未返还/返还后税金比较 #未返还/返还后税金比较
tableau_unreturned_and_returned_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet14?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_unreturned_and_returned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#费用分析 #费用分析
tableau_cost_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#地区利润总额 / 亏损额 #地区利润总额 / 亏损额
tableau_district_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet26?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_district_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#公司利润总额 / 亏损额 #公司利润总额 / 亏损额
tableau_company_profit_and_loss=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_company_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#司机 / 员工人数 #司机 / 员工人数
tableau_driver_and_employee=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/sheet32?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_driver_and_employee=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#业务线GMV及补贴统计 #业务线GMV及补贴统计
tableau_gmv_and_subsidy=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_gmv_and_subsidy=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#档案归档情况 #档案归档情况
tableau_file_arrangement=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_file_arrangement=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税全球概覧 #国际税全球概覧
tableau_global_overview=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#国际税业务数据 #国际税业务数据
tableau_global_business=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_global_business=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#墨西哥税务分析 #墨西哥税务分析
tableau_mexican_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#澳洲税务分析 #澳洲税务分析
tableau_australian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#巴西税务分析 #巴西税务分析
tableau_brazilian_tax=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
#其他税务分析 #其他税务分析
tableau_other_tax_analysis=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no tableau_other_tax_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
atms-web/src/main/webapp/Scripts/Spreadjs11_1/gc.spread.sheets.all.11.1.0.min.js
View file @ 7697d703
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/Scripts/Spreadjs11_1/interop/gc.spread.excelio.11.1.0.min.js
View file @ 7697d703
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 7697d703
...@@ -868,5 +868,6 @@ ...@@ -868,5 +868,6 @@
"NumOfBranches":"分公司数量", "NumOfBranches":"分公司数量",
"ConditionColumnNum": "Search Condition Column Num", "ConditionColumnNum": "Search Condition Column Num",
"Condition": "Search Condition", "Condition": "Search Condition",
"RevenueTypeConfiguration":"Revenue Type Config" "RevenueTypeConfiguration":"Revenue Type Config",
"FinancialStatementsType": "Financial Statements"
} }
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 7697d703
...@@ -928,5 +928,6 @@ ...@@ -928,5 +928,6 @@
"ConditionColumnNum": "条件列", "ConditionColumnNum": "条件列",
"Condition": "查询条件", "Condition": "查询条件",
"Cancel4Tax": "取消", "Cancel4Tax": "取消",
"FinancialStatementsType": "财务报表",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/fixedAssetsRuleEnginee/fixed-assets-rule-enginee.ctrl.js
View file @ 7697d703
...@@ -211,7 +211,26 @@ ...@@ -211,7 +211,26 @@
var m = data.year.substring(0, data.year.length - 1); var m = data.year.substring(0, data.year.length - 1);
$scope.fixedAssetsObject.year = m; $scope.fixedAssetsObject.year = m;
} }
//根据当前资产的一级分类判断当前modal需要显示的标签
if (type == "1"){
$scope.assetAdd = "StandardFixedAssetsAdd";
$scope.assetEdit = "StandardFixedAssetsEdit";
$scope.assetCode = "FixedAssetsCode";
$scope.assetName = "FixedAssetsName";
$scope.assetAgeLimit = "FixedAssetsAgeLimit";
} else if(type == "2") {
$scope.assetAdd = "LongTermPendingAdd";
$scope.assetEdit = "LongTermPendingEdit";
$scope.assetCode = "LongTermPendingCode";
$scope.assetName = "LongTermPendingName";
$scope.assetAgeLimit = "LongTermPendingAgeLimit";
} else if(type == "3") {
$scope.assetAdd = "IntangibleAssetsAdd";
$scope.assetEdit = "IntangibleAssetsEdit";
$scope.assetCode = "IntangibleAssetsCode";
$scope.assetName = "IntangibleAssetsName";
$scope.assetAgeLimit = "IntangibleAssetsAgeLimit";
}
$(editModalSelector).modal('show'); $(editModalSelector).modal('show');
}; };
$scope.editMapping = function (data) { $scope.editMapping = function (data) {
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ 7697d703
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
rowData.taxDepreciationPeriod = null; rowData.taxDepreciationPeriod = null;
} else { } else {
rowData.assetDetailGroupId = aseetDetailList[0].id; rowData.assetDetailGroupId = aseetDetailList[0].id;
rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear; rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
} }
; ;
}, },
...@@ -543,7 +543,7 @@ ...@@ -543,7 +543,7 @@
return item.id == value; return item.id == value;
}); });
if (aseetDetailList.length > 0) { if (aseetDetailList.length > 0) {
rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear; rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
} }
}, },
lookup: { lookup: {
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html
View file @ 7697d703
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
<input class="form-control input-width-middle" type="text" id="description" ng-model="queryParams.description" /> <input class="form-control input-width-middle" type="text" id="description" ng-model="queryParams.description" />
</td> </td>
</tr> </tr>
<tr>
<td>
<span translate="importWay"></span>
<input class="form-control input-width-middle" type="text" id="source" ng-model="queryParams.source" />
</td>
</tr>
<tr style="display: none"> <tr style="display: none">
<td> <td>
<span translate="orgCode"></span> <span translate="orgCode"></span>
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ 7697d703
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
subjectCode: null, subjectCode: null,
subjectName: null, subjectName: null,
description: null, description: null,
source: null,
orgCode: null, orgCode: null,
orgName: null, orgName: null,
documentDate: null, documentDate: null,
...@@ -97,6 +98,7 @@ ...@@ -97,6 +98,7 @@
subjectCode: null, subjectCode: null,
subjectName: null, subjectName: null,
description: null, description: null,
source: null,
orgCode: null, orgCode: null,
orgName: null, orgName: null,
documentDate: null, documentDate: null,
......
atms-web/src/main/webapp/app/cit/reduction/cit-calculate-data/cit-calculate-data.ctrl.js
View file @ 7697d703
...@@ -578,7 +578,6 @@ debugger; ...@@ -578,7 +578,6 @@ debugger;
var tasks = JSON.parse(job.status); var tasks = JSON.parse(job.status);
if (job.jobStatus == 'End') { if (job.jobStatus == 'End') {
items.forEach(function (item, index) { items.forEach(function (item, index) {
item.status = 'completed'; item.status = 'completed';
...@@ -632,10 +631,11 @@ debugger; ...@@ -632,10 +631,11 @@ debugger;
items.forEach(function (item, index) { items.forEach(function (item, index) {
item.items.forEach(function (_task, index) { item.items.forEach(function (_task, index) {
var temp = false;
tasks.forEach(function (task) { tasks.forEach(function (task) {
if (task.code == _task.code) { if (task.code == _task.code) {
temp = true;
if (task.status == 'Error') { if (task.status == 'Error') {
_task.status = 'error'; _task.status = 'error';
} else if (task.status == 'End') { } else if (task.status == 'End') {
...@@ -645,7 +645,12 @@ debugger; ...@@ -645,7 +645,12 @@ debugger;
} }
_task.text = $translate.instant(_task.status); _task.text = $translate.instant(_task.status);
} }
}) });
//此时证明该code还未开始
if(!temp){
_task.status = 'unstarted';
_task.text = $translate.instant(_task.status);
}
}) })
}); });
} }
......
atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js
View file @ 7697d703
...@@ -980,7 +980,7 @@ ...@@ -980,7 +980,7 @@
//批量导出EXCEL //批量导出EXCEL
$scope.export = function () { $scope.export = function () {
debugger; $('#busy-indicator-container').show();
var grp = _.find($scope.$parent.$parent.groups, function (g) { var grp = _.find($scope.$parent.$parent.groups, function (g) {
return g.name == 'TaxReturnType'; return g.name == 'TaxReturnType';
}); });
...@@ -1028,6 +1028,7 @@ debugger; ...@@ -1028,6 +1028,7 @@ debugger;
xhr.send(JSON.stringify({ xhr.send(JSON.stringify({
reportIds: reportIds reportIds: reportIds
})); }));
$('#busy-indicator-container').hide();
return; return;
} }
...@@ -1048,6 +1049,7 @@ debugger; ...@@ -1048,6 +1049,7 @@ debugger;
xhr.send(JSON.stringify({ xhr.send(JSON.stringify({
reportIds: reportIds reportIds: reportIds
})); }));
$('#busy-indicator-container').hide();
return; return;
} }
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html
View file @ 7697d703
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;display: none"
translate="AddImportBtn" translate="AddImportBtn"
ng-click="importFile(importEnum.AddImport)"></button> ng-click="importFile(importEnum.AddImport)"></button>
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 7697d703
...@@ -66,7 +66,8 @@ constant.citReportTypeList = [ ...@@ -66,7 +66,8 @@ constant.citReportTypeList = [
{value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 2}, {value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 2},
{value: 3, name: 'WorkingPaperType', orderIndex: 3}, {value: 3, name: 'WorkingPaperType', orderIndex: 3},
{value: 4, name: 'DocumentListType', orderIndex: 4}, {value: 4, name: 'DocumentListType', orderIndex: 4},
{value: 5, name: 'OtherTaxes', orderIndex: 5}]; {value: 5, name: 'FinancialStatementsType', orderIndex: 5},
{value: 6, name: 'OtherTaxes', orderIndex: 6}];
constant.cfReportTypeList = [ constant.cfReportTypeList = [
{value: 1, name: '企业所得税预算'}, {value: 1, name: '企业所得税预算'},
......
atms-web/src/main/webapp/app/common/utils/pwc-util.js
View file @ 7697d703
...@@ -1181,7 +1181,9 @@ ...@@ -1181,7 +1181,9 @@
/------------------------------------------------kevin insert -----------------------------------/ /------------------------------------------------kevin insert -----------------------------------/
PWC.downloadCallBack = function (data, status, headers, fileName) { PWC.downloadCallBack = function (data, status, headers, fileName) {
var octetStreamMime = 'application/octet-stream'; var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime; var contentType = octetStreamMime;
if (headers)
contentType = headers('content-type') || octetStreamMime;
if (window.navigator.msSaveBlob) { if (window.navigator.msSaveBlob) {
var blob = new Blob([data], { var blob = new Blob([data], {
type: contentType type: contentType
...@@ -1214,7 +1216,7 @@ ...@@ -1214,7 +1216,7 @@
scope.selectOrgOptions = { scope.selectOrgOptions = {
displayExpr: 'name', displayExpr: 'name',
valueExpr: 'id', valueExpr: 'id',
width: function() { width: function () {
return window.innerWidth / 4.5; return window.innerWidth / 4.5;
}, },
bindingOptions: { bindingOptions: {
...@@ -1227,10 +1229,10 @@ ...@@ -1227,10 +1229,10 @@
searchEnabled: true, searchEnabled: true,
noDataText: translate.instant('RevenueNoOrgData'), noDataText: translate.instant('RevenueNoOrgData'),
showSelectionControls: true, showSelectionControls: true,
visible : true, visible: true,
deferRendering : false deferRendering: false
}; };
if(exp) if (exp)
_.extend(scope.selectOrgOptions, exp); _.extend(scope.selectOrgOptions, exp);
}; };
......
atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js
View file @ 7697d703
...@@ -107,6 +107,17 @@ ...@@ -107,6 +107,17 @@
allowHeaderFiltering: false, allowHeaderFiltering: false,
width: '15%', width: '15%',
caption: $translate.instant('Status') caption: $translate.instant('Status')
}, {
dataField: "operator",
allowHeaderFiltering: false,
width: '10%',
caption: $translate.instant('Creator')
},{
dataField: "createTime",
dataType: "date",
format: "yyyy-MM-dd HH:mm:ss",
width: '15%',
caption: $translate.instant('OperateTime')
} }
], ],
onContentReady: function (e) { onContentReady: function (e) {
......
atms-web/src/main/webapp/orangeweb/css/app.73dfc5ab.css 0 → 100644
View file @ 7697d703
.color_active[data-v-60ac6546]{color:red!important}.head[data-v-18a52f4a]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/css/app.e87f05ce.css deleted 100644 → 0
View file @ 49952f9e
.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-579027fe]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/index.html
View file @ 7697d703
...@@ -49,4 +49,4 @@ ...@@ -49,4 +49,4 @@
//send 发送 //send 发送
xmlhttp.send(); xmlhttp.send();
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.e87f05ce.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.6ae9ce65.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.e87f05ce.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.670ff040.js></script><script src=js/app.6ae9ce65.js></script></body></html> }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.73dfc5ab.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.07374ae8.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.73dfc5ab.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.670ff040.js></script><script src=js/app.07374ae8.js></script></body></html>
\ No newline at end of file \ No newline at end of file
atms-web/src/main/webapp/orangeweb/js/app.07374ae8.js.map 0 → 100644
View file @ 7697d703
This diff is collapsed.
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