Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
d244664d
Commit
d244664d
authored
Sep 29, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] use period tax rule setting projectid in vat logic
parent
5d382a4d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
GZSD.java
.../taxtech/atms/vat/service/impl/report/functions/GZSD.java
+2
-2
PeriodTaxRuleSettingMapper.java
.../pwc/taxtech/atms/vat/dao/PeriodTaxRuleSettingMapper.java
+3
-1
PeriodTaxRuleSettingExtendsMapper.xml
...tms/vat/dao/extends/PeriodTaxRuleSettingExtendsMapper.xml
+2
-0
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/GZSD.java
View file @
d244664d
...
...
@@ -69,11 +69,11 @@ public class GZSD extends FunctionBase implements FreeRefFunction {
List
<
PeriodTaxRuleSetting
>
taxRuleSettings
=
SpringContextUtil
.
periodTaxRuleSettingMapper
.
getTaxRuleSetting
(
formulaContext
.
getOrganizationId
(),
taxName
,
formulaContext
.
getPeriod
());
taxName
,
formulaContext
.
getPeriod
()
,
formulaContext
.
getProjectId
()
);
Optional
<
PeriodTaxRuleSetting
>
matchedRule
=
taxRuleSettings
.
stream
().
filter
(
a
->
a
.
getIsDefault
()
!=
Constant
.
IsDefault
.
Yes
).
findFirst
();
if
(!
matchedRule
.
isPresent
())
{
matchedRule
=
Optional
.
ofNullable
(
taxRuleSettings
.
size
()
>
0
?
taxRuleSettings
.
get
(
0
):
null
);
matchedRule
=
Optional
.
ofNullable
(
taxRuleSettings
.
size
()
>
0
?
taxRuleSettings
.
get
(
0
)
:
null
);
if
(!
matchedRule
.
isPresent
())
{
NumberFormat
nf
=
NumberFormat
.
getPercentInstance
();
...
...
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodTaxRuleSettingMapper.java
View file @
d244664d
...
...
@@ -109,5 +109,6 @@ public interface PeriodTaxRuleSettingMapper extends MyVatMapper {
List
<
PeriodTaxRuleSetting
>
getTaxRuleSetting
(
@Param
(
"organizationId"
)
String
organizationId
,
@Param
(
"taxName"
)
String
taxName
,
@Param
(
"period"
)
int
period
);
@Param
(
"taxName"
)
String
taxName
,
@Param
(
"period"
)
int
period
,
@Param
(
"projectId"
)
String
projectId
);
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodTaxRuleSettingExtendsMapper.xml
View file @
d244664d
...
...
@@ -20,6 +20,7 @@
)
AND TRS.NAME = #{taxName,jdbcType=VARCHAR}
AND TRS.PERIOD = #{period,jdbcType=INTEGER}
AND TRS.PROJECT_ID = #{projectId,jdbcType=INTEGER}
</select>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment