Commit 244ad198 authored by frank.xa.zhang's avatar frank.xa.zhang

fixed the formula project context and remove some unused data in DB

need add the bspl report in the system
parent add077bc
...@@ -228,7 +228,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi ...@@ -228,7 +228,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
if (periodCellTemplateConfigList != null) { if (periodCellTemplateConfigList != null) {
periodCellTemplateConfigList.forEach(a -> { periodCellTemplateConfigList.forEach(a -> {
if (StringUtils.isNotBlank(a.getAccountCodes())) { if (StringUtils.isNotBlank(a.getAccountCodes())) {
String[] acctCodes = ",".split(a.getAccountCodes()); String[] acctCodes = a.getAccountCodes().split(",");
EnterpriseAccountExample enterpriseAccountExample = new EnterpriseAccountExample(); EnterpriseAccountExample enterpriseAccountExample = new EnterpriseAccountExample();
enterpriseAccountExample.createCriteria().andStdCodeIn(Arrays.asList(acctCodes)); enterpriseAccountExample.createCriteria().andStdCodeIn(Arrays.asList(acctCodes));
List<EnterpriseAccount> enterpriseAccounts = enterpriseAccountMapper.selectByExample(enterpriseAccountExample); List<EnterpriseAccount> enterpriseAccounts = enterpriseAccountMapper.selectByExample(enterpriseAccountExample);
...@@ -261,7 +261,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi ...@@ -261,7 +261,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
public OperationResultDto generateData(String projectId, EnumServiceType serviceType, Boolean ifDeleteManualDataSource, Integer periodParam, Integer reportType, String generator) { public OperationResultDto generateData(String projectId, EnumServiceType serviceType, Boolean ifDeleteManualDataSource, Integer periodParam, Integer reportType, String generator) {
OperationResultDto operationResultDto = new OperationResultDto(); OperationResultDto operationResultDto = new OperationResultDto();
if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null && periodParam <= 0)) { if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {
operationResultDto.setResultMsg("PeriodRequiredForVAT"); operationResultDto.setResultMsg("PeriodRequiredForVAT");
return operationResultDto; return operationResultDto;
} }
...@@ -271,7 +271,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi ...@@ -271,7 +271,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
throw new NotSupportedException(); throw new NotSupportedException();
} }
int period = periodParam != null ? periodParam : 0; int period = periodParam;
String serviceTypeStr = serviceType.getCode().toString(); String serviceTypeStr = serviceType.getCode().toString();
ProjectServiceTypeExample projectServiceTypeExample = new ProjectServiceTypeExample(); ProjectServiceTypeExample projectServiceTypeExample = new ProjectServiceTypeExample();
......
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