Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
cloud-fb
Commits
2e30b017
Commit
2e30b017
authored
May 24, 2021
by
wukaiqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改回款明细-退费未完成展示出现的问题
列表及条数同意增加状态判断
parent
122cb6d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
PaymentDetailsDaoImpl.java
.../dinas/statistics/internal/dao/PaymentDetailsDaoImpl.java
+3
-1
No files found.
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/PaymentDetailsDaoImpl.java
View file @
2e30b017
...
@@ -44,9 +44,10 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
...
@@ -44,9 +44,10 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
+
" financeRefund.refund_Explain AS remark ,\r\n"
+
" financeRefund.refund_Explain AS remark ,\r\n"
+
" financeRefund.regional_Company AS regionalCompanyId,\r\n"
+
" financeRefund.regional_Company AS regionalCompanyId,\r\n"
+
" CASE WHEN financeRefund.fund_Type = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END AS fundType1 \r\n"
+
" CASE WHEN financeRefund.fund_Type = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END AS fundType1 \r\n"
+
" FROM\r\n"
+
"
xyst_dinas_finance_refund AS financeRefund\r\n"
+
" FROM\r\n"
+
" xyst_dinas_finance_refund AS financeRefund\r\n"
+
" LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
+
" LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
+
" LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+
" LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+
" WHERE financeRefund.refund_state = 'REFUNDED' \r\n"
+
"UNION ALL\r\n"
+
" "
+
"UNION ALL\r\n"
+
" "
+
" SELECT\r\n"
+
" SELECT\r\n"
+
" DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
+
" DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
...
@@ -199,6 +200,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
...
@@ -199,6 +200,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
+
" FROM\r\n"
+
" xyst_dinas_finance_refund AS financeRefund\r\n"
+
" FROM\r\n"
+
" xyst_dinas_finance_refund AS financeRefund\r\n"
+
" LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
+
" LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
+
" LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+
" LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+
" WHERE financeRefund.refund_state = 'REFUNDED' \r\n"
+
"UNION ALL\r\n"
+
" SELECT\r\n"
+
"UNION ALL\r\n"
+
" SELECT\r\n"
+
" DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
+
" DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
+
" purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
+
" purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
...
...
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