Skip to content

T
traffic-front
Commit 9b09dfab authored by zhkwei's avatar zhkwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

parents c5dca341 0f75f8dc
Show whitespace changes
Inline Side-by-side
Showing with 649 additions and 194 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
View file @ 9b09dfab
......@@ -4,7 +4,7 @@ public class ErrorMessage {
public static final String SaveFileError = "SaveFileError";
public static final String ParamError = "Param Error";
public static final String SystemError = "SystemError";
public static final String SystemError = "系统错误";
public static final String NoFile = "NoFile";
public static final String DidntSelectedCompany = "Didn't Selected Company";
public static final String DidntSelectedPeriod = "Didn't Selected period";
......
atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
View file @ 9b09dfab
......@@ -59,6 +59,7 @@ public class SpringContextUtil implements ApplicationContextAware {
public static AdjustmentTableMapper adjustmentTableMapper;
public static TrialBalanceFinalMapper trialBalanceFinalMapper;
public static ProfitLossStatementMapper profitLossStatementMapper;
public static RevenueConfigMapper revenueConfigMapper;
public static RevenueTypeMappingMapper revenueTypeMappingMapper;
public static InvoiceRecordMapper invoiceRecordMapper;
public static CertifiedInvoicesListMapper certifiedInvoicesListMapper;
......@@ -148,6 +149,7 @@ public class SpringContextUtil implements ApplicationContextAware {
invoiceRecordMapper = webApplicationContext.getBean(InvoiceRecordMapper.class);
certifiedInvoicesListMapper = webApplicationContext.getBean(CertifiedInvoicesListMapper.class);
trialBalanceMappingMapper = webApplicationContext.getBean(TrialBalanceMappingMapper.class);
revenueConfigMapper = webApplicationContext.getBean(RevenueConfigMapper.class);
/* map.put("balance_sheet", balanceMapper);
map.put("profit_loss_statement",profitLossStatementMapper);
map.put("cash_flow", cashFlowMapper);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java
View file @ 9b09dfab
......@@ -350,7 +350,7 @@ public class ReportController {
* 批量导出利润表
*/
@RequestMapping("manyExport")
public OperationResultDto manyExport(@RequestBody RequestParameterDto requestParameterDto, HttpServletResponse response, HttpServletRequest request) {
public OperationResultDto manyExport(@RequestBody RequestParameterDto requestParameterDto, HttpServletResponse response, HttpServletRequest request) throws Exception {
OperationResultDto operationResultDto = new OperationResultDto();
String zipName = "利润表";
try {
......
atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java
View file @ 9b09dfab
......@@ -42,6 +42,27 @@ public class BillDetailResult implements Serializable {
@JsonSerialize(using = PwCIdSerialize.class)
private Long revenueCofId;
@JsonSerialize(using = PwCIdSerialize.class)
private Long modifyRevenueCofId;
private String modifyRevenueCofName;
public Long getModifyRevenueCofId() {
return modifyRevenueCofId;
}
public void setModifyRevenueCofId(Long modifyRevenueCofId) {
this.modifyRevenueCofId = modifyRevenueCofId;
}
public String getModifyRevenueCofName() {
return modifyRevenueCofName;
}
public void setModifyRevenueCofName(String modifyRevenueCofName) {
this.modifyRevenueCofName = modifyRevenueCofName;
}
private Integer emptyCode;
public Long getId() {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 9b09dfab
......@@ -11,7 +11,6 @@ import pwc.taxtech.atms.analysis.entity.*;
import pwc.taxtech.atms.common.message.ErrorMessage;
import pwc.taxtech.atms.common.message.ErrorMessageCN;
import pwc.taxtech.atms.common.util.DateUtils;
import pwc.taxtech.atms.constant.Constant;
import pwc.taxtech.atms.constant.TemplateHeaderCheck;
import pwc.taxtech.atms.constant.enums.EnumAnalysisExpTempPath;
import pwc.taxtech.atms.constant.enums.EnumAnalysisImportType;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/BillDetailService.java
View file @ 9b09dfab
......@@ -21,22 +21,32 @@ public class BillDetailService extends BaseService {
private InvoiceRecordMapper invoiceRecordMapper;
public PageInfo<BillDetailResult> queryPage(BillDetailParam param) {
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<BillDetailDto> dataList = invoiceRecordMapper.queryBillWithRevenueConf(param.getBillType(), param.getCustomer(), param.getBillNumber(), param.getRevenueCofId(), param.getBillContent(), param.getDepartment(), param.getBillTaxRat(), param.getBillDate(), param.getProjectId(), param.getPeriod(), param.getQueryDate());
PageInfo<BillDetailResult> pageInfo = new PageInfo<>(dataList.stream()
.map(o -> beanUtil.copyProperties(o, new BillDetailResult())).collect(Collectors.toList()));
.map(o -> {
BillDetailResult detailResult = new BillDetailResult();
beanUtil.copyProperties(o, detailResult);
if (detailResult.getModifyRevenueCofId() != null) {
detailResult.setRevenueCofId(detailResult.getModifyRevenueCofId());
detailResult.setRevenueConfName(detailResult.getModifyRevenueCofName());
}
return detailResult;
}).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal());
return pageInfo;
}
public List<String> queryBillTypeGroupBy(String projectId,Integer period){
return invoiceRecordMapper.queryBillTypeGroupBy(projectId,period);
public List<String> queryBillTypeGroupBy(String projectId, Integer period) {
return invoiceRecordMapper.queryBillTypeGroupBy(projectId, period);
}
public void updateBillDetail(InvoiceRecord billDetail) {
if (billDetail.getRevenueCofId() != null && billDetail.getId() != null) {
billDetail.setModifyRevenueCofId(billDetail.getRevenueCofId());
invoiceRecordMapper.updateByPrimaryKeySelective(billDetail);
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 9b09dfab
package pwc.taxtech.atms.service.impl;
import java.util.Date;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
......@@ -37,7 +35,6 @@ import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.dataimport.DataImportAllParam;
import pwc.taxtech.atms.dto.dataimport.DataImportParam;
import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
import pwc.taxtech.atms.dto.ebsdto.EbsCallRateResp;
import pwc.taxtech.atms.dto.ebsdto.EbsCallResp;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceDto;
import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
......@@ -324,7 +321,7 @@ public class DataImportService extends BaseService {
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
for (int j = 11; j < sheet.getLastRowNum(); j++) {
for (int j = 11; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
ProfitLossStatement pl = new ProfitLossStatement();
pl.setId(plId);
......@@ -498,7 +495,7 @@ public class DataImportService extends BaseService {
String dataDateStr = getCellStringValue(sheet.getRow(0).getCell(4)).substring(3).replace(" ", "");
SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyyHH:mm:ss");
Date dataDate = sdf.parse(dataDateStr);
for (int j = 11; j < sheet.getLastRowNum(); j++) {
for (int j = 11; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
BalanceSheet bl = new BalanceSheet();
bl.setId(plId);
......@@ -646,7 +643,7 @@ public class DataImportService extends BaseService {
continue;
}
for (int j = 6; j < sheet.getLastRowNum(); j++) {
for (int j = 6; j <= sheet.getLastRowNum(); j++) {
Long id = idService.nextId();
CashFlow cf = new CashFlow();
cf.setId(id);
......@@ -1326,7 +1323,7 @@ public class DataImportService extends BaseService {
continue;
}
String unit = getCellStringValue(sheet.getRow(1).getCell(11)).replace(" ", "").substring(3);
for (int j = 3; j < sheet.getLastRowNum(); j++) {
for (int j = 3; j <= sheet.getLastRowNum(); j++) {
Long plId = idService.nextId();
CertifiedInvoicesList cil = new CertifiedInvoicesList();
cil.setId(plId);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TaxDocumentServiceImpl.java
View file @ 9b09dfab
......@@ -201,12 +201,12 @@ public class TaxDocumentServiceImpl {
taxDocument.setCreatorId(authUserHelper.getCurrentUserId());
taxDocument.setUploadTime(new Date());
taxDocument.setYearRedundancy(Calendar.getInstance().get(Calendar.YEAR));
int num = taxDocumentMapper.insert(taxDocument);
//根据公司Id 设置业务线
String businessLine = organizationService.queryBusinessByCompanyId(taxDocument.getCompanyId());
if (StringUtils.isNotBlank(businessLine)) {
taxDocument.setBusinessLine(businessLine);
}
int num = taxDocumentMapper.insert(taxDocument);
if (num > 0) {
OperationLogTaxDocument actionEntity = buildOperationLogTaxDocument();
actionEntity.setId(taxDocument.getId().toString());
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateServiceImpl.java
View file @ 9b09dfab
......@@ -260,23 +260,26 @@ public class TemplateServiceImpl extends AbstractService {
String path = "";
if (templateDb != null) {
TemplateExample example = new TemplateExample();
example.createCriteria().andCodeEqualTo(templateDb.getCode()).andIdEqualTo(templateDb.getId()).andIsActiveAssociationEqualTo(false);
long count = templateMapper.countByExample(example);
if (count > 0) {
path = templateDb.getPath();
//物理删除
deleteIsAtiveAssociation(templateDb);
} else {
if (param.isDeletePermanent() && !templateDb.getIsSystemType()) {
// TemplateExample example = new TemplateExample();
// example.createCriteria().andCodeEqualTo(templateDb.getCode()).andIdEqualTo(templateDb.getId()).andIsActiveAssociationEqualTo(false);
path = templateDb.getPath();
//物理删除
deleteIsAtiveAssociation(templateDb);
} else {
//逻辑删除
logicDeleteIsActiveAssociation(templateDb);
}
}
// long count = templateMapper.countByExample(example);
// if (count > 0) {
// path = templateDb.getPath();
// //物理删除
// deleteIsAtiveAssociation(templateDb);
// } else {
// if (param.isDeletePermanent() && !templateDb.getIsSystemType()) {
// path = templateDb.getPath();
// //物理删除
// deleteIsAtiveAssociation(templateDb);
// } else {
// //逻辑删除
// logicDeleteIsActiveAssociation(templateDb);
// }
// }
}
result.setResult(true);
......@@ -406,10 +409,16 @@ public class TemplateServiceImpl extends AbstractService {
}
private void deleteIsAtiveAssociation(Template templateDb) {
if(templateDb.getId() == null){
return;
}
cellTemplateConfigMapper.deleteCellTemplateConfigByCellTemplate(templateDb.getId());
keyValueReferenceMapper.deleteKeyValueReferenceByCellTemplate(templateDb.getId());
CellTemplateExample example = new CellTemplateExample();
example.createCriteria().andReportTemplateIdEqualTo(templateDb.getId());
cellTemplateMapper.deleteByExample(example);
TemplateExample templateExample = new TemplateExample();
templateExample.createCriteria().andIdEqualTo(templateDb.getId());
templateMapper.deleteByExample(templateExample);
}
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 9b09dfab
......@@ -9,7 +9,6 @@ import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
......@@ -56,7 +55,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.math.BigDecimal;
import java.net.URISyntaxException;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
......@@ -307,7 +305,7 @@ public class ReportServiceImpl extends BaseService {
private void updateConfig(String projectId, Integer period, Boolean isMergeManualData, List<Template> templates, PeriodJob job) {
List<Long> exceptTemplateIds = templateMapper.getIdsForExceptTemplate();
//根据收入类型映射生成开票记录关联数据
assembleInvoiceRecord(projectId, period);
assembleInvoiceRecord(projectId, period,isMergeManualData);
//生成trial_balance_final数据
assembleTrialBalanceFinal(projectId, period);
clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
......@@ -335,7 +333,7 @@ public class ReportServiceImpl extends BaseService {
trialBalanceFinalMapper.generateFinalData(projectId, Integer.valueOf(queryPeriod), lastProject == null ? "0" : lastProject.getId(), Integer.valueOf(lastPeriod));
}
public void assembleInvoiceRecord(String projectId, Integer period) {
public void assembleInvoiceRecord(String projectId, Integer period,Boolean isMergeManualData) {
Project project = projectMapper.selectByPrimaryKey(projectId);
MyAsserts.assertNotNull(project, Exceptions.NOT_FOUND_REPORT_EXCEPTION);
String queryDate = project.getYear() + "-" + (period < 10 ? ("0" + period) : (period + ""));
......@@ -344,6 +342,17 @@ 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).
andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
invoiceRecordMapper.deleteByExample(delExample);
Map<String, Long> map = new HashMap<>();
for (RevenueTypeMapping mapping : mappingList) {
if (!map.containsKey(mapping.getContent())) {
......@@ -873,9 +882,9 @@ public class ReportServiceImpl extends BaseService {
} else if (3 == config.getTaxBase()) {//手工录入
} else if (4 == config.getTaxBase()) {//借方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("JFFS(\"" + config.getBaseDrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
} else if (5 == config.getTaxBase()) {//贷方发生额
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getTbSegment3() + "\"," + project.getYear() + "," + period + ",1,,)");
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("DFFS(\"" + config.getBaseCrCode() + "\"," + project.getYear() + "," + period + ",1,,)");
} else {
row.getCell(TaxesCalculateReportEnum.Column.Column_9.getIndex()).setCellValue("");
}
......@@ -2329,7 +2338,7 @@ public class ReportServiceImpl extends BaseService {
}
@Autowired
@Resource
private EbitSpreadDataMapper ebitSpreadDataMapper;
public OperationResultDto spreadToDb(RequestParameterDto.EbitParam ebitParam) {
......@@ -2380,7 +2389,7 @@ public class ReportServiceImpl extends BaseService {
*
* @param requestParameterDto
*/
public void manyExport(RequestParameterDto requestParameterDto, String zipFileName, HttpServletRequest request, HttpServletResponse response, String zipPath) throws URISyntaxException {
public void manyExport(RequestParameterDto requestParameterDto, String zipFileName, HttpServletRequest request, HttpServletResponse response, String zipPath) throws Exception {
try {
FileOutputStream out = new FileOutputStream(zipFileName);//要输出的文件名字
} catch (FileNotFoundException e) {
......@@ -2416,6 +2425,9 @@ public class ReportServiceImpl extends BaseService {
}
dataList.add(orgTypeList);
}
if(dataList.size() == 0){
throw new Exception("没有可导出的数据");
}
if (template.getIsSystemType()) {
try {
inputStream = new BufferedInputStream(new FileInputStream(templateFile));
......@@ -2465,10 +2477,7 @@ public class ReportServiceImpl extends BaseService {
} catch (IOException e) {
e.printStackTrace();
} catch (InvalidFormatException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
throw new Exception(ErrorMessage.SystemError);
}
}
}
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/KPSR.java
View file @ 9b09dfab
......@@ -12,14 +12,12 @@ import pwc.taxtech.atms.constant.enums.EnumOperationType;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
import pwc.taxtech.atms.constant.enums.KeyValueConfigResultType;
import pwc.taxtech.atms.dto.vatdto.OutputInvoiceDataSourceDto;
import pwc.taxtech.atms.vat.entity.InvoiceRecord;
import pwc.taxtech.atms.vat.entity.InvoiceRecordExample;
import pwc.taxtech.atms.vat.entity.RevenueTypeMapping;
import pwc.taxtech.atms.vat.entity.RevenueTypeMappingExample;
import pwc.taxtech.atms.vat.entity.*;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
......@@ -40,10 +38,10 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
String revenueTypeName = getStringParam(args[0], ec);//收入类型名称
Integer billType = getIntParam(args[1], ec);//发票类型
Integer amountType = getIntParam(args[2], ec);//金额类型
String formulaExpression = "KPSR(\"" + revenueTypeName + "\","+billType+ ","+amountType+")";
String formulaExpression = "KPSR(\"" + revenueTypeName + "\"," + billType + "," + amountType + ")";
logger.debug(formulaExpression);
List<OutputInvoiceDataSourceDto> dataSource = new ArrayList<>();
double result = assembleData(revenueTypeName,dataSource,billType,amountType,ec);
double result = assembleData(revenueTypeName, dataSource, billType, amountType, ec);
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource), FormulaDataSourceDetailType.OutputInvoiceDataSourceDto, new BigDecimal(result), formulaContext.getPeriod(),
formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
saveFormulaBlock(formulaContext.getPeriod(), ec, formulaExpression, new BigDecimal(result), dataSoureId, formulaContext.getProjectId());
......@@ -51,9 +49,9 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
}
private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType,Integer amountType,OperationEvaluationContext ec) {
private double assembleData(String revenueTypeName, List<OutputInvoiceDataSourceDto> contain, Integer billType, Integer amountType, OperationEvaluationContext ec) {
String queryDate = formulaContext.getYear()+(formulaContext.getPeriod()<10?("0"+formulaContext.getPeriod()):(formulaContext.getPeriod()+""));
String queryDate = formulaContext.getYear() + (formulaContext.getPeriod() < 10 ? ("0" + formulaContext.getPeriod()) : (formulaContext.getPeriod() + ""));
RevenueTypeMappingExample typeMappingExample = new RevenueTypeMappingExample();
typeMappingExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId())
.andRevenueTypeNameEqualTo(revenueTypeName).andStartDateLessThanOrEqualTo(queryDate)
......@@ -62,17 +60,43 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
if (CollectionUtils.isEmpty(typeMappingList)) {
return 0.0;
}
List<String> contens = typeMappingList.stream()
.map(o -> o.getContent()).collect(Collectors.toList());
if (CollectionUtils.isEmpty(contens)) {
List<String> revenueTypes = typeMappingList.stream()
.map(o -> o.getRevenueTypeName()).collect(Collectors.toList());
RevenueConfigExample configExample = new RevenueConfigExample();
configExample.createCriteria().andOrgIdEqualTo(formulaContext.getOrganizationId()).andStartDateLessThanOrEqualTo(queryDate)
.andEndDateGreaterThanOrEqualTo(queryDate).andNameIn(revenueTypes);
List<RevenueConfig> configDatas = SpringContextUtil.revenueConfigMapper.selectByExample(configExample);
if (CollectionUtils.isEmpty(configDatas)) {
return 0.0;
}
List<Long> revenueTypeIds = configDatas.stream()
.map(o -> o.getId()).collect(Collectors.toList());
List<InvoiceRecord> billDetails = new ArrayList<>();
InvoiceRecordExample invoiceRecordExample = new InvoiceRecordExample();
InvoiceRecordExample.Criteria c = invoiceRecordExample.createCriteria().andBillingContentIn(contens)
invoiceRecordExample.createCriteria().andRevenueCofIdIn(revenueTypeIds)
.andProjectIdEqualTo(formulaContext.getProjectId())
.andPeriodEqualTo(Integer.valueOf(queryDate))
.andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
List<InvoiceRecord> billDetails1 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
if(CollectionUtils.isNotEmpty(billDetails1)){
Iterator<InvoiceRecord> iterator = billDetails1.iterator();
while (iterator.hasNext()){
if(iterator.next().getModifyRevenueCofId()!=null){
iterator.remove();
}
}
billDetails.addAll(billDetails1);
}
invoiceRecordExample = new InvoiceRecordExample();
invoiceRecordExample.createCriteria().andModifyRevenueCofIdIn(revenueTypeIds)
.andProjectIdEqualTo(formulaContext.getProjectId())
.andPeriodEqualTo(Integer.valueOf(queryDate))
.andInvoiceTypeEqualTo(InvoiceRecordEnum.InvoiceType.MAPPING.get(billType));
List<InvoiceRecord> billDetails = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
List<InvoiceRecord> billDetails2 = SpringContextUtil.invoiceRecordMapper.selectByExample(invoiceRecordExample);
if(CollectionUtils.isNotEmpty(billDetails2)){
billDetails.addAll(billDetails2);
}
for (InvoiceRecord invoiceRecord : billDetails) {
OutputInvoiceDataSourceDto outputInvoiceDataSourceDto = new OutputInvoiceDataSourceDto();
outputInvoiceDataSourceDto.setAmount(FormulaHelper.roundValue(invoiceRecord.getInvoiceAmount(),
......@@ -91,9 +115,9 @@ public class KPSR extends FunctionBase implements FreeRefFunction {
outputInvoiceDataSourceDto.setOperationType(EnumOperationType.Single.getCode());
contain.add(outputInvoiceDataSourceDto);
}
if(InvoiceRecordEnum.AmountType.INVOICE_AMOUNT.getCode().equals(amountType)){
if (InvoiceRecordEnum.AmountType.INVOICE_AMOUNT.getCode().equals(amountType)) {
return billDetails.stream().mapToDouble(a -> a.getInvoiceAmount().doubleValue()).sum();
}else if (InvoiceRecordEnum.AmountType.TAX_AMOUNT.getCode().equals(amountType)){
} else if (InvoiceRecordEnum.AmountType.TAX_AMOUNT.getCode().equals(amountType)) {
return billDetails.stream().mapToDouble(a -> a.getTaxAmount().doubleValue()).sum();
}
return 0;
......
atms-api/src/main/resources/conf/conf_profile_uat.properties
View file @ 9b09dfab
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_user=fintax_user_test
jdbc_password=Fintaxuser@123Test
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_stage
jdbc_password=Fintaxuser@123Stage
#jdbc_password=111111
jdbc_admin_db=taxadmin2018
......@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa
mail_jdbc_password=atmsunittestSQL
web.url=http://dts.erp.didichuxing.com:9001
web.url=http://dts.erp.didichuxing.com
#web.url=*
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
......@@ -31,9 +31,9 @@ max_file_length=104857600
#Distributed ID Generate
distributed_id_datacenter=10
distributed_id_machine=15
distributed_id_machine=16
api.url=http://dts.erp.didichuxing.com:8180
api.url=http://dts.erp.didichuxing.com
# Longi config
longi_api_basic_user=
......@@ -59,7 +59,7 @@ org_sync_token=174af08f
dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
ebs_call_url=http://172.20.3.109:8020/ebs-proxy-test/dts
ebs_call_url=http://172.20.201.201:8020/ebs-proxy-test/dts/glMonthlyBal?pageNum=1&pageSize=1000&ledgerId=2021&companyCode=120200&period=2018-11
#tableau config
tableau_get_ticket=http://47.94.233.173:16010/trusted?username=%s
......
atms-dao/etc/generator-mysql/vatGeneratorConfig.xml
View file @ 9b09dfab
......@@ -45,7 +45,10 @@
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<table tableName="invoice_record" domainObjectName="InvoiceRecord">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
</table>
<!--
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/BillDetailDto.java
View file @ 9b09dfab
......@@ -40,6 +40,26 @@ public class BillDetailDto implements Serializable {
private Integer emptyCode;
private Long modifyRevenueCofId;
private String modifyRevenueCofName;
public Long getModifyRevenueCofId() {
return modifyRevenueCofId;
}
public void setModifyRevenueCofId(Long modifyRevenueCofId) {
this.modifyRevenueCofId = modifyRevenueCofId;
}
public String getModifyRevenueCofName() {
return modifyRevenueCofName;
}
public void setModifyRevenueCofName(String modifyRevenueCofName) {
this.modifyRevenueCofName = modifyRevenueCofName;
}
public Long getId() {
return id;
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecord.java
View file @ 9b09dfab
package pwc.taxtech.atms.vat.entity;
import pwc.taxtech.atms.entity.BaseEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import pwc.taxtech.atms.entity.BaseEntity;
/**
*
......@@ -366,6 +365,17 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
*/
private Long revenueCofId;
/**
* Database Column Remarks:
* 修改后收入类型id
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column invoice_record.modify_revenue_cof_id
*
* @mbg.generated
*/
private Long modifyRevenueCofId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table invoice_record
......@@ -1142,6 +1152,30 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
this.revenueCofId = revenueCofId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column invoice_record.modify_revenue_cof_id
*
* @return the value of invoice_record.modify_revenue_cof_id
*
* @mbg.generated
*/
public Long getModifyRevenueCofId() {
return modifyRevenueCofId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column invoice_record.modify_revenue_cof_id
*
* @param modifyRevenueCofId the value for invoice_record.modify_revenue_cof_id
*
* @mbg.generated
*/
public void setModifyRevenueCofId(Long modifyRevenueCofId) {
this.modifyRevenueCofId = modifyRevenueCofId;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table invoice_record
......@@ -1186,6 +1220,7 @@ public class InvoiceRecord extends BaseEntity implements Serializable {
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", revenueCofId=").append(revenueCofId);
sb.append(", modifyRevenueCofId=").append(modifyRevenueCofId);
sb.append("]");
return sb.toString();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceRecordExample.java
View file @ 9b09dfab
......@@ -2285,6 +2285,66 @@ public class InvoiceRecordExample {
addCriterion("revenue_cof_id not between", value1, value2, "revenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdIsNull() {
addCriterion("modify_revenue_cof_id is null");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdIsNotNull() {
addCriterion("modify_revenue_cof_id is not null");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdEqualTo(Long value) {
addCriterion("modify_revenue_cof_id =", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdNotEqualTo(Long value) {
addCriterion("modify_revenue_cof_id <>", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdGreaterThan(Long value) {
addCriterion("modify_revenue_cof_id >", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdGreaterThanOrEqualTo(Long value) {
addCriterion("modify_revenue_cof_id >=", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdLessThan(Long value) {
addCriterion("modify_revenue_cof_id <", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdLessThanOrEqualTo(Long value) {
addCriterion("modify_revenue_cof_id <=", value, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdIn(List<Long> values) {
addCriterion("modify_revenue_cof_id in", values, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdNotIn(List<Long> values) {
addCriterion("modify_revenue_cof_id not in", values, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdBetween(Long value1, Long value2) {
addCriterion("modify_revenue_cof_id between", value1, value2, "modifyRevenueCofId");
return (Criteria) this;
}
public Criteria andModifyRevenueCofIdNotBetween(Long value1, Long value2) {
addCriterion("modify_revenue_cof_id not between", value1, value2, "modifyRevenueCofId");
return (Criteria) this;
}
}
/**
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CellTemplateConfigExtendsMapper.xml
View file @ 9b09dfab
......@@ -13,10 +13,10 @@
</select>
<delete id="deleteCellTemplateConfigByCellTemplate" parameterType="java.lang.Long">
DELETE FROM cell_template_config A
DELETE FROM cell_template_config
WHERE
id IN (SELECT
id
X.id
FROM
(SELECT
B.id
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/KeyValueReferenceExtendsMapper.xml
View file @ 9b09dfab
......@@ -5,11 +5,11 @@
<delete id="deleteKeyValueReferenceByCellTemplate" parameterType="java.lang.Long">
delete
FROM
key_value_reference a
key_value_reference
WHERE
id IN (
SELECT
id
x.id
FROM
(
SELECT
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InvoiceRecordMapper.xml
View file @ 9b09dfab
......@@ -38,6 +38,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="revenue_cof_id" jdbcType="BIGINT" property="revenueCofId" />
<result column="modify_revenue_cof_id" jdbcType="BIGINT" property="modifyRevenueCofId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -115,7 +116,7 @@
oa_application_num, contract_no, contract_amount, department, application_date, billing_date,
billing_month, invoice_code, invoice_num, invoices_amount, customer_company_tax_num,
contract_source_system, tax_rate, tax_amount, invoice_status, remarks, create_time,
update_time, revenue_cof_id
update_time, revenue_cof_id, modify_revenue_cof_id
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultMap="BaseResultMap">
<!--
......@@ -178,7 +179,8 @@
invoice_num, invoices_amount, customer_company_tax_num,
contract_source_system, tax_rate, tax_amount,
invoice_status, remarks, create_time,
update_time, revenue_cof_id)
update_time, revenue_cof_id, modify_revenue_cof_id
)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{tmsPeriod,jdbcType=INTEGER}, #{period,jdbcType=INTEGER}, #{seqNo,jdbcType=INTEGER},
#{source,jdbcType=VARCHAR}, #{billingBody,jdbcType=VARCHAR}, #{customerCompanyName,jdbcType=VARCHAR},
......@@ -189,7 +191,8 @@
#{invoiceNum,jdbcType=VARCHAR}, #{invoicesAmount,jdbcType=INTEGER}, #{customerCompanyTaxNum,jdbcType=VARCHAR},
#{contractSourceSystem,jdbcType=VARCHAR}, #{taxRate,jdbcType=DECIMAL}, #{taxAmount,jdbcType=DECIMAL},
#{invoiceStatus,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{revenueCofId,jdbcType=BIGINT})
#{updateTime,jdbcType=TIMESTAMP}, #{revenueCofId,jdbcType=BIGINT}, #{modifyRevenueCofId,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecord">
<!--
......@@ -294,6 +297,9 @@
<if test="revenueCofId != null">
revenue_cof_id,
</if>
<if test="modifyRevenueCofId != null">
modify_revenue_cof_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -392,6 +398,9 @@
<if test="revenueCofId != null">
#{revenueCofId,jdbcType=BIGINT},
</if>
<if test="modifyRevenueCofId != null">
#{modifyRevenueCofId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultType="java.lang.Long">
......@@ -507,6 +516,9 @@
<if test="record.revenueCofId != null">
revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
</if>
<if test="record.modifyRevenueCofId != null">
modify_revenue_cof_id = #{record.modifyRevenueCofId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -549,7 +561,8 @@
remarks = #{record.remarks,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT}
revenue_cof_id = #{record.revenueCofId,jdbcType=BIGINT},
modify_revenue_cof_id = #{record.modifyRevenueCofId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -654,6 +667,9 @@
<if test="revenueCofId != null">
revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
</if>
<if test="modifyRevenueCofId != null">
modify_revenue_cof_id = #{modifyRevenueCofId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -693,7 +709,8 @@
remarks = #{remarks,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
revenue_cof_id = #{revenueCofId,jdbcType=BIGINT}
revenue_cof_id = #{revenueCofId,jdbcType=BIGINT},
modify_revenue_cof_id = #{modifyRevenueCofId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InvoiceRecordExample" resultMap="BaseResultMap">
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InvoiceRecordExtendsMapper.xml
View file @ 9b09dfab
......@@ -186,6 +186,8 @@
bd.billing_date as billDate,
bd.invoice_code as billCode,
bd.invoice_num as billNumber,
modfiy_rc.id as modifyRevenueCofId,
modfiy_rc.name as modifyRevenueCofName,
rc.id as revenueCofId,
rc.name as revenueConfName,
case
......@@ -195,6 +197,7 @@
end as emptyCode
from invoice_record as bd
left join revenue_config as rc on rc.org_id = bd.organization_id and rc.id = bd.revenue_cof_id
left join revenue_config as modfiy_rc on modfiy_rc.id = bd.modify_revenue_cof_id
where bd.project_id = #{projectId}
and bd.period = #{period}
<if test="billType != null and billType != ''">
......@@ -207,7 +210,7 @@
and bd.invoice_num like concat('%',#{billNumber},'%')
</if>
<if test="revenueCofId != null">
and bd.revenue_cof_id = #{revenueCofId}
and if(bd.modify_revenue_cof_id is null,bd.revenue_cof_id = #{revenueCofId},bd.modify_revenue_cof_id = #{revenueCofId})
</if>
<if test="billContent != null and billContent != ''">
and bd.billing_content like concat('%',#{billContent},'%')
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
View file @ 9b09dfab
......@@ -15,7 +15,7 @@
tbf.segment3_name accountExplain,
tbf.segment5_name profitCenterExplain,
tbf.segment6_name productExplain,
tbf.period_dr amount,
tbf.period_cr_beq - tbf.period_dr_beq amount,
rc.name type,
rc.revenue_type category,
rc.tax_type taxOn,
......
atms-web/src/main/resources/conf_profile_uat.properties
View file @ 9b09dfab
api.url=http://dts.erp.didichuxing.com:8180/
api.url=http://dts.erp.didichuxing.com
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx
......
atms-web/src/main/webapp/Scripts/app.js
View file @ 9b09dfab
......@@ -343,7 +343,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
langs = obj;
}
} catch(e) {}
var region = langs[loginContext.userName] || 'en-us';
var region = langs[loginContext.userName] || 'zh-CN';
var flag = window.localStorage.langTemp;
$rootScope.changeLanguage = function(lang){
$translate.use(lang);
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 9b09dfab
......@@ -174,7 +174,7 @@
"DashboardOTRiskDashboard": "风险仪表盘",
"DashboardOTRiskWarning": "风险提示",
"DashboardOTSubtotal": "税负汇总情况",
"DashboardOTSubtotalByBusinessUnit": "事业部汇总",
"DashboardOTSubtotalByBusinessUnit": "业务线汇总",
"DashboardOTSubtotalByOrganization": "机构汇总",
"DashboardOTSubtotalByRegion": "区域汇总",
"DashboardOTTaxBurdenDistribution": "税负分布",
......@@ -660,7 +660,7 @@
"ShowPageItem": "条",
"ShowPerPageCount": "每页显示",
"ShowRelevantAmount": "借贷方相关金额",
"SortByBusinessUnit": "按事业部",
"SortByBusinessUnit": "按业务线",
"SortByOrganization": "按机构",
"SortByRegion": "按区域",
"SortByTaxBurdenAmount": "按税负额",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
View file @ 9b09dfab
......@@ -51,27 +51,27 @@
"BeginImport": "开始导入",
"Browse": "浏览...",
"BusinessUnitActive": "已启用",
"BusinessUnitAddNew": "添加事业部",
"BusinessUnitAddNew": "添加业务线",
"BusinessUnitAddSuccess": "添加成功",
"BusinessUnitCancel": "取消",
"BusinessUnitDeleteSuccess": "删除成功",
"BusinessUnitDisabled": "已停用",
"BusinessUnitDisabledNode": "停用",
"BusinessUnitDuplicateNode": "事业部名称重复",
"BusinessUnitDuplicateNode": "业务线名称重复",
"BusinessUnitEdit": "编辑",
"BusinessUnitEditSuccess": "修改成功",
"BusinessUnitEmptyNode": "事业部名称不能为空,且至少需要2个字符",
"BusinessUnitEmptyNode": "业务线名称不能为空,且至少需要2个字符",
"BusinessUnitEnableNode": "启用",
"BusinessUnitName": "事业部名称",
"BusinessUnitName": "业务线名称",
"BusinessUnitNoSelected": "未选择操作数据行",
"BusinessUnitOperation": "操作",
"BusinessUnitOperationSuccess": "操作成功",
"BusinessUnitOutOfLengthNode": "事业部名称不能超过50个字符",
"BusinessUnitOutOfLengthNode": "业务线名称不能超过50个字符",
"BusinessUnitSave": "保存",
"BusinessUnitStatus": "使用状态",
"BusinessUnitStatusUnsureness": "事业部状态不确定",
"BusinessUnitTitle": "事业部",
"BusinessUnitUpdate": "修改事业部信息",
"BusinessUnitStatusUnsureness": "业务线状态不确定",
"BusinessUnitTitle": "业务线",
"BusinessUnitUpdate": "修改业务线信息",
"CannotDeleteAreaTips": "存在使用该区域的机构，不能停用！",
"CannotDeleteRegionTips": "该区域:{name}下还有子区域不能删除!",
"CannotFindAreaByID": "未查到ID为：{id}的区域。",
......@@ -213,7 +213,7 @@
"ExpiredDateTo": "至",
"ExtraRole": "附加角色",
"FieldareaName": "区域",
"FieldbusinessUnitName": "事业部",
"FieldbusinessUnitName": "业务线",
"FieldindustryName": "行业",
"FieldorgCode": "机构代码",
"FieldorgName": "机构名称",
......@@ -256,7 +256,7 @@
"OperationAddInvalid": "请先保存修改操作",
"OperationEditInvalid": "请先保存新增操作",
"OrangizationStructureTabTitle": "机构层级",
"OrganizationBusinessUnitNameRequired": "请选择事业部",
"OrganizationBusinessUnitNameRequired": "请选择业务线",
"OrganizationDetailsList": "机构详细列表",
"OrganizationManageTitle": "组织机构管理",
"OrganizationStructureActive": "已启用",
......@@ -371,7 +371,7 @@
"TaxableState": "应税状态",
"TemplateName": "报表名称",
"UpdateArea": "修改区域",
"UpdateBusinessUnit": "修改事业部",
"UpdateBusinessUnit": "修改业务线",
"UpdateCustomer": "修改客户列表",
"UpdateEnterpriseAccount": "修改科目",
"UpdateEnterpriseAccountSet": "修改账套",
......@@ -403,6 +403,6 @@
"WordLibraryTitle": "字库",
"notAllowDisableMessage": "机构中已关联,不允许停用",
"UnSave": "未点击保存按钮！",
"addFileType": "增加档案类型",
"addFileType": "新建档案类型",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 9b09dfab
......@@ -240,7 +240,7 @@
"After": "以后",
"AgriculturalProduct": "农产品发票",
"AllArea": "所有区域",
"AllBusinessUnit": "所有事业部",
"AllBusinessUnit": "所有业务线",
"AllMappingStatus": "所有对应状态",
"AllOrganization": "所有机构",
"AllTask": "全部",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 9b09dfab
......@@ -84,7 +84,7 @@
"DefaultRole": "角色：",
"PDefaultRole": "默认角色",
"PIndustry": "行业",
"Business": "事业部",
"Business": "业务线",
"Area": "区域",
"ProjectList": "项目列表",
"ProjectNameCol": "项目名称",
......@@ -109,7 +109,7 @@
"DocumentTypeSets": "税务档案类型设置",
"Explain": "说明",
"RequiredFields": "必填字段",
"CreateDocFileType":"新建文档类型",
"CreateDocFileType":"新建档案类型",
"State": "状态",
"PCompany": "所属机构",
"Enable": "启用",
......@@ -148,7 +148,7 @@
"ComfirmUpdate": "确认修改？",
"UpdateOrgExtraInfoTips": "将修改机构-其他信息，是否确认修改？",
"CancelChangeEquityInfoTips": "将撤销变更-股权信息，是否确认修改？",
"BusinessUnitTitleName": "事业部",
"BusinessUnitTitleName": "业务线",
"AreaTitleName": "区域",
"IndustryTitleName": "行业",
"UserTitleName": "用户",
......@@ -482,7 +482,7 @@
"LocalEducationAttach": "地方教育费附加",
"WaterFund": "水利基金",
"StampTax": "印花税",
"AllBusinessUnit": "所有事业部",
"AllBusinessUnit": "所有业务线",
"AllArea": "所有区域",
"AllOrganization": "所有机构",
"AllTax": "所有税种",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 9b09dfab
......@@ -163,7 +163,7 @@
"After": "以后",
"AgriculturalProduct": "农产品发票",
"AllArea": "所有区域",
"AllBusinessUnit": "所有事业部",
"AllBusinessUnit": "所有业务线",
"AllMappingStatus": "所有对应状态",
"AllOrganization": "所有机构",
"AllTax": "所有税种",
......@@ -2231,6 +2231,8 @@
"Operater": "操作员",
"OperateTime": "操作时间",
"HistoryVersion": "历史版本",
"ReportUploadDetail": "历史版本计算表",
"RepUploadDtlColSerialNo": "序号",
"RepUploadDtlColCreateTime": "保存时间",
......
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ 9b09dfab
......@@ -187,7 +187,7 @@
></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>
</div>-->
<div>
<div style="margin-bottom: 20px;">
<center>
<button type="submit" class="btn btn-primary" translate="Confirm"
></button>
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 9b09dfab
......@@ -1215,15 +1215,15 @@
<!-- 有效开始时间 -->
<span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate">{{set.effectiveDateStr}}</span>
<div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
<div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" style="width: 33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.startDateError}">
<input type="text" class="form_datetime form-control" ng-model="set.effectiveDateStr" id="{{set.fromID}}" ng-change="checkStartDate(set)" required />
<p ng-show="set.startDateError" class="has-error label">{{set.startDateError}}</p>
</div>
<span class="col-sm-1 block-span">&nbsp;{{'ExpiredDateTo'|translate}}&nbsp;</span>
<span class="col-sm-1 block-span"style="margin-top: -24px;">&nbsp;{{'ExpiredDateTo'|translate}}&nbsp;</span>
<!-- 有效结束时间 -->
<span class="block-span col-sm-4" ng-show="!selectCompany.isUpdate"> {{set.expiredDateStr}}</span>
<div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
<div ng-show="selectCompany.isUpdate" class="col-sm-4 fix-height" style="width:33.33%!important;" ng-show="selectCompany.isUpdate" ng-class="{'has-error':set.endDateError}">
<input type="text" class="form_datetime form-control" ng-change="checkEndDate(set)" ng-model="set.expiredDateStr" id="{{set.toID}}" />
<!--<p ng-show="set.endDateError" class="has-error label">{{set.endDateError}}</p>-->
</div>
......
atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.html
View file @ 9b09dfab
......@@ -3,7 +3,7 @@
<div class="row" style=" height: 71px; background: #ccc;">
<div class="col-sm-7" style=" margin-top: 20px;">
<div class="col-sm-8">
<span class="text-bold" translate="SelectedOrganization" style=" top: -11px; position: relative; width: 320px;">:</span>
<span class="text-bold" translate="SelectedOrganization" style=" top: -11px; display: inline!important; position: relative; ">:</span>
<!-- <div id="dx-select-industry" class="tab-content-select industry " style=" display: inline-block;"
dx-select-box="dataSourceIndustryList" dx-item-alias="itemObj">
<div data-options="dxTemplate: { name: 'orgList' }" class="dx-item-content dx-list-item-content"
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,27 +45,32 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></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 topButton"
translate="AddImportBtn"
ng-click="doUploadAT(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadAT(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
View file @ 9b09dfab
......@@ -401,3 +401,15 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width:100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +45,43 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav " style="width: 40%;margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third">
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
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;"
translate="AddImportBtn"
ng-click="doUploadBS(importEnum.AddImport)"></button>
ng-click="doUploadBS(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadBS(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.less
View file @ 9b09dfab
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,23 +45,25 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></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 topButton"
translate="AddImportBtn"
ng-click="doUploadCF(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadCF(importEnum.CoverImport)"></button>
......@@ -76,6 +80,8 @@
</div>
</div>
</div>
</div>
</div>
<!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!fileName">
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.less
View file @ 9b09dfab
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div style = "width:60%" class="col-sm-6 leftNav">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="auto">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,25 +45,29 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div style = "width:40%; margin-top: 10px;" class="col-sm-6 rightNav">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></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 topButton"
translate="AddImportBtn"
ng-click="doUploadCIL(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadCIL(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.less
View file @ 9b09dfab
......@@ -343,3 +343,17 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30%!important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ 9b09dfab
......@@ -9,12 +9,13 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="margin-bottom: -38px; width: 100%;">
<div class="import-wrapper">
<div class="col-sm-6 leftNav">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +44,42 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
<button type="button"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
<button type="button "
class="btn btn-vat-primary topButton"
translate="AddImportBtn"
ng-click="doUploadCPR(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadCPR(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
View file @ 9b09dfab
......@@ -401,3 +401,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav ">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,13 +45,15 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
......@@ -59,23 +63,24 @@
ng-click="doUploadID(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadID(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.less
View file @ 9b09dfab
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 col-xs-6 col-lg-6 leftNav" style="width: 60%;">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,27 +45,32 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 col-xs-6 col-lg-6 rightNav" style="width: 40%; margin-top: 10px" >
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></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 topButton"
translate="AddImportBtn"
ng-click="doUploadIR(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadIR(importEnum.CoverImport)"></button>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.less
View file @ 9b09dfab
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30%!important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ 9b09dfab
......@@ -9,12 +9,14 @@
<!--导航栏-->
<div id="tab_total">
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
<div class="import-wrapper">
<div class="row">
<div class="col-sm-6 leftNav">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span>
</button>
......@@ -43,39 +45,43 @@
<div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
</div>
<div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</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"
translate="TemplateBtn"
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;"
translate="AddImportBtn"
ng-click="doUploadPL(importEnum.AddImport)"></button>
ng-click="doUploadPL(importEnum.AddImport)"></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 topButton"
translate="CoverImportBtn"
ng-click="doUploadPL(importEnum.CoverImport)"></button>
<div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class="btn topButton btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="ConverImportBtn"
ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
<button class="btn btn-vat-primary" atms-permission permission-control-type="ngIf"
<button class=" topButton btn btn-vat-primary" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.less
View file @ 9b09dfab
......@@ -343,3 +343,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%;
}
.rightNav{
width: 30%;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 9b09dfab
......@@ -64,45 +64,43 @@
</div>
</div>
</form>-->
<form class="form-horizontal">
<div class="form-group" style="margin-top: 10px; height: 10px;">
<form class="form-inline">
<div class="form-group" style="margin-bottom: -38px;width: 100%" >
<div class="row">
<div class="col-sm-6 leftNav" style="width: 60%">
<label class="col-sm-1 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
<div class="col-sm-3 marTop">
<div dx-tag-box="selectOrgOptions"></div>
<div dx-tag-box="selectOrgOptions" style="position: relative; left: 33px;"></div>
</div>
<label class="col-sm-1 control-label marTop" style="margin-left: 60px;">{{'InvoiceQJ' | translate}}：</label>
<div class="col-sm-1 marTop" style=" width: 14%;">
<input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px; display: inline-block"
readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;position: relative;left: -22px;"></i>
<i class="fa fa-calendar imp-subheader red-color" style=" position: relative; right: relative; right: -100px; top: -26px;"></i>
</div>
</div>
<div class="col-sm-2">
<div class="col-sm-6 rightNav" style="margin-top: 10px; width: 40%">
<button type="button"
ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px;margin-left:30px;margin-top: 10px;">
ngf-allow-dir="false" class="btn btn-vat-third" >
{{'SelectFile' | translate}}
</button>
<span ng-show="fileName" class="marTop" title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
</div>
<div class="col-sm-1">
<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"
translate="TemplateBtn"
ng-click="downloadTemplate()"></button>
</div>
<div class="col-sm-1">
<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 topButton"
translate="CoverImportBtn"
ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
</div>
<div class="col-sm-1">
<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 topButton"
translate="AddImportBtn"
ng-click="doUploadRLIT(importEnum.AddImport)"></button>
</div>
</div>
</div>
</form>
<div class="dt-init-wrapper">
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
View file @ 9b09dfab
......@@ -403,3 +403,16 @@
padding-left: 15px;
}
}
@media screen and (max-width:1400px) {
.topButton{
margin-top: 10px;
}
.leftNav{
width: 70%!important;
}
.rightNav{
width: 30% !important;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
View file @ 9b09dfab
......@@ -24,11 +24,17 @@
<div dx-tag-box="selectTypeOptions"></div>
</div>
<div class="col-sm-2">
<button type="button" atms-permission permission-control-type="ngIf"
permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
<button type="button"
class="btn btn-vat-primary"
translate="ImportBtn" style="min-width: 50px;"
ng-click="callFinancialApi()"></button>
<!-- <button type="button" atms-permission permission-control-type="ngIf"-->
<!-- permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"-->
<!-- class="btn btn-vat-primary"-->
<!-- translate="ImportBtn" style="min-width: 50px;"-->
<!-- ng-click="callFinancialApi()"></button>-->
<button type="button" class="btn btn-vat-primary" translate="Refresh"
ng-click="refreshConfigGrid()" style="min-width: 50px;"></button>
</div>
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 9b09dfab
......@@ -576,7 +576,7 @@ taxDocumentManageModule.directive('dateTimePicker', function () {
minViewMode: $attrs["minViewMode"] ? parseInt($attrs["minViewMode"]) : 0,
autoclose: true,
language: region,
todayBtn: true,
todayBtn: 'linked',
clearBtn: true //清除按钮
}).off("changeDate").on('changeDate', function (ev) {
runCallback(ev);
......@@ -719,6 +719,7 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
};
$scope.openMultiUploadPop = function () {
clearCache();//清空缓存
$("#multiUploadFilePlugin").click();
$scope.multiUploader.clearQueue();
$("#multiUploadFilePlugin").val(null); //这一步主要防止第二次选择相同文件的时候无响应
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
View file @ 9b09dfab
......@@ -203,6 +203,18 @@
$scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
// TODO 临时代码,待删除
$scope.hasBsPlPermission = true;
$scope.hasBsPermission = true;
$scope.hasPlPermission = true;
$scope.hasTaxReturnPermission = true;
$scope.hasQueryTaxReturnPermission = true;
$scope.hasEditTaxReturnPermission = true;
});
};
var toggleGroup = function (group) {
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.html
View file @ 9b09dfab
......@@ -26,7 +26,7 @@
<div class="group-section" ng-click="uploadliShow=!uploadliShow;">
<i class="fa toggle-group-icon" ng-class="'fa-chevron-down'"
aria-hidden="true"></i>
<label class="tree-toggle nav-header" translate="">历史版本</label>
<label class="tree-toggle nav-header" translate="">{{'HistoryVersion' | translate }}</label>
</div>
<div class="divider"></div>
......@@ -34,7 +34,7 @@
<div class="li tree">
<a ng-class="'active'" ui-sref-active="active"
ui-sref=".reportUploadView()"
class="active">历史版本计算表</a>
class="active">{{'ReportUploadDetail' | translate }}</a>
</div>
</div>
</li>
......
atms-web/src/main/webapp/app/vat/vat-layout/vat-layout.ctrl.js
View file @ 9b09dfab
......@@ -429,6 +429,7 @@
url: '#/vat/previewData/coupaPurchasingReport'
});
} else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
$scope.menus.push({
name: 'previewData',
state: 'previewData',
......@@ -446,7 +447,8 @@
}
// TODO
// TODO 待删除1
// TODO Delete
// TODO 待删除
......@@ -592,11 +594,11 @@
url: '#/vat/generateReport'
});
subMenus.push({
name: 'generateReport',
state: 'generateReport',
name: 'generateReport.reportView',
state: 'generateReport.reportView',
num: 4,
permission: constant.vatPermission.reportView.reportViewCode,
url: '#/vat/generateReport'
permission: constant.vatPermission.reportView.bsplCode,
url: '#/vat/generateReport/reportView'
});
}
......
atms-web/src/main/webapp/package-lock.json
View file @ 9b09dfab
......@@ -1710,11 +1710,6 @@
}
}
},
"viewerjs": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.3.2.tgz",
"integrity": "sha512-P9Ac9H+GJ1jE9B5x8foRYm/xZvpWFR6L4GC9mr6181P9amOzQPDkplQrFj8l7mdnv8EyH2dO8XJJfoylir316A=="
},
"websocket-driver": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
......
atms-web/src/test/File1.sql 0 → 100644
View file @ 9b09dfab
企业所得税申报 03
数据导入 03.001.011
数据预览 03.002
日记账 03.002.003
试算平衡生成版 03.002.004
试算平衡Mapping版 03.002.005
资产清单 03.002.006
预提重分类 03.002.007
EAM资产处置金额记录表 03.002.008
数据整理 03.003
数据处理 03.003.002
CIT.WP01901_固定资产 03.003.003
总分机构分配表 03.003.004 需要再次確認
查看报表 03.004
增值税申报 02
数据导入 02.001
试算平衡表 02.001.001
进项发票 02.001.011
销项发票 02.001.009
数据预览 02.002
科目余额表 02.002.016
利润表PRC 02.002.013
资产负债表PRC 02.002.017
日记账 02.002.018
现金流量表 02.002.019
已开增值税发票记录 02.002.007
已认证发票清单 02.002.008
红字信息表 02.002.009
Coupa采购报告 02.002.010
发票资料 02.002.020
数据整理 02.003
数据处理 02.003.003
收入明细 02.003.004
开票明细 02.003.005
查看报表 02.004
档案管理 06
报表审批 07
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