Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
二
二医大银行收款回单
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JAVA
二医大银行收款回单
Merge requests
!338
111111
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
111111
feature/cyf
into
dev
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
崔用芳
requested to merge
feature/cyf
into
dev
8 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
aafbe8a9
1 commit,
8 months ago
1 file
+
2
−
1
Expand all files
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
+
2
−
1
Options
@@ -37,9 +37,10 @@
left join (select distinct a.income_id,b.entry_type from t_entry_bill a left join
t_entry_bill_flow b on a.id=b.entry_id where b.entry_type in('到款转暂存')) i on i.income_id=a.id
left join t_bank_account_number j on j.bank_number=a.income_account and j.available='Yes'
and (f.entry_type='到账转收入' or f.entry_type='' or f.entry_type is null or f.entry_type='暂存转收入')
<where>
FIND_IN_SET(#{code}, b.finance_code)
and (f.entry_type='到账转收入' or f.entry_type='' or f.entry_type is null or f.entry_type='暂存转收入')
<if
test=
"qry.voucherState.contains('已入账') "
>
and (a.income_speed='入账' or a.income_speed='完成')
</if>