Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
08d55467
You need to sign in or sign up before continuing.
Commit
08d55467
authored
Sep 06, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
53ecc0e6
10bc0cdb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
IncomeExportVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/IncomeExportVo.java
+1
-1
TIncomeMapper.xml
...fu-social-biz/src/main/resources/mapper/TIncomeMapper.xml
+4
-4
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/IncomeExportVo.java
View file @
08d55467
...
@@ -144,6 +144,6 @@ public class IncomeExportVo implements Serializable {
...
@@ -144,6 +144,6 @@ public class IncomeExportVo implements Serializable {
@ExcelAttribute
(
name
=
"推送状态"
,
isDataId
=
true
,
readConverterExp
=
"0=未推送,1=已推送"
)
@ExcelAttribute
(
name
=
"推送状态"
,
isDataId
=
true
,
readConverterExp
=
"0=未推送,1=已推送"
)
@Schema
(
description
=
"推送状态:0未推送1已推送"
)
@Schema
(
description
=
"推送状态:0未推送1已推送"
)
@ExcelProperty
(
"推送状态"
)
@ExcelProperty
(
"推送状态"
)
private
String
push
Status
;
private
String
send
Status
;
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml
View file @
08d55467
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<result
property=
"payMonth"
column=
"PAY_MONTH"
/>
<result
property=
"payMonth"
column=
"PAY_MONTH"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"dataCreateMonth"
column=
"DATA_CREATE_MONTH"
/>
<result
property=
"dataCreateMonth"
column=
"DATA_CREATE_MONTH"
/>
<result
property=
"sendStatus"
column=
"
PUSH
_STATUS"
/>
<result
property=
"sendStatus"
column=
"
SEND
_STATUS"
/>
<result
property=
"redData"
column=
"RED_DATA"
/>
<result
property=
"redData"
column=
"RED_DATA"
/>
<result
property=
"sendStatus"
column=
"SEND_STATUS"
/>
<result
property=
"sendStatus"
column=
"SEND_STATUS"
/>
<result
property=
"sendTime"
column=
"SEND_TIME"
/>
<result
property=
"sendTime"
column=
"SEND_TIME"
/>
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
<result
property=
"payMonth"
column=
"PAY_MONTH"
/>
<result
property=
"payMonth"
column=
"PAY_MONTH"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"dataCreateMonth"
column=
"DATA_CREATE_MONTH"
/>
<result
property=
"dataCreateMonth"
column=
"DATA_CREATE_MONTH"
/>
<result
property=
"
pushStatus"
column=
"PUSH
_STATUS"
/>
<result
property=
"
sendStatus"
column=
"SEND
_STATUS"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -145,8 +145,8 @@
...
@@ -145,8 +145,8 @@
<if
test=
"tIncome.dataCreateMonth != null and tIncome.dataCreateMonth.trim() != ''"
>
<if
test=
"tIncome.dataCreateMonth != null and tIncome.dataCreateMonth.trim() != ''"
>
AND a.DATA_CREATE_MONTH = #{tIncome.dataCreateMonth}
AND a.DATA_CREATE_MONTH = #{tIncome.dataCreateMonth}
</if>
</if>
<if
test=
"tIncome.
pushStatus != null and tIncome.push
Status.trim() != ''"
>
<if
test=
"tIncome.
sendStatus != null and tIncome.send
Status.trim() != ''"
>
AND a.
PUSH_STATUS = #{tIncome.push
Status}
AND a.
SEND_STATUS = #{tIncome.send
Status}
</if>
</if>
<if
test=
"tIncome.redData != null and tIncome.redData.trim() != ''"
>
<if
test=
"tIncome.redData != null and tIncome.redData.trim() != ''"
>
AND a.RED_DATA = #{tIncome.redData}
AND a.RED_DATA = #{tIncome.redData}
...
...
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