Skip to content

T
traffic-front
Commit 645167ca 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 7d051625 98867356
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 512 additions and 294 deletions
atms-api/pom.xml
View file @ 645167ca
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 --> <!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 -->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>com.oracle</groupId>--> <!--<groupId>com.oracle</groupId>-->
<!--<artifactId>ojdbc</artifactId>--> <!--<artifactId>ojdbc</artifactId>-->
<!--<version>0.0.1</version>--> <!--<version>0.0.1</version>-->
<!--</dependency>--> <!--</dependency>-->
<!--<dependency> <!--<dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
...@@ -74,17 +74,18 @@ ...@@ -74,17 +74,18 @@
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<!--去除swagger--> <!--去除swagger-->
<!-- <dependency> <!-- <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
</dependency>--> </dependency>-->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
...@@ -442,7 +443,7 @@ ...@@ -442,7 +443,7 @@
<profiles> <profiles>
<profile> <profile>
<id>dev</id> <id>dev</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<build> <build>
...@@ -454,8 +455,8 @@ ...@@ -454,8 +455,8 @@
<env>dev</env> <env>dev</env>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>staging</id> <id>staging</id>
<build> <build>
...@@ -522,13 +523,13 @@ ...@@ -522,13 +523,13 @@
<targetPath>${basedir}/target/classes/userTemplate</targetPath> <targetPath>${basedir}/target/classes/userTemplate</targetPath>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources/vat_excel_template</directory> <directory>src/main/resources/vat_excel_template</directory>
<includes> <includes>
<include>**/*.xls</include> <include>**/*.xls</include>
<include>**/*.xlsx</include> <include>**/*.xlsx</include>
</includes> </includes>
<targetPath>${basedir}/target/classes/vat_excel_template</targetPath> <targetPath>${basedir}/target/classes/vat_excel_template</targetPath>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources/cit_excel_template</directory> <directory>src/main/resources/cit_excel_template</directory>
<includes> <includes>
...@@ -553,6 +554,14 @@ ...@@ -553,6 +554,14 @@
</includes> </includes>
<targetPath>${basedir}/target/classes/user_excel_template</targetPath> <targetPath>${basedir}/target/classes/user_excel_template</targetPath>
</resource> </resource>
<resource>
<directory>src/main/resources/analysis_excel_init</directory>
<includes>
<include>**/*.xls</include>
<include>**/*.xlsx</include>
</includes>
<targetPath>${basedir}/target/classes/analysis_excel_init</targetPath>
</resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
......
atms-api/src/main/java/pwc/taxtech/atms/controller/RevenueConfController.java
View file @ 645167ca
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.constant.enums.EnumImportType;
import pwc.taxtech.atms.dto.ApiResultDto; import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.input.CamelPagingResultDto; import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
import pwc.taxtech.atms.dto.revenuconf.RevConfAddDto; import pwc.taxtech.atms.dto.revenuconf.RevConfAddDto;
...@@ -11,6 +13,9 @@ import pwc.taxtech.atms.service.impl.RevenueConfService; ...@@ -11,6 +13,9 @@ import pwc.taxtech.atms.service.impl.RevenueConfService;
import pwc.taxtech.atms.vat.entity.RevenueConfig; import pwc.taxtech.atms.vat.entity.RevenueConfig;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List; import java.util.List;
@RestController @RestController
...@@ -46,9 +51,33 @@ public class RevenueConfController extends BaseController { ...@@ -46,9 +51,33 @@ public class RevenueConfController extends BaseController {
revenueConfService.delConfig(idList); revenueConfService.delConfig(idList);
return ApiResultDto.success(); return ApiResultDto.success();
} }
@PostMapping("upload") @PostMapping("upload")
public ApiResultDto upload(@RequestParam MultipartFile file, @RequestParam Integer type) throws Exception { public ApiResultDto upload(@RequestParam MultipartFile file, @RequestParam Integer type) throws Exception {
List<String> unSuccessList = revenueConfService.upload(file, type); List<String> unSuccessList = revenueConfService.upload(file, type);
return ApiResultDto.success(unSuccessList); return ApiResultDto.success(unSuccessList);
} }
@GetMapping("export")
public void export(HttpServletResponse response) throws Exception {
OutputStream ouputStream = null;
try {
InputStream inputStream = this.getClass().getResourceAsStream("/document/DataImport/" + EnumImportType.RevenueConfig.name() + ".xlsx");
Workbook tWorkbook = revenueConfService.export(inputStream);
response.setContentType("multipart/form-data");
response.setHeader("Content-Disposition", "attachment;fileName=" + EnumImportType.RevenueConfig.name() + ".xlsx");
ouputStream = response.getOutputStream();
tWorkbook.write(ouputStream);
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (ouputStream != null) {
ouputStream.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
} }
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java
View file @ 645167ca
...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService { ...@@ -141,6 +141,9 @@ public class CitDataPreviewServiceImpl extends BaseService {
public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){ public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){
CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust()); CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId()); List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
if(citJournalEntryAdjust.getPeriodEnd()!=null && citJournalEntryAdjust.getPeriodEnd()%100 ==12){
citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd()/100*100+13);
}
List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList); List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMergeByOrgList(citJournalEntryAdjust,orgList);
if(journalMerges.size()==0){ if(journalMerges.size()==0){
return 0; return 0;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 645167ca
...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -455,7 +455,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
continue; continue;
} }
trialBalance.setAccountCode(cellValue.toString().replace(".0","")); // trialBalance.setAccountCode(cellValue.toString().replace(".0",""));
trialBalance.setAccountCode(new BigDecimal(cellValue.toString()).toPlainString());
trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString()); trialBalance.setSegment4(CitCommonUtil.getValue(rowData.getCell(8)).toString());
trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString()); trialBalance.setSegment5(CitCommonUtil.getValue(rowData.getCell(9)).toString());
trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString()); trialBalance.setSegment6(CitCommonUtil.getValue(rowData.getCell(10)).toString());
...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -509,7 +510,10 @@ public class CitImportExcelServiceImpl extends BaseService {
citTrialBalanceMapper.deleteByExample(citTrialBalanceExample); citTrialBalanceMapper.deleteByExample(citTrialBalanceExample);
updateImportLog(EnumCitImportType.TrialBalance.getCode()); updateImportLog(EnumCitImportType.TrialBalance.getCode());
} }
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList); int insertBatchNum = 0;
if(trialBalanceList != null && trialBalanceList.size()>0){
insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
}
//循环遍历成功导入的数据，组装日志记录实体并放入集合 //循环遍历成功导入的数据，组装日志记录实体并放入集合
for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) { for (Map.Entry<String, Integer> entry : companySuccessMap.entrySet()) {
...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -539,7 +543,8 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLogList.add(citDataImportLogError); citDataImportLogList.add(citDataImportLogError);
} }
for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) { for (Map.Entry<String, Integer> entry : noProjectMap.entrySet()) {
CitDataImportLog citDataImportLogError = generalCitDataImportLog(entry.getKey(), "", "", String[] split = entry.getKey().split(",");
CitDataImportLog citDataImportLogError = generalCitDataImportLog(split[0], split[1], split[2],
EnumCitImportType.TrialBalance.getCode(), period, EnumCitImportType.TrialBalance.getCode(), period,
"", "试算平衡表", false); "", "试算平衡表", false);
citDataImportLogError.setRecordSize(entry.getValue()); citDataImportLogError.setRecordSize(entry.getValue());
...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -645,7 +650,6 @@ public class CitImportExcelServiceImpl extends BaseService {
msg = "覆盖导入成功"; msg = "覆盖导入成功";
CitDraftAccountMappingExample example = new CitDraftAccountMappingExample(); CitDraftAccountMappingExample example = new CitDraftAccountMappingExample();
CitDraftAccountMappingExample.Criteria criteria = example.createCriteria(); CitDraftAccountMappingExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period); criteria.andPeriodEqualTo(period);
citDAMappingMapper.deleteByExample(example); citDAMappingMapper.deleteByExample(example);
updateImportLog(EnumCitImportType.DraftAccountMapping.getCode()); updateImportLog(EnumCitImportType.DraftAccountMapping.getCode());
...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -1532,11 +1536,12 @@ public class CitImportExcelServiceImpl extends BaseService {
BigDecimal lastYearBegBla = new BigDecimal(0); BigDecimal lastYearBegBla = new BigDecimal(0);
CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample(); CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria(); CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria();
criteria.andOrganizationIdEqualTo(project.getOrganizationId());
criteria.andAccountCodeEqualTo(citJournal.getSubjectCode()); criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
criteria.andPeriodEqualTo(project.getYear()-1); criteria.andPeriodEqualTo(project.getYear()-1);
List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample); List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
if(trialBalances != null && trialBalances.size() > 0){ if(trialBalances != null && trialBalances.size() > 0){
lastYearBegBla = trialBalances.get(0).getBeginningBalance(); lastYearBegBla = lastYearBegBla.add(trialBalances.get(0).getBeginningBalance());
} }
trialBalance.setBeginningBalance(lastYearBegBla); trialBalance.setBeginningBalance(lastYearBegBla);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectServiceImpl.java
View file @ 645167ca
...@@ -177,23 +177,32 @@ public class ProjectServiceImpl { ...@@ -177,23 +177,32 @@ public class ProjectServiceImpl {
try { try {
project.setId(UUID.randomUUID().toString()); project.setId(UUID.randomUUID().toString());
project.setUpdateTime(new Date());
OrganizationServiceTemplateGroupExample example = new OrganizationServiceTemplateGroupExample(); int row = projectMapper.insertOnWhere(project);
example.createCriteria().andOrganizationIdEqualTo(projectDto.getOrganizationId()); if(row<=0){
organizationServiceTemplateGroupMapper.selectByExample(example).forEach(ostg -> { ProjectExample projectExample = new ProjectExample();
ProjectServiceType pst = new ProjectServiceType(); projectExample.createCriteria().andIsActiveEqualTo(true).andOrganizationIdEqualTo(project.getOrganizationId()).andYearEqualTo(project.getYear());
pst.setId(UUID.randomUUID().toString()); List<Project> dataList = projectMapper.selectByExample(projectExample);
pst.setProjectId(project.getId()); project = dataList.get(0);
pst.setServiceTypeId(ostg.getServiceTypeId()); }else{
pst.setTemplateGroupId(ostg.getTemplateGroupId()); final Project project1 = project;
OrganizationServiceTemplateGroupExample example = new OrganizationServiceTemplateGroupExample();
projectServiceTypeMapper.insert(pst); example.createCriteria().andOrganizationIdEqualTo(projectDto.getOrganizationId());
organizationServiceTemplateGroupMapper.selectByExample(example).forEach(ostg -> {
ProjectServiceType pst = new ProjectServiceType();
pst.setId(UUID.randomUUID().toString());
pst.setProjectId(project1.getId());
pst.setServiceTypeId(ostg.getServiceTypeId());
pst.setTemplateGroupId(ostg.getTemplateGroupId());
projectServiceTypeMapper.insert(pst);
// operationLogService.addDataAddLog(pst, OperationModule.ProjectServiceType, userName,//TODO add peration log // operationLogService.addDataAddLog(pst, OperationModule.ProjectServiceType, userName,//TODO add peration log
// Message.Project.AddProjectServiceType, pst.getId(), projectDto.getName(), LOG_TYPE); // Message.Project.AddProjectServiceType, pst.getId(), projectDto.getName(), LOG_TYPE);
}); });
}
project.setUpdateTime(new Date());
projectMapper.insert(project);
// operationLogService.addDataAddLog(project, OperationModule.Project, userName, Message.Project.AddProject, // operationLogService.addDataAddLog(project, OperationModule.Project, userName, Message.Project.AddProject,
// project.getId(), projectDto.getName(), LOG_TYPE); // project.getId(), projectDto.getName(), LOG_TYPE);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/RevenueConfService.java
View file @ 645167ca
...@@ -9,6 +9,7 @@ import org.apache.poi.ss.usermodel.Row; ...@@ -9,6 +9,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import pwc.taxtech.atms.common.CommonUtils; import pwc.taxtech.atms.common.CommonUtils;
...@@ -19,6 +20,7 @@ import pwc.taxtech.atms.dto.ApiResultDto; ...@@ -19,6 +20,7 @@ import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.revenuconf.RevConfAddDto; import pwc.taxtech.atms.dto.revenuconf.RevConfAddDto;
import pwc.taxtech.atms.dto.revenuconf.RevenueConfParam; import pwc.taxtech.atms.dto.revenuconf.RevenueConfParam;
import pwc.taxtech.atms.dto.revenuconf.RevenueConfResult; import pwc.taxtech.atms.dto.revenuconf.RevenueConfResult;
import pwc.taxtech.atms.exception.Exceptions;
import pwc.taxtech.atms.vat.dao.RevenueConfigMapper; import pwc.taxtech.atms.vat.dao.RevenueConfigMapper;
import pwc.taxtech.atms.vat.entity.RevenueConfig; import pwc.taxtech.atms.vat.entity.RevenueConfig;
import pwc.taxtech.atms.vat.entity.RevenueConfigExample; import pwc.taxtech.atms.vat.entity.RevenueConfigExample;
...@@ -26,10 +28,7 @@ import pwc.taxtech.atms.vat.entity.RevenueConfigExample; ...@@ -26,10 +28,7 @@ import pwc.taxtech.atms.vat.entity.RevenueConfigExample;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
...@@ -185,8 +184,12 @@ public class RevenueConfService extends BaseService { ...@@ -185,8 +184,12 @@ public class RevenueConfService extends BaseService {
revenueConfig.setTbSegment6(""); revenueConfig.setTbSegment6("");
} }
String taxRat = POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_7.getIndex())); String taxRat = POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_7.getIndex()));
// taxRat = taxRat.replaceAll("%",""); if(taxRat.indexOf("%")>0){
revenueConfig.setTaxRate(new BigDecimal(taxRat)); taxRat = taxRat.replaceAll("%","");
revenueConfig.setTaxRate(new BigDecimal(taxRat).divide(new BigDecimal(100)));
}else{
revenueConfig.setTaxRate(new BigDecimal(taxRat));
}
revenueConfig.setTaxBase(RevenueConfEnum.TaxBase.REVERSAL_MAPPING.get(POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_8.getIndex())))); revenueConfig.setTaxBase(RevenueConfEnum.TaxBase.REVERSAL_MAPPING.get(POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_8.getIndex()))));
if(revenueConfig.getTaxBase().intValue() == 4){ if(revenueConfig.getTaxBase().intValue() == 4){
revenueConfig.setBaseDrCode(POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_9.getIndex()))); revenueConfig.setBaseDrCode(POIUtil.getCellFormulaString(row.getCell(RevenueConfEnum.EXECLColumn.Column_9.getIndex())));
...@@ -266,4 +269,55 @@ public class RevenueConfService extends BaseService { ...@@ -266,4 +269,55 @@ public class RevenueConfService extends BaseService {
} }
return msg; return msg;
} }
public Workbook export(InputStream is){
Workbook tWorkbook = new XSSFWorkbook();
try {
tWorkbook = WorkbookFactory.create(is);
Sheet sheet = tWorkbook.getSheetAt(0);
Row sourceRow = sheet.getRow(1);
//查询公司map
List<OrgSelectDto> orgDtoList = organizationService.getMyOrgList();
Map<String, String> orgMap = orgDtoList.stream().collect(Collectors.toMap(OrgSelectDto::getId, OrgSelectDto::getName, (value1, value2) -> {
return value2;
}));
if(CollectionUtils.isNotEmpty(orgDtoList)){
RevenueConfigExample example = new RevenueConfigExample();
example.createCriteria().andOrgIdIn(orgDtoList.stream().map(OrgSelectDto::getId).collect(Collectors.toList()));
example.setOrderByClause("org_id");
List<RevenueConfig> dataList = revenueConfigMapper.selectByExample(example);
if(CollectionUtils.isNotEmpty(dataList)){
for(int i = dataList.size()-1;i>=0;i--){
RevenueConfig revenueConfig = dataList.get(i);
Row row = POIUtil.createAndCloneRow(tWorkbook, sheet, 1, sourceRow);
row.getCell(RevenueConfEnum.EXECLColumn.Column_1.getIndex()).setCellValue(revenueConfig.getName());
row.getCell(RevenueConfEnum.EXECLColumn.Column_2.getIndex()).setCellValue(orgMap.get(revenueConfig.getOrgId()));
row.getCell(RevenueConfEnum.EXECLColumn.Column_3.getIndex()).setCellValue(RevenueConfEnum.AccountType.MAPPING.get(revenueConfig.getAccountType()));
row.getCell(RevenueConfEnum.EXECLColumn.Column_4.getIndex()).setCellValue(revenueConfig.getTbSegment3());
row.getCell(RevenueConfEnum.EXECLColumn.Column_5.getIndex()).setCellValue(revenueConfig.getTbSegment5());
row.getCell(RevenueConfEnum.EXECLColumn.Column_6.getIndex()).setCellValue(revenueConfig.getTbSegment6());
row.getCell(RevenueConfEnum.EXECLColumn.Column_7.getIndex()).setCellValue(revenueConfig.getTaxRate().doubleValue());
row.getCell(RevenueConfEnum.EXECLColumn.Column_8.getIndex()).setCellValue(RevenueConfEnum.TaxBase.MAPPING.get(revenueConfig.getTaxBase()));
if(revenueConfig.getTaxBase().intValue() == 4){
row.getCell(RevenueConfEnum.EXECLColumn.Column_9.getIndex()).setCellValue(revenueConfig.getBaseDrCode());
}else if(revenueConfig.getTaxBase().intValue() == 5){
row.getCell(RevenueConfEnum.EXECLColumn.Column_9.getIndex()).setCellValue(revenueConfig.getBaseCrCode());
}else{
row.getCell(RevenueConfEnum.EXECLColumn.Column_9.getIndex()).setCellValue("");
}
row.getCell(RevenueConfEnum.EXECLColumn.Column_10.getIndex()).setCellValue(RevenueConfEnum.RevenueType.MAPPING.get(revenueConfig.getRevenueType()));
row.getCell(RevenueConfEnum.EXECLColumn.Column_11.getIndex()).setCellValue(RevenueConfEnum.TaxType.MAPPING.get(revenueConfig.getTaxType()));
row.getCell(RevenueConfEnum.EXECLColumn.Column_12.getIndex()).setCellValue(RevenueConfEnum.Status.MAPPING.get(revenueConfig.getStatus()));
row.getCell(RevenueConfEnum.EXECLColumn.Column_13.getIndex()).setCellValue(revenueConfig.getStartDate());
row.getCell(RevenueConfEnum.EXECLColumn.Column_14.getIndex()).setCellValue(revenueConfig.getEndDate());
}
}
}
sheet.removeRow(sourceRow);
return tWorkbook;
} catch (Exception e) {
logger.error("export error.", e);
throw Exceptions.SERVER_ERROR_EXCEPTION;
}
}
} }
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 645167ca
...@@ -1649,7 +1649,6 @@ public class ReportServiceImpl extends BaseService { ...@@ -1649,7 +1649,6 @@ public class ReportServiceImpl extends BaseService {
} }
} }
}); });
modifiedReportCellList = null;
dataDto.setCellData(cellDataDtoList); dataDto.setCellData(cellDataDtoList);
//将cellData复制给静态变量 //将cellData复制给静态变量
resultDto.setData(dataDto); resultDto.setData(dataDto);
...@@ -1658,7 +1657,6 @@ public class ReportServiceImpl extends BaseService { ...@@ -1658,7 +1657,6 @@ public class ReportServiceImpl extends BaseService {
logger.error(ex.getMessage(), ex); logger.error(ex.getMessage(), ex);
resultDto.setResult(false); resultDto.setResult(false);
} }
System.gc();
return resultDto; return resultDto;
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
View file @ 645167ca
package pwc.taxtech.atms.dao; package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
...@@ -251,4 +250,6 @@ public interface ProjectMapper extends MyMapper { ...@@ -251,4 +250,6 @@ public interface ProjectMapper extends MyMapper {
List<ProjectAnaylsisDto> getTemlateWithServiceType2(@Param("orgId")String orgId, @Param("year") Integer year, @Param("month") Integer month,@Param("code")String code); List<ProjectAnaylsisDto> getTemlateWithServiceType2(@Param("orgId")String orgId, @Param("year") Integer year, @Param("month") Integer month,@Param("code")String code);
List<Project> queryChildOrgAndProjectByOrgId(@Param("year")Integer year ,@Param("orgId")String orgId); List<Project> queryChildOrgAndProjectByOrgId(@Param("year")Integer year ,@Param("orgId")String orgId);
int insertOnWhere(Project record);
} }
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 645167ca
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
attribute16, attribute16,
created_by, created_date, late_updated_by, created_by, created_date, late_updated_by,
late_updated_date, create_time, update_time,is_select late_updated_date, create_time, update_time,is_select
from cit_journal_entry_adjust where period like CONCAT('%' ,#{record.period},'%') from cit_journal_entry_adjust where period = #{record.period}
<if test="orgList != null and orgList.size > 0"> <if test="orgList != null and orgList.size > 0">
AND organization_id in AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/ProjectExtendsMapper.xml
View file @ 645167ca
...@@ -46,7 +46,34 @@ ...@@ -46,7 +46,34 @@
and o.parent_id = #{orgId,jdbcType=VARCHAR} and o.parent_id = #{orgId,jdbcType=VARCHAR}
</select> </select>
<insert id="insertOnWhere" parameterType="pwc.taxtech.atms.entity.Project">
insert into project (id, code, name,
year, client_code, is_active,
create_time, update_time, region_id,
industry_id, rule_type, organization_id,
db_name, enterprise_account_set_id, start_period,
end_period)
select #{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{year,jdbcType=INTEGER}, #{clientCode,jdbcType=VARCHAR}, #{isActive,jdbcType=BIT},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{regionId,jdbcType=VARCHAR},
#{industryId,jdbcType=VARCHAR}, #{ruleType,jdbcType=INTEGER}, #{organizationId,jdbcType=VARCHAR},
#{dbName,jdbcType=VARCHAR}, #{enterpriseAccountSetId,jdbcType=VARCHAR}, #{startPeriod,jdbcType=INTEGER},
#{endPeriod,jdbcType=INTEGER}
FROM dual
where not exists(
select
*
from
project
where
organization_id = #{organizationId,jdbcType=VARCHAR}
and
year = #{year,jdbcType=INTEGER}
and
is_active = 1
)
</insert>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateConfigExtendsMapper.xml
View file @ 645167ca
...@@ -209,6 +209,12 @@ ...@@ -209,6 +209,12 @@
</foreach> </foreach>
AND ct.period = #{period,jdbcType=INTEGER} AND ct.period = #{period,jdbcType=INTEGER}
AND ct.project_id = #{projectId,jdbcType=VARCHAR} AND ct.project_id = #{projectId,jdbcType=VARCHAR}
and config.report_template_id IN
<foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
AND config.period = #{period,jdbcType=INTEGER}
AND config.project_id = #{projectId,jdbcType=VARCHAR}
</select> </select>
<select id="getConfigWithReportTemplateId" resultType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig"> <select id="getConfigWithReportTemplateId" resultType="pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig">
......
atms-orangeheap/public/index.html
View file @ 645167ca
...@@ -4,6 +4,59 @@ ...@@ -4,6 +4,59 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<script>
//获取地址栏参数，name:参数名称
window.str="";
var z =function getUrlParms(name){
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)
return unescape(r[2]);
return null;
}
var ddTicket = z("ticketStr");
//設置cookie
var sc= function setCookie(name,value) {
var Days = 30;
var exp = new Date();
exp.setTime(exp.getTime() + Days*24*60*60*1000);
document.cookie = name + "="+ escape (value) + ";expires=" + exp.toGMTString()+";path=./";
}
sc("ddTicket",ddTicket);
var ReUrl="https://me.xiaojukeji.com/project/stargate-auth/html/login.html?redirect_uri=http%3A%2F%2Fmis.diditaxi.com.cn%2Fauth%3Fapp_id%3D2500%26version%3D1.0%26jumpto%3Dhttp://dts-test.erp.didichuxing.com/orangeweb/index.html%26callback_index%3D0"
if(ddTicket==undefined || ddTicket=="" || ddTicket == null){
document.location=ReUrl;
}
/* else {
//创建核心对象
xmlhttp = null;
if (window.XMLHttpRequest) {// code for Firefox, Opera, IE7, etc.
xmlhttp = new XMLHttpRequest();
} else if (window.ActiveXObject) {// code for IE6, IE5
xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
}
//编写回调函数
xmlhttp.onreadystatechange = function() {
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
//
}
}
//這個 url 測試的
var getUserUrl="http://dts-test.erp.didichuxing.com/sso/getUser?ticket=";
//open设置请求方式和请求路径
xmlhttp.open("get", getUserUrl+ddTicket);
//send 发送
xmlhttp.send();
}*/
</script>
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>didi2</title> <title>didi2</title>
<link rel="stylesheet" href="font_roboto.css"> <link rel="stylesheet" href="font_roboto.css">
......
atms-web/src/main/java/pwc/taxtech/atms/web/controller/IndexController.java
View file @ 645167ca
...@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import pwc.taxtech.atms.common.DDUserInfoRes; import pwc.taxtech.atms.common.DDUserInfoRes;
import pwc.taxtech.atms.common.HttpUtil; import pwc.taxtech.atms.common.HttpUtil;
import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.AtmsTokenDto; import pwc.taxtech.atms.dto.AtmsTokenDto;
import pwc.taxtech.atms.web.AtmsWebSettings; import pwc.taxtech.atms.web.AtmsWebSettings;
import pwc.taxtech.atms.web.service.OrangeHeapService; import pwc.taxtech.atms.web.service.OrangeHeapService;
...@@ -196,7 +197,7 @@ public class IndexController { ...@@ -196,7 +197,7 @@ public class IndexController {
*/ */
@RequestMapping(value = {"/sso/getUser"}, method = RequestMethod.GET) @RequestMapping(value = {"/sso/getUser"}, method = RequestMethod.GET)
@ResponseBody @ResponseBody
public String accept(@RequestParam(value = "ticket") String ticket, HttpServletRequest request, public ApiResultDto accept(@RequestParam(value = "ticket") String ticket, HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
DDUserInfoRes ddUserInfoRes = null; DDUserInfoRes ddUserInfoRes = null;
try { try {
...@@ -207,7 +208,7 @@ public class IndexController { ...@@ -207,7 +208,7 @@ public class IndexController {
} catch (Exception e) { } catch (Exception e) {
logger.info(String.format("调用DDSSO获取用户信息失败:[%s]", e.getMessage()), e); logger.info(String.format("调用DDSSO获取用户信息失败:[%s]", e.getMessage()), e);
} }
return JSON.toJSONString(ddUserInfoRes); return ApiResultDto.success(ddUserInfoRes);
} }
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html
View file @ 645167ca
...@@ -22,33 +22,15 @@ ...@@ -22,33 +22,15 @@
<!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>--> <!--{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>-->
<!--</div>--> <!--</div>-->
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0"> <div id="tab_total">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>: <div class="dt-init-wrapper">
<span class="tag label label-default" ng-repeat="criteria in criteriaListFirstRow"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions">
<span title="{{criteria.fullName}}"> </div>
{{criteria.name}} <div class="page-footer">
</span> <ack-pagination page-options="pagingOptions"
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a> refresh-table="refreshGrid()"></ack-pagination>
</span> </div>
<span ng-if="criteriaList.length>6"><br /></span>
<span ng-if="criteriaList.length>6" style="margin-left: 81px; margin-top: 19px; display: inline-block;"></span>
<span ng-if="criteriaList.length>6" class="tag label label-default" ng-repeat="criteria in criteriaListSecondRow">
<span title="{{criteria.fullName}}">
{{criteria.name}}
</span>
<a><i class="remove glyphicon glyphicon-remove-sign glyphicon-white" ng-click="doDataFilter(criteria.propertyName)"></i></a>
</span>
</div>
<div id="mainAreaDiv" class="main-area" style="padding-top: 10px">
<div class="inputInvoiceGrid" ui-grid="gridOptions">
<div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
</div> </div>
</div> </div>
<div class="page-footer">
<ack-pagination page-options="pagingOptions"
refresh-table="refreshGrid()"></ack-pagination>
</div>
</div> </div>
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less
View file @ 645167ca
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-preview-journal-merge { .cit-preview-journal-merge {
background-color: white; /*background-color: @color-white;*/
height: 100%; padding-left: 20px;
/*min-height: 800px;*/
height: 96%;
.row { .dropdown-common() {
margin-left: 0px; display: inline-block;
margin-bottom:10px;
&>span { .select-button {
float: right; background-color: #F5F5F5;
margin-right: 15px; padding: 6px 0;
cursor: pointer; width: 100px;
} }
}
.nav-wrapper { .caret {
padding-bottom: 10px; margin-top: 8px;
border-bottom: 1px solid #DBD8D3;
.nav-header {
height: 54px;
line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700;
font-style: normal;
font-size: 15px;
color: #333;
} }
.nav-tab { .dropdown-menu {
/*display: inline-block;*/ min-width: 100px;
span { li {
display: inline-block;
height: 34px;
width: 80px;
text-align: center; text-align: center;
line-height: 34px; min-height: 0px;
padding: 0 10px; height: 30px;
background-color: #B90808; line-height: 30px;
color: #FFF; color: #000;
font-weight: normal;
&:hover {
background-color: #F91000;
color: #FFF;
}
}
}
}
#tab_total {
display: block;
height: calc(~'100% - 80px');
position: relative;
.import-wrapper {
span {
margin-left: 10px;
color: #333;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-weight: 400;
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
cursor: pointer; font-weight: bold;
} }
.active { .checkbox-custom {
background-color: #F91000; float: left;
position: relative;
margin-right : 10px;
margin-top: 0;
display: inline-block;
} }
} .divider{
} height: 1px;
margin: 9px 0;
.numAmount { overflow: hidden;
padding: 0 3px; background-color: #e5e5e5;
height: 21px; }
margin-left: 5px;
/* font-family: 'Arial'; */
font-weight: 600;
border-radius: 2px;
font-style: normal;
outline: none;
border: none;
min-width: 20px;
background-color: #DDDDDD;
color: #AA0000;
}
.top-area-wrapper {
height: 60px;
width: 98%;
margin: 0 20px;
.filter-button { .checkbox-custom input[type="checkbox"] {
width: 30px; cursor: pointer;
margin-top: 16px; z-index: 2;
} margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.operation-wrapper { .checkbox-custom label:before {
margin: 15px 25px 10px 10px; content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
span { .checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer; cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
} }
}
}
.filter-popup-wrapper { .period-picker {
display: none; width: 110px;
} border: 1px solid #c7c5c0;
display: inline-block;
line-height: 20px;
margin-top: 7px;
}
.imp-subheader {
display: inline-block;
font-size: 15px;
height: 30px;
line-height: 30px;
vertical-align: middle;
border: none;
select {
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
background: transparent;
}
}
.dropdown {
.dropdown-common();
}
.margin-left20 { input {
margin-left: 20px; width: 50px;
} outline: none;
/*******************************************/ border-radius: 3px;
/*Filter Criteria tags:*/ border: 1px solid #3c3a36;
.tag { padding: 2px;
font-size: 12px; text-align: center;
padding: .3em .4em .4em; }
margin: 0 .1em;
a { > button:last-child {
color: #bbb; float: right;
cursor: pointer; margin-right: 20px;
opacity: 0.6; }
margin: 0 0 0 .3em;
.btn-wrapper {
border-radius: 5px;
background-color: #e0301e;
color: #FFF;
display: inline-block;
float: right;
margin-right: 10px;
&:hover { .btn-vat-primary {
opacity: 1.0; min-width: 80px;
}
} }
}
.glyphicon-white { .dt-init-wrapper {
color: #fff; margin: 0px 0;
margin-bottom: 2px; max-width: 99%;
} height: calc(~'100% - 20px');
position: relative;
margin-top: 10px;
} }
.remove { .error-info-wrapper {
vertical-align: bottom; position: absolute;
top: 0; height: 150px;
bottom: 0;
left: 0;
right: 0;
overflow: hidden;
background-color: #FFF;
margin-left: -40px;
} }
}
/*Filter Criteria tags:*/
/*******************************************/
.main-area {
margin: 0 20px;
.watermark { #content-resizer {
width: 110%;
position: absolute; position: absolute;
top: 50%; height: 4px;
transform: translateY(-50%); bottom: 150px;
opacity: .25; left: 0;
font-size: 3em; right: 0;
width: 100%; background-color: red;
text-align: center; cursor: n-resize;
z-index: 1000; margin-left: -40px;
#topIcon {
cursor: pointer;
margin-top: -19px;
width: 38px;
margin-left: 46%;
z-index: 999;
bottom: -381px;
text-align: center;
display: block !important;
}
} }
.inputInvoiceGrid { .dt-import-wrapper {
width: 100%; margin: 60px 0;
height: calc(~'100% - 158px'); max-width: 99%;
overflow: auto;
height: calc(~"100% - 35px");
.ui-grid-header-cell-wrapper .ui-grid-header-cell-row .ui-grid-cell-contents { .dropdown {
height: 40px; .dropdown-common();
i { i {
display: none; color: #F85550;
} }
} }
} }
} }
/*覆写ack-pagination.less中：.page-size, .pagination 中的margin演示 */
.form-control { .page-form-group{
float:right;
&:focus { .page-size{
border-color: transparent; margin:0;
-webkit-box-shadow: none; }
box-shadow: none; .pagination {
border: 1px solid #ccc; margin:0;
} }
} }
}
.input-width-middle { .form-control {
width: 217px; &:focus {
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #ccc;
} }
} }
.input-width-middle {
width: 217px;
}
.popover { .popover {
min-width: 370px; min-width: 370px;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js
View file @ 645167ca
...@@ -192,8 +192,8 @@ ...@@ -192,8 +192,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -224,7 +224,6 @@ ...@@ -224,7 +224,6 @@
bindingOptions: { bindingOptions: {
dataSource: 'gridDataSource' dataSource: 'gridDataSource'
}, },
showBorders: true,
columns: [ columns: [
{ {
caption: $translate.instant('AssetType'), caption: $translate.instant('AssetType'),
...@@ -334,47 +333,18 @@ ...@@ -334,47 +333,18 @@
selection: { selection: {
mode: "single" mode: "single"
}, },
grouping: { paging: {
autoExpandAll: false pageSize: 20
}, },
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true,
showRowLines: true, showRowLines: true,
showColumnLines: true, showColumnLines: true,
rowAlternationEnabled: true, //单双行颜色 rowAlternationEnabled: true, //单双行颜色
showBorders: true,
hoverStateEnabled: true,
height: '99%',
noDataText: $translate.instant('NoDataText'), noDataText: $translate.instant('NoDataText'),
}; };
// $scope.gridOptions = {
// rowHeight: constant.UIGrid.rowHeight,
// selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// // expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
// virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
// enableSorting: false,
// enableColumnMenus: false,
// enableHorizontalScrollbar : 1,
// columnDefs: [
// { name: $translate.instant('AssetType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetType}}<span></div>' },
// { name: $translate.instant('AssetNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetNumber}}<span></div>' },
// { name: $translate.instant('AssetName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
// { name: $translate.instant('BuyDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.buyDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('DepreciationDate2'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
// { name: $translate.instant('AssetGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetGroupName}}</span></div>' },
// { name: $translate.instant('AcquisitionValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.acquisitionValue}}</span></div>' },
// { name: $translate.instant('ResidualValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span >{{row.entity.residualRate}}</span></div>' },
// { name: $translate.instant('YearEndValue'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.yearEndValue}}</span></div>' },
// { name: $translate.instant('compensationSaleAmount'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.compensationSaleAmount}}</span></div>' },
//
// { name: $translate.instant('DisposalProfitAndLoss'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalProfitAndLoss}}</span></div>' },
//
// { name: $translate.instant('TaxGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxGroupName}}</span></div>' },
// { name: $translate.instant('DepreciationPeriod'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.depreciationPeriod}}</span></div>' },
// { name: $translate.instant('PerMonthDepreciationAmount'),width: 120,cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.perMonthDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxToCurrentYearDepreciationPeriod'), width: 120,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxToCurrentYearDepreciationPeriod}}</span></div>' },
// { name: $translate.instant('AccountTotalepreciationAmount'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxToCurrentYearDepreciationAmount}}</span></div>' },
// { name: $translate.instant('TaxNetValue'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.taxNetValue}}</span></div>' },
// { name: $translate.instant('DisposalTaxBenefit'),width: 120, cellTemplate: '<div class="ui-grid-cell-contents" style="float: right"><span>{{row.entity.disposalTaxBenefit}}</span></div>' }
// ]
// };
$scope.doDataFilter = doDataFilter; $scope.doDataFilter = doDataFilter;
$scope.doDataFilterReset = doDataFilterReset; $scope.doDataFilterReset = doDataFilterReset;
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html
View file @ 645167ca
...@@ -23,10 +23,7 @@ ...@@ -23,10 +23,7 @@
<!--导航栏--> <!--导航栏-->
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions" >
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
style="margin-top: 30px;">
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.less
View file @ 645167ca
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.ctrl.js
View file @ 645167ca
...@@ -207,8 +207,8 @@ ...@@ -207,8 +207,8 @@
$scope.pagingOptions = { $scope.pagingOptions = {
pageIndex: 1, //当前页码 pageIndex: 1, //当前页码
totalItems: 0, //总数据 totalItems: 0, //总数据
pageSize: 50, //每页多少条数据 pageSize: 20, //每页多少条数据
pageSizeString:"50" pageSizeString:"20"
}; };
$('#input-invoice-period-picker').focus(function () { $('#input-invoice-period-picker').focus(function () {
...@@ -284,6 +284,9 @@ ...@@ -284,6 +284,9 @@
grouping: { grouping: {
autoExpandAll: false autoExpandAll: false
}, },
paging: {
pageSize: 20
},
allowColumnResizing: true, allowColumnResizing: true,
columnAutoWidth: true, columnAutoWidth: true,
showRowLines: true, showRowLines: true,
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.html
View file @ 645167ca
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
<div id="tab_total"> <div id="tab_total">
<div class="dt-init-wrapper"> <div class="dt-init-wrapper">
<div class="dx-viewport grid-container"> <div id="extractFinancialGridContainer" dx-data-grid="gridOptions"
<div id="extractFinancialGridContainer" dx-data-grid="gridOptions" style="margin-top: 30px;">
style="margin-top: 30px;">
</div>
</div> </div>
<div class="page-footer"> <div class="page-footer">
<ack-pagination page-options="pagingOptions" <ack-pagination page-options="pagingOptions"
......
atms-web/src/main/webapp/app/cit/reduction/cit-distribution-table/cit-distribution-table.less
View file @ 645167ca
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 40px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.import-wrapper { .import-wrapper {
...@@ -170,29 +170,11 @@ ...@@ -170,29 +170,11 @@
} }
.dt-init-wrapper { .dt-init-wrapper {
//margin: 60px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(100% - 200px); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px;
.dropdown {
.dropdown-common();
i {
color: #F85550;
}
}
.extractFinancialGridContainer {
height: calc(~'100% - 30px');
overflow: hidden;
position: absolute;
top: 0;
bottom: 136px; /* 130 + 6 */
left: 0;
right: 0;
background-color: #FFF;
}
} }
.error-info-wrapper { .error-info-wrapper {
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
View file @ 645167ca
...@@ -85,6 +85,34 @@ ...@@ -85,6 +85,34 @@
}); });
}; };
$scope.exportRevenueConf = function () {
$http.get('/revenueConf/export', apiConfig.create({ responseType: 'arraybuffer' })).success(function (data, status, headers) {
var octetStreamMime = 'application/octet-stream';
var contentType = headers('content-type') || octetStreamMime;
if (window.navigator.msSaveBlob) {
var blob = new Blob([data], {
type: contentType
});
navigator.msSaveBlob(blob, "收入类型配置报表");
} else {
var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
if (urlCreator) {
var a = document.createElement('a');
var blob = new Blob([data], {
type: contentType
});
var url = urlCreator.createObjectURL(blob);
a.href = url;
a.target = '_blank';
a.download = "收入类型配置报表.xlsx";
document.body.appendChild(a);
a.click();
}
}
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
//表格配置 //表格配置
$scope.revenueGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, { $scope.revenueGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
columns: [ columns: [
......
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.html
View file @ 645167ca
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<button type="button" class="btn btn-in-grid inline-div" ng-click="downloadTemplate()"><i <button type="button" class="btn btn-in-grid inline-div" ng-click="downloadTemplate()"><i
class="fa fa-download" aria-hidden="true"></i>下载模板 class="fa fa-download" aria-hidden="true"></i>下载模板
</button> </button>
<button type="button" class="btn btn-in-grid inline-div" ng-click="exportRevenueConf()"><i
class="fa fa-download" aria-hidden="true"></i>导出报表
</button>
</div> </div>
</form> </form>
......
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