Skip to content

T
traffic-front
Commit 6b1c5b2b authored by kevin's avatar kevin
Browse files
Options

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

parents 6ffa49d4 40b75304
Expand all Show whitespace changes
Inline Side-by-side
Showing with 728 additions and 262 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OperationLogTaxDocController.java
View file @ 6b1c5b2b
......@@ -71,28 +71,22 @@ public class OperationLogTaxDocController {
@RequestMapping("exportExcel")
@ResponseBody
// public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) {
public void exportExcelFile(HttpServletResponse response) {
public void exportExcelFile(HttpServletResponse response, @RequestBody OperationLogTaxDocument operationLogTaxDocument) {
try {
Map<String, String> headers = new LinkedHashMap<>();
headers.put("id", "id");
// headers.put("operation_content", "操作内容");
// headers.put("module_name", "模块名称");
// headers.put("operation_object", "操作对象");
headers.put("operation_action", "操作action");
// headers.put("original_state", "原始状态");
// headers.put("update_state", "更新状态");
headers.put("update_state", "操作内容");
headers.put("operation_user", "操作者");
headers.put("ip", "操作ip");
headers.put("comment", "内容");
headers.put("create_time", "创建时间");
List<OperationLogTaxDocument> TaxDocuments = operationLogTaxDocService.selectTaxDocumentList();
// List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
List<String> ids = operationLogTaxDocument.getIds() == null ? Lists.newArrayList() : operationLogTaxDocument.getIds();
List<OperationLogTaxDocument> taxDocuments = operationLogTaxDocService.selectListForLog(ids);
response.setContentType("multipart/form-data");
response.setHeader("Content-Disposition", "attachment;fileName=" + new String("档案列表日志".getBytes("GB2312"), "ISO-8859-1"));
OutputStream ouputStream = response.getOutputStream();
ExcelUtil.exportExcel(headers, TaxDocuments, ouputStream);
ExcelUtil.exportExcel(headers, taxDocuments, ouputStream);
} catch (Exception e) {
e.printStackTrace();
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 6b1c5b2b
......@@ -397,10 +397,11 @@ public class TemplateGroupServiceImpl extends AbstractService {
config.setUpdateTime(now);
config.setUpdateBy(authUserHelper.getCurrentUserId());
cellTemplateConfigList.add(config);
if (allowManual) {
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
}
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei start
// if (allowManual) {
// addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
// }
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei end
PeriodDataSource pds = new PeriodDataSource();
pds.setAmount(BigDecimal.ZERO);
pds.setUpdateBy("Admin");
......@@ -556,9 +557,11 @@ public class TemplateGroupServiceImpl extends AbstractService {
config.setUpdateBy(authUserHelper.getCurrentUserId());
cellTemplateConfigList.add(config);
//noinspection Duplicates
if (allowManual) {
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
}
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei start
// if (allowManual) {
// addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
// }
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei end
PeriodDataSource pds = new PeriodDataSource();
pds.setAmount(BigDecimal.ZERO);
pds.setUpdateBy("Admin");
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 6b1c5b2b
......@@ -8,10 +8,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.io.FileUtils;
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;
......@@ -26,7 +24,6 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import pwc.taxtech.atms.analysis.entity.AnalysisTax;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.POIUtil;
import pwc.taxtech.atms.common.message.ErrorMessage;
......@@ -61,7 +58,10 @@ import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaHelper;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -71,7 +71,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static pwc.taxtech.atms.common.util.FileExcelUtil.downloadExcel;
import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
@Component
......@@ -352,17 +351,15 @@ public class ReportServiceImpl extends BaseService {
andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate).
andStatusEqualTo(0);
List<RevenueTypeMapping> mappingList = revenueTypeMappingMapper.selectByExample(mappingExample);
//先清除数据
InvoiceRecord delRecord = new InvoiceRecord();
delRecord.setRevenueCofId(null);
if (!isMergeManualData) {
delRecord.setModifyRevenueCofId(null);
}
InvoiceRecordExample delExample = new InvoiceRecordExample();
delExample.createCriteria().andProjectIdEqualTo(projectId)
.andProjectIdEqualTo(projectId).
delExample.createCriteria().andProjectIdEqualTo(projectId).
andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
invoiceRecordMapper.deleteByExample(delExample);
if (isMergeManualData) {
invoiceRecordMapper.clearRevenueCof(true, false, delExample);
} else {
invoiceRecordMapper.clearRevenueCof(true, true, delExample);
}
Map<String, Long> map = new HashMap<>();
for (RevenueTypeMapping mapping : mappingList) {
if (!map.containsKey(mapping.getContent())) {
......@@ -482,12 +479,14 @@ public class ReportServiceImpl extends BaseService {
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
Cell cell = row.getCell(c);
if (cell == null) {
continue;//todo cell == null 如何处理
}
if (r <= addRowIndex + 1) {
if(r == addRowIndex + 1 && c>TaxesCalculateReportEnum.Column.Column_14.getIndex()){
assembleOriginalTemplateData(template,projectId,period,r,c,addRowIndex,cellTemplateList,cellTemplateConfigList);
}else{
String cellId = projectId + template.getId() + period + r + c;
if ((r - 1) >= 0 && (r - 1) < configIds.size()) {
cellId += configIds.get(configIds.size() - r);
......@@ -549,7 +548,26 @@ public class ReportServiceImpl extends BaseService {
if (r > 0 && r <= addRowIndex && hasHandDatas.contains(c)) {
addManualConfig(cellTemplate, cell, now, cellTemplateConfigList);
}
}
} else {
assembleOriginalTemplateData(template,projectId,period,r,c,addRowIndex,cellTemplateList,cellTemplateConfigList);
}
}
}
List<List<PeriodCellTemplate>> tmpList = CommonUtils.subListWithLen(cellTemplateList, CommonUtils.BATCH_NUM);
// tmpList.forEach(list -> cellTemplateMapper.batchInsert2(list));
tmpList.forEach(list -> periodCellTemplateMapper.batchInsert(list));//todo 批量插入优化
List<List<PeriodCellTemplateConfig>> tmpConfigList = CommonUtils.subListWithLen(cellTemplateConfigList, CommonUtils.BATCH_NUM);
tmpConfigList.forEach(list -> periodCellTemplateConfigMapper.batchInsert(list));
} catch (Exception e) {
logger.error("importTemplateExcelFile error.", e);
throw new ServiceException(ErrorMessage.SystemError);
}
}
public void assembleOriginalTemplateData(Template template, String projectId, Integer period,
Integer r, Integer c, Integer addRowIndex,
List<PeriodCellTemplate> cellTemplateList, List<PeriodCellTemplateConfig> cellTemplateConfigList) {
//查询原来行cell是否有CellTemplate
CellTemplateExample cellTemplateExample = new CellTemplateExample();
cellTemplateExample.createCriteria().andReportTemplateIdEqualTo(template.getId()).andRowIndexEqualTo(r - addRowIndex).andColumnIndexEqualTo(c);
......@@ -617,19 +635,6 @@ public class ReportServiceImpl extends BaseService {
}
}
}
}
}
List<List<PeriodCellTemplate>> tmpList = CommonUtils.subListWithLen(cellTemplateList, CommonUtils.BATCH_NUM);
// tmpList.forEach(list -> cellTemplateMapper.batchInsert2(list));
tmpList.forEach(list -> periodCellTemplateMapper.batchInsert(list));//todo 批量插入优化
List<List<PeriodCellTemplateConfig>> tmpConfigList = CommonUtils.subListWithLen(cellTemplateConfigList, CommonUtils.BATCH_NUM);
tmpConfigList.forEach(list -> periodCellTemplateConfigMapper.batchInsert(list));
} catch (Exception e) {
logger.error("importTemplateExcelFile error.", e);
throw new ServiceException(ErrorMessage.SystemError);
}
}
private void addManualConfig(PeriodCellTemplate cellTemplate, Cell cell, Date now, List<PeriodCellTemplateConfig> list) {
PeriodCellTemplateConfig configManual = new PeriodCellTemplateConfig();
configManual.setId(distributedIdService.nextId());
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 6b1c5b2b
......@@ -364,12 +364,12 @@
<if test="subjectName != null and subjectName != ''">
and subject_name LIKE CONCAT('%' ,#{subjectName},'%')
</if>
<!--<if test="periodStart!=null">-->
<!--AND account_period &gt;= #{periodStart,jdbcType=INTEGER}-->
<!--</if>-->
<!--<if test="periodEnd!=null">-->
<!--AND account_period &lt;= #{periodEnd,jdbcType=INTEGER}-->
<!--</if>-->
<if test="periodStart!=null">
AND account_period >= #{periodStart,jdbcType=INTEGER}
</if>
<if test="periodEnd!=null">
AND account_period &lt;= #{periodEnd,jdbcType=INTEGER}
</if>
UNION ALL
select
id, organization_id, project_id, tms_period as period ,date,source, ledger_id, ledger_name, currency_code,
......
atms-orangeheap/src/components/Mine.vue
View file @ 6b1c5b2b
......@@ -35,7 +35,7 @@
export default {
name: 'Mine',
data: () => ({
userName: "杨铖的号头"
userName: "Admin"
})
//
......
atms-orangeheap/src/components/Panel.vue
View file @ 6b1c5b2b
......@@ -86,7 +86,7 @@
export default {
data: () => ({
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
tableauApiUrl: require('../assets/tableaujs.js'),
// tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js',
drawer: null,
......@@ -97,79 +97,93 @@
{
iconName: '#d-iconyihuankuanbufen',
active: false,
title: '未返还税金分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
title: '税种未返还税金分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
},
{
iconName: '#d-iconyihuankuanbufen',
active: false,
title: '地区未返还税金分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDistrictUnreturnedTax',
},
{
iconName: '#d-iconCompare',
active: false,
title: '未返还/返还后税金比较',
avatar: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'taxComparison',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauUnreturnedAndReturnedTax',
},
{
iconName: '#d-iconCompare',
active: false,
title: '费用分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauCostAnalysis',
},
{
iconName: '#d-iconhuaban',
active: false,
title: '地区利润总额/亏损额',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDistrictProfitAndLoss',
},
{
iconName: '#d-iconhuaban',
active: false,
title: '利润/亏损分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'profitAndLoss',
title: '公司利润总额/亏损额',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauCompanyProfitAndLoss',
},
{
iconName: '#d-iconqita1',
active: false,
title: '其他国内数据',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherDomesticData',
title: '司机/员工人数',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauDriverAndEmployee',
},
{
iconName: '#d-iconarchive-paper',
iconName: '#d-iconqita1',
active: false,
title: '业务线GMV及补贴统计',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGmvAndSubsidy',
},
{
iconName: '#d-iconqita1',
active: false,
title: '档案归档情况',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'docSituation',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauFileArrangement',
},
{
iconName: '#d-iconfeiyong',
iconName: '#d-iconqita1',
active: false,
title: '费用分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'costAnalysis',
title: '国际税全球概览',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGlobalOverview',
},
{
iconName: '#d-iconquanqiu',
iconName: '#d-iconqita1',
active: false,
title: '全球概览',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'globalOverview',
title: '国际税业务数据',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauGlobalBusiness',
},
{
iconName: "#d-iconmexico",
active: false,
title: '墨西哥税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'mexicanTax',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauMexicanTax',
},
{
iconName: '#d-iconaodaliya',
active: false,
title: '澳洲税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'australianTax',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauAustralianTax',
},
{
iconName: '#d-iconbaxi',
active: false,
title: '巴西税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'brazilianTax',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauBrazilianTax',
},
{
iconName: '#d-iconqita',
active: false,
title: '其他国家税务分析',
avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'otherCountries',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauOtherTaxAnalysis',
},
],
selectedItem: null
......
atms-web/src/main/java/pwc/taxtech/atms/web/OrangeHeapConfig.java
View file @ 6b1c5b2b
......@@ -15,31 +15,54 @@ public class OrangeHeapConfig {
//tableau相关配置
@Value("${tableau_get_ticket}")
private String tableauGetTicket;
@Value("${tableau_unreturned_tax}")
private String tableauUnreturnedTax;
@Value("${tableau_tax_comparison}")
private String tableauTaxComparison;
@Value("${tableau_other_countries}")
private String tableauOtherCountries;
@Value("${tableau_tax_category_unreturned_tax}")
private String tableauTaxCategoryUnreturnedTax;
@Value("${tableau_district_unreturned_tax}")
private String tableauDistrictUnreturnedTax;
@Value("${tableau_unreturned_and_returned_tax}")
private String tableauUnreturnedAndReturnedTax;
@Value("${tableau_cost_analysis}")
private String tableauCostAnalysis;
@Value("${tableau_profit_and_loss}")
private String tableauProfitAndLoss;
@Value("${tableau_other_domestic_data}")
private String tableauOtherDomesticData;
@Value("${tableau_doc_situation}")
private String tableauDocSituation;
@Value("${tableau_district_profit_and_loss}")
private String tableauDistrictProfitAndLoss;
@Value("${tableau_company_profit_and_loss}")
private String tableauCompanyProfitAndLoss;
@Value("${tableau_driver_and_employee}")
private String tableauDriverAndEmployee;
@Value("${tableau_gmv_and_subsidy}")
private String tableauGmvAndSubsidy;
@Value("${tableau_file_arrangement}")
private String tableauFileArrangement;
@Value("${tableau_global_overview}")
private String tableauGlobalOverview;
@Value("${tableau_global_business}")
private String tableauGlobalBusiness;
@Value("${tableau_mexican_tax}")
private String tableauMexicanTax;
@Value("${tableau_australian_tax}")
private String tableauAustralianTax;
@Value("${tableau_brazilian_tax}")
private String tableauBrazilianTax;
@Value("${tableau_other_tax_analysis}")
private String tableauOtherTaxAnalysis;
public String getLongiApiBasicUser() {
return this.longiApiBasicUser;
return longiApiBasicUser;
}
public void setLongiApiBasicUser(String longiApiBasicUser) {
......@@ -47,7 +70,7 @@ public class OrangeHeapConfig {
}
public String getLongiApiBasicPwd() {
return this.longiApiBasicPwd;
return longiApiBasicPwd;
}
public void setLongiApiBasicPwd(String longiApiBasicPwd) {
......@@ -55,7 +78,7 @@ public class OrangeHeapConfig {
}
public String getLongiApiGlBalance() {
return this.longiApiGlBalance;
return longiApiGlBalance;
}
public void setLongiApiGlBalance(String longiApiGlBalance) {
......@@ -63,79 +86,103 @@ public class OrangeHeapConfig {
}
public String getTableauGetTicket() {
return this.tableauGetTicket;
return tableauGetTicket;
}
public void setTableauGetTicket(String tableauGetTicket) {
this.tableauGetTicket = tableauGetTicket;
}
public String getTableauUnreturnedTax() {
return this.tableauUnreturnedTax;
public String getTableauTaxCategoryUnreturnedTax() {
return tableauTaxCategoryUnreturnedTax;
}
public void setTableauUnreturnedTax(String tableauUnreturnedTax) {
this.tableauUnreturnedTax = tableauUnreturnedTax;
public void setTableauTaxCategoryUnreturnedTax(String tableauTaxCategoryUnreturnedTax) {
this.tableauTaxCategoryUnreturnedTax = tableauTaxCategoryUnreturnedTax;
}
public String getTableauTaxComparison() {
return this.tableauTaxComparison;
public String getTableauDistrictUnreturnedTax() {
return tableauDistrictUnreturnedTax;
}
public void setTableauTaxComparison(String tableauTaxComparison) {
this.tableauTaxComparison = tableauTaxComparison;
public void setTableauDistrictUnreturnedTax(String tableauDistrictUnreturnedTax) {
this.tableauDistrictUnreturnedTax = tableauDistrictUnreturnedTax;
}
public String getTableauOtherCountries() {
return this.tableauOtherCountries;
public String getTableauUnreturnedAndReturnedTax() {
return tableauUnreturnedAndReturnedTax;
}
public void setTableauOtherCountries(String tableauOtherCountries) {
this.tableauOtherCountries = tableauOtherCountries;
public void setTableauUnreturnedAndReturnedTax(String tableauUnreturnedAndReturnedTax) {
this.tableauUnreturnedAndReturnedTax = tableauUnreturnedAndReturnedTax;
}
public String getTableauCostAnalysis() {
return this.tableauCostAnalysis;
return tableauCostAnalysis;
}
public void setTableauCostAnalysis(String tableauCostAnalysis) {
this.tableauCostAnalysis = tableauCostAnalysis;
}
public String getTableauProfitAndLoss() {
return this.tableauProfitAndLoss;
public String getTableauDistrictProfitAndLoss() {
return tableauDistrictProfitAndLoss;
}
public void setTableauProfitAndLoss(String tableauProfitAndLoss) {
this.tableauProfitAndLoss = tableauProfitAndLoss;
public void setTableauDistrictProfitAndLoss(String tableauDistrictProfitAndLoss) {
this.tableauDistrictProfitAndLoss = tableauDistrictProfitAndLoss;
}
public String getTableauOtherDomesticData() {
return this.tableauOtherDomesticData;
public String getTableauCompanyProfitAndLoss() {
return tableauCompanyProfitAndLoss;
}
public void setTableauOtherDomesticData(String tableauOtherDomesticData) {
this.tableauOtherDomesticData = tableauOtherDomesticData;
public void setTableauCompanyProfitAndLoss(String tableauCompanyProfitAndLoss) {
this.tableauCompanyProfitAndLoss = tableauCompanyProfitAndLoss;
}
public String getTableauDocSituation() {
return this.tableauDocSituation;
public String getTableauDriverAndEmployee() {
return tableauDriverAndEmployee;
}
public void setTableauDocSituation(String tableauDocSituation) {
this.tableauDocSituation = tableauDocSituation;
public void setTableauDriverAndEmployee(String tableauDriverAndEmployee) {
this.tableauDriverAndEmployee = tableauDriverAndEmployee;
}
public String getTableauGmvAndSubsidy() {
return tableauGmvAndSubsidy;
}
public void setTableauGmvAndSubsidy(String tableauGmvAndSubsidy) {
this.tableauGmvAndSubsidy = tableauGmvAndSubsidy;
}
public String getTableauFileArrangement() {
return tableauFileArrangement;
}
public void setTableauFileArrangement(String tableauFileArrangement) {
this.tableauFileArrangement = tableauFileArrangement;
}
public String getTableauGlobalOverview() {
return this.tableauGlobalOverview;
return tableauGlobalOverview;
}
public void setTableauGlobalOverview(String tableauGlobalOverview) {
this.tableauGlobalOverview = tableauGlobalOverview;
}
public String getTableauGlobalBusiness() {
return tableauGlobalBusiness;
}
public void setTableauGlobalBusiness(String tableauGlobalBusiness) {
this.tableauGlobalBusiness = tableauGlobalBusiness;
}
public String getTableauMexicanTax() {
return this.tableauMexicanTax;
return tableauMexicanTax;
}
public void setTableauMexicanTax(String tableauMexicanTax) {
......@@ -143,7 +190,7 @@ public class OrangeHeapConfig {
}
public String getTableauAustralianTax() {
return this.tableauAustralianTax;
return tableauAustralianTax;
}
public void setTableauAustralianTax(String tableauAustralianTax) {
......@@ -151,10 +198,18 @@ public class OrangeHeapConfig {
}
public String getTableauBrazilianTax() {
return this.tableauBrazilianTax;
return tableauBrazilianTax;
}
public void setTableauBrazilianTax(String tableauBrazilianTax) {
this.tableauBrazilianTax = tableauBrazilianTax;
}
public String getTableauOtherTaxAnalysis() {
return tableauOtherTaxAnalysis;
}
public void setTableauOtherTaxAnalysis(String tableauOtherTaxAnalysis) {
this.tableauOtherTaxAnalysis = tableauOtherTaxAnalysis;
}
}
\ No newline at end of file
atms-web/src/main/java/pwc/taxtech/atms/web/controller/OrangeHeapController.java
View file @ 6b1c5b2b
......@@ -20,72 +20,104 @@ public class OrangeHeapController {
@Resource
private OrangeHeapService tableauService;
//以上是示范代码
//TODO 加入其他图表
// 模板
// @ResponseBody
// @GetMapping("taxComparison")
// public ApiResultDto getTaxComparison() {
// return ApiResultDto.success(tableauService.getTaxComparison().orElse(StringUtils.EMPTY));
// }
@ResponseBody
@GetMapping("unreturnedTax")
public ApiResultDto getUnreturnedTax() {
return ApiResultDto.success(tableauService.getUnreturnedTax().orElse(StringUtils.EMPTY));
@GetMapping("getTableauTaxCategoryUnreturnedTax")
public ApiResultDto getTableauTaxCategoryUnreturnedTax() {
return ApiResultDto.success(tableauService.getTableauTaxCategoryUnreturnedTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("getTableauDistrictUnreturnedTax")
public ApiResultDto getTableauDistrictUnreturnedTax() {
return ApiResultDto.success(tableauService.getTableauDistrictUnreturnedTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("getTableauUnreturnedAndReturnedTax")
public ApiResultDto getTableauUnreturnedAndReturnedTax() {
return ApiResultDto.success(tableauService.getTableauUnreturnedAndReturnedTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("getTableauCostAnalysis")
public ApiResultDto getTableauCostAnalysis() {
return ApiResultDto.success(tableauService.getTableauCostAnalysis().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("getTableauDistrictProfitAndLoss")
public ApiResultDto getTableauDistrictProfitAndLoss() {
return ApiResultDto.success(tableauService.getTableauDistrictProfitAndLoss().orElse(StringUtils.EMPTY));
}
//以上是示范代码
//TODO 加入其他图表
@ResponseBody
@GetMapping("taxComparison")
public ApiResultDto getTaxComparison() {
return ApiResultDto.success(tableauService.getTaxComparison().orElse(StringUtils.EMPTY));
@GetMapping("getTableauCompanyProfitAndLoss")
public ApiResultDto getTableauCompanyProfitAndLoss() {
return ApiResultDto.success(tableauService.getTableauCompanyProfitAndLoss().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("otherCountries")
public ApiResultDto getOtherCountries() {
return ApiResultDto.success(tableauService.getOtherCountries().orElse(StringUtils.EMPTY));
@GetMapping("getTableauDriverAndEmployee")
public ApiResultDto getTableauDriverAndEmployee() {
return ApiResultDto.success(tableauService.getTableauDriverAndEmployee().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("costAnalysis")
public ApiResultDto getCostAnalysis() {
return ApiResultDto.success(tableauService.getCostAnalysis().orElse(StringUtils.EMPTY));
@GetMapping("getTableauGmvAndSubsidy")
public ApiResultDto getTableauGmvAndSubsidy() {
return ApiResultDto.success(tableauService.getTableauGmvAndSubsidy().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("profitAndLoss")
public ApiResultDto getProfitAndLoss() {
return ApiResultDto.success(tableauService.getProfitAndLoss().orElse(StringUtils.EMPTY));
@GetMapping("getTableauFileArrangement")
public ApiResultDto getTableauFileArrangement() {
return ApiResultDto.success(tableauService.getTableauFileArrangement().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("otherDomesticData")
public ApiResultDto getOtherDomesticData() {
return ApiResultDto.success(tableauService.getOtherDomesticData().orElse(StringUtils.EMPTY));
@GetMapping("getTableauGlobalOverview")
public ApiResultDto getTableauGlobalOverview() {
return ApiResultDto.success(tableauService.getTableauGlobalOverview().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("docSituation")
public ApiResultDto getDocSituation() {
return ApiResultDto.success(tableauService.getDocSituation().orElse(StringUtils.EMPTY));
@GetMapping("getTableauGlobalBusiness")
public ApiResultDto getTableauGlobalBusiness() {
return ApiResultDto.success(tableauService.getTableauGlobalBusiness().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("globalOverview")
public ApiResultDto getGlobalOverview() {
return ApiResultDto.success(tableauService.getGlobalOverview().orElse(StringUtils.EMPTY));
@GetMapping("getTableauMexicanTax")
public ApiResultDto getTableauMexicanTax() {
return ApiResultDto.success(tableauService.getTableauMexicanTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("mexicanTax")
public ApiResultDto getMexicanTax() {
return ApiResultDto.success(tableauService.getMexicanTax().orElse(StringUtils.EMPTY));
@GetMapping("getTableauAustralianTax")
public ApiResultDto getTableauAustralianTax() {
return ApiResultDto.success(tableauService.getTableauAustralianTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("australianTax")
public ApiResultDto getAustralianTax() {
return ApiResultDto.success(tableauService.getAustralianTax().orElse(StringUtils.EMPTY));
@GetMapping("getTableauBrazilianTax")
public ApiResultDto getTableauBrazilianTax() {
return ApiResultDto.success(tableauService.getTableauBrazilianTax().orElse(StringUtils.EMPTY));
}
@ResponseBody
@GetMapping("brazilianTax")
public ApiResultDto getBrazilianTax() {
return ApiResultDto.success(tableauService.getBrazilianTax().orElse(StringUtils.EMPTY));
@GetMapping("getTableauOtherTaxAnalysis")
public ApiResultDto getTableauOtherTaxAnalysis() {
return ApiResultDto.success(tableauService.getTableauOtherTaxAnalysis().orElse(StringUtils.EMPTY));
}
}
atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java
View file @ 6b1c5b2b
......@@ -46,73 +46,87 @@ public class OrangeHeapService {
return Optional.empty();
}
public Optional<String> getUnreturnedTax() {
//税种未返还税金
// public Optional<String> getTableauTaxCategoryUnreturnedTax() {
// Optional<String> optional = Optional.of("admin");
// return optional.map(s -> String.format(systemConfig.getTableauTaxCategoryUnreturnedTax(),
// getTicket(s).orElse(StringUtils.EMPTY)));
// }
public Optional<String> getTableauTaxCategoryUnreturnedTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauTaxCategoryUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
return optional.map(s -> String.format(systemConfig.getTableauUnreturnedTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
public Optional<String> getTableauDistrictUnreturnedTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauDistrictUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
//TODO 加入其他图表
public Optional<String> getTableauUnreturnedAndReturnedTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauUnreturnedAndReturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getTaxComparison() {
public Optional<String> getTableauCostAnalysis() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauTaxComparison(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getOtherCountries() {
public Optional<String> getTableauDistrictProfitAndLoss() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauOtherCountries(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauDistrictProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getCostAnalysis() {
public Optional<String> getTableauCompanyProfitAndLoss() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauCompanyProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getProfitAndLoss() {
public Optional<String> getTableauDriverAndEmployee() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauProfitAndLoss(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauDriverAndEmployee(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getOtherDomesticData() {
public Optional<String> getTableauGmvAndSubsidy() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauOtherDomesticData(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauGmvAndSubsidy(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getDocSituation() {
public Optional<String> getTableauFileArrangement() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauDocSituation(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauFileArrangement(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getGlobalOverview() {
public Optional<String> getTableauGlobalOverview() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getMexicanTax() {
public Optional<String> getTableauGlobalBusiness() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauGlobalBusiness(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getAustralianTax() {
public Optional<String> getTableauMexicanTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getBrazilianTax() {
public Optional<String> getTableauAustralianTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(),
getTicket(s).orElse(StringUtils.EMPTY)));
return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getTableauBrazilianTax() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
}
public Optional<String> getTableauOtherTaxAnalysis() {
Optional<String> optional = Optional.of("admin");
return optional.map(s -> String.format(systemConfig.getTableauOtherTaxAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
}
}
atms-web/src/main/resources/conf.properties
View file @ 6b1c5b2b
......@@ -23,15 +23,36 @@ longi_api_basic_pwd=${longi_api_basic_pwd}
longi_api_gl_balance=${longi_api_gl_balance}
#tableau config
tableau_get_ticket=${tableau_get_ticket}
tableau_unreturned_tax=${tableau_unreturned_tax}
tableau_tax_comparison=${tableau_tax_comparison}
tableau_other_countries=${tableau_other_countries}
tableau_tax_category_unreturned_tax=${tableau_tax_category_unreturned_tax}
tableau_district_unreturned_tax=${tableau_district_unreturned_tax}
tableau_unreturned_and_returned_tax=${tableau_unreturned_and_returned_tax}
tableau_cost_analysis=${tableau_cost_analysis}
tableau_profit_and_loss=${tableau_profit_and_loss}
tableau_other_domestic_data=${tableau_other_domestic_data}
tableau_doc_situation=${tableau_doc_situation}
tableau_district_profit_and_loss=${tableau_district_profit_and_loss}
tableau_company_profit_and_loss=${tableau_company_profit_and_loss}
tableau_driver_and_employee=${tableau_driver_and_employee}
tableau_gmv_and_subsidy=${tableau_gmv_and_subsidy}
tableau_file_arrangement=${tableau_file_arrangement}
tableau_global_overview=${tableau_global_overview}
tableau_global_business=${tableau_global_business}
tableau_mexican_tax=${tableau_mexican_tax}
tableau_australian_tax=${tableau_australian_tax}
tableau_brazilian_tax=${tableau_brazilian_tax}
tableau_other_tax_analysis=${tableau_other_tax_analysis}
#tableau_get_ticket=${tableau_get_ticket}
#tableau_unreturned_tax=${tableau_unreturned_tax}
#tableau_tax_comparison=${tableau_tax_comparison}
#tableau_other_countries=${tableau_other_countries}
#tableau_cost_analysis=${tableau_cost_analysis}
#tableau_profit_and_loss=${tableau_profit_and_loss}
#tableau_other_domestic_data=${tableau_other_domestic_data}
#tableau_doc_situation=${tableau_doc_situation}
#tableau_global_overview=${tableau_global_overview}
#tableau_mexican_tax=${tableau_mexican_tax}
#tableau_australian_tax=${tableau_australian_tax}
#tableau_brazilian_tax=${tableau_brazilian_tax}
\ No newline at end of file
atms-web/src/main/resources/conf_profile_dev.properties
View file @ 6b1c5b2b
......@@ -22,14 +22,63 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
#业务线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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
atms-web/src/main/resources/conf_profile_pub.properties
View file @ 6b1c5b2b
......@@ -22,14 +22,48 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
#业务线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_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_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_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_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_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_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_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
atms-web/src/main/resources/conf_profile_staging.properties
View file @ 6b1c5b2b
......@@ -23,14 +23,48 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
#业务线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_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_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_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_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_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_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_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
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 6b1c5b2b
......@@ -22,14 +22,48 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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
#业务线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_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_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_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_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_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_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_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
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 6b1c5b2b
......@@ -924,5 +924,6 @@
"false": "否",
"ConditionColumnNum": "条件列",
"Condition": "查询条件",
"Cancel4Tax": "取消",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ 6b1c5b2b
......@@ -185,7 +185,7 @@
<!--<div class="modal-footer">
<button type="submit" class="btn btn-primary" translate="Confirm"
></button>&lt;!&ndash;ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"&ndash;&gt;
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" translate="Cancel"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" translate="Cancel4Tax"></button>
</div>-->
<div style="margin-bottom: 20px;">
<center>
......@@ -193,7 +193,7 @@
></button>
<!--ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"-->
<button type="button" class="btn btn-third" data-dismiss="modal"
ng-click="cancelDocFileType()" translate="Cancel"></button>
ng-click="cancelDocFileType()" translate="Cancel4Tax"></button>
</center>
</div>
</form>
......
atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js
View file @ 6b1c5b2b
......@@ -29,8 +29,8 @@ frameworkModule.controller('appUsrOperateLogController',
SweetAlert.warning("没有数据可以下载");
return;
}
$scope.thisModuleId=[];//清空查询id
$scope.dataGridUpdate(data);
$scope.thisModuleId=[];//清空查询id
})
};
// $scope.sniffHelpPopRadio = function(){
......@@ -206,16 +206,22 @@ frameworkModule.directive('usrLogExportPlugin',function(){
function($scope,SweetAlert,$translate,usrOperateLogService,$q,$log){
$scope.exportTableData = function ()
{
var checkedItems = $(".log-export-checked-item");
// var checkedItems = $(".log-export-checked-item");
var ids = [];
if(checkedItems.length)
/*if(checkedItems.length)
checkedItems.find("span[data-name='logCheckedItem']")
.each(function(index,checkedItem){
var idLike = checkedItem.getAttribute('data-id');
if(idLike || idLike == 0){
ids.push(idLike);
}
});
});*/
var datas=$scope.localData;
for(var i=0;i<datas.length;i++){
if(datas[i].id){
ids.push(datas[i].id);
}
}
usrOperateLogService[$scope.thisModuleName + "Export"]({
"ids":ids
}).then(function (data, status, headers) {
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 6b1c5b2b
......@@ -18,7 +18,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
};
$scope.localData = null;
$scope.loadMainData = function () {
checkReminder();
$scope.queryFieldModel.currentPage = $scope.pagingOptions.pageIndex;
$scope.queryFieldModel.pageSize = $scope.pagingOptions.pageSize;
......@@ -51,6 +51,36 @@ taxDocumentManageModule.controller('taxDocumentListController',
})
};
function checkReminder(){
var items=$scope.queryFieldModel;
var message="";
if (!PWC.isNullOrEmpty(items.fileBeginTime) && !PWC.isNullOrEmpty(items.fileEndTTime) &&
items.fileBeginTime > items.fileEndTTime)
{
message+=$translate.instant('AvailabilityDate')+",";
}
if (!PWC.isNullOrEmpty(items.ownBeginTime) && !PWC.isNullOrEmpty(items.ownEndTime) &&
items.ownBeginTime > items.ownEndTime)
{
message+=$translate.instant('Duration')+",";
}
if (!PWC.isNullOrEmpty(items.effectiveBeginTime) && !PWC.isNullOrEmpty(items.effectiveEndTime) &&
items.effectiveBeginTime > items.effectiveEndTime)
{
message+=$translate.instant('DueDate')+",";
}
if (!PWC.isNullOrEmpty(items.uploadBeginTime) && !PWC.isNullOrEmpty(items.uploadEndTime) &&
items.uploadBeginTime > items.uploadEndTime)
{
message+=$translate.instant('UploadDate')+",";
}
if(message){
message = (message.substring(message.length - 1) == ',') ? message.substring(0, message.length - 1) : message;
message+="-"+$translate.instant('DateWarningSearch');
window.swal(message);
return;
}
}
$scope.dataGridUpdate = function (_data) {
$scope.localData = _data.list;
$scope.pagingOptions.pageIndex = _data.pageNo;
......@@ -1827,7 +1857,7 @@ taxDocumentManageModule.directive('tempModule', function () {
$scope.checkedItemIds = [];
$scope.sniffCheckbox = function () {
$scope.checkedItemIds.length = 0;
$("input[name='dataGridCheckBox']").each(function (index, item) {
$("tr td[name='logCheckedItem']").each(function (index, item) {
if (item.checked) {
var cellId = $(item).attr("data-id");
$scope.checkedItemIds.push(cellId);
......@@ -1938,6 +1968,8 @@ taxDocumentManageModule.directive('tempModule', function () {
result = 1;
}else if(src === $translate.instant('ApprovalReject')){
result = -1;
}else{
result="";
}
return result;
};
......@@ -1950,6 +1982,8 @@ taxDocumentManageModule.directive('tempModule', function () {
result = $translate.instant('ApprovalPass');
}else if(src == -1){
result = $translate.instant('ApprovalReject');
}else{
result="";
}
return result;
};
......@@ -2068,7 +2102,15 @@ taxDocumentManageModule.directive('exportPlugin',function(){
$scope.queryFieldModel.currentPage = $scope.pagingOptions.pageIndex;
$scope.queryFieldModel.pageSize = $scope.pagingOptions.pageSize;
var delIDs = [];
$("input[name='dataGridCheckBox']").each(function (index, tdCell) {
if (tdCell.checked) {
var cellId = $(tdCell).attr('data-id');
delIDs.push(cellId);
}
});
var params = angular.copy($scope.queryFieldModel);
params.ids=delIDs;
params.fileBeginTime = getQueryDate(params.fileBeginTime,"-");
params.fileEndTTime = getQueryDate(params.fileEndTTime,"-");
params.ownBeginTime = getQueryDate(params.ownBeginTime,"-");
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 6b1c5b2b
......@@ -897,7 +897,7 @@
<div class="modal-footer">
<button type="submit" class="btn btn-primary" translate="Confirm"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel"></button>
translate="Cancel4Tax"></button>
</div>
</form>
</div>
......@@ -1146,7 +1146,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit_handmade()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()"
translate="Cancel"></button>
translate="Cancel4Tax"></button>
</div>
</form>
</div>
......@@ -1391,7 +1391,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel"></button>
translate="Cancel4Tax"></button>
</div>
</form>
</div>
......@@ -1444,7 +1444,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button>
<button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel"></button>
<button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel4Tax"></button>
</div>
</div>
</div>
......@@ -1465,7 +1465,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-primary" translate="Confirm" ng-click="sniffHelpPopRadio()"></button>
<button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
translate="Cancel"></button>
translate="Cancel4Tax"></button>
</div>
</div>
</div>
......
atms-web/src/main/webapp/orangeweb/index.html
View file @ 6b1c5b2b
<!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.224d7e8d.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.224d7e8d.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.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
atms-web/src/main/webapp/orangeweb/js/app.7e09d0db.js.map 0 → 100644
View file @ 6b1c5b2b
This diff is collapsed.
atms-web/src/test/draft.properties 0 → 100644
View file @ 6b1c5b2b
#tableau_tax_category_unreturned_tax
#tableau_district_unreturned_tax
#tableau_unreturned_and_returned_tax
#tableau_cost_analysis
#tableau_district_profit_and_loss
#tableau_company_profit_and_loss
#tableau_driver_and_employee
#tableau_gmv_and_subsidy
#tableau_file_arrangement
#tableau_global_overview
#tableau_global_business
#tableau_mexican_tax
#tableau_australian_tax
#tableau_brazilian_tax
#tableau_other_tax_analysis
#
#
#
#
#
#
#
#
#
#
#tableauTaxCategoryUnreturnedTax
#tableauDistrictUnreturnedTax
#tableauUnreturnedAndReturnedTax
#tableauCostAnalysis
#tableauDistrictProfitAndLoss
#tableauCompanyProfitAndLoss
#tableauDriverAndEmployee
#tableauGmvAndSubsidy
#tableauFileArrangement
#tableauGlobalOverview
#tableauGlobalBusiness
#tableauMexicanTax
#tableauAustralianTax
#tableauBrazilianTax
#tableauOtherTaxAnalysis
#
#
#
#
#getTableauTaxCategoryUnreturnedTax
#getTableauDistrictUnreturnedTax
#getTableauUnreturnedAndReturnedTax
#getTableauCostAnalysis
#getTableauDistrictProfitAndLoss
#getTableauCompanyProfitAndLoss
#getTableauDriverAndEmployee
#getTableauGmvAndSubsidy
#getTableauFileArrangement
#getTableauGlobalOverview
#getTableauGlobalBusiness
#getTableauMexicanTax
#getTableauAustralianTax
#getTableauBrazilianTax
#getTableauOtherTaxAnalysis
#
#
#
#tableauOperation("getTableauTaxCategoryUnreturnedTax")
#tableauOperation("getTableauDistrictUnreturnedTax")
#tableauOperation("getTableauUnreturnedAndReturnedTax")
#tableauOperation("getTableauCostAnalysis")
#tableauOperation("getTableauDistrictProfitAndLoss")
#tableauOperation("getTableauCompanyProfitAndLoss")
#tableauOperation("getTableauDriverAndEmployee")
#tableauOperation("getTableauGmvAndSubsidy")
#tableauOperation("getTableauFileArrangement")
#tableauOperation("getTableauGlobalOverview")
#tableauOperation("getTableauGlobalBusiness")
#tableauOperation("getTableauMexicanTax")
#tableauOperation("getTableauAustralianTax")
#tableauOperation("getTableauBrazilianTax")
#tableauOperation("getTableauOtherTaxAnalysis")
#
#
#
##税种未返还税金
#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_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_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_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_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_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_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
#
##业务线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_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_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_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_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_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_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_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
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