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
7a7ecfa0
Commit
7a7ecfa0
authored
Sep 06, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收入优化
parent
08cbd5ea
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
224 additions
and
156 deletions
+224
-156
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+100
-114
TIncomeDetail.java
.../yifu/cloud/plus/v1/yifu/social/entity/TIncomeDetail.java
+5
-0
TIncomeServiceImpl.java
.../plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
+113
-42
TIncomeDetailMapper.xml
...ial-biz/src/main/resources/mapper/TIncomeDetailMapper.xml
+6
-0
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
7a7ecfa0
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TIncomeDetail.java
View file @
7a7ecfa0
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
...
@@ -30,6 +31,7 @@ import org.hibernate.validator.constraints.Length;
...
@@ -30,6 +31,7 @@ import org.hibernate.validator.constraints.Length;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* 收入明细表-全部明细
* 收入明细表-全部明细
...
@@ -194,4 +196,7 @@ public class TIncomeDetail {
...
@@ -194,4 +196,7 @@ public class TIncomeDetail {
@ExcelProperty
(
"管理费风险金的结算方式:1预估2实缴"
)
@ExcelProperty
(
"管理费风险金的结算方式:1预估2实缴"
)
private
String
mrSettleType
;
private
String
mrSettleType
;
// 查询时框定范围使用
@TableField
(
exist
=
false
)
private
List
<
String
>
idCardList
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @
7a7ecfa0
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeDetailMapper.xml
View file @
7a7ecfa0
...
@@ -131,6 +131,12 @@
...
@@ -131,6 +131,12 @@
<if
test=
"tIncomeDetail.redData != null and tIncomeDetail.redData.trim() != ''"
>
<if
test=
"tIncomeDetail.redData != null and tIncomeDetail.redData.trim() != ''"
>
AND a.RED_DATA = #{tIncomeDetail.redData}
AND a.RED_DATA = #{tIncomeDetail.redData}
</if>
</if>
<if
test=
"tIncomeDetail.idCardList != null and tIncomeDetail.idCardList.size() > 0"
>
AND a.EMP_IDCARD in
<foreach
item=
"item"
index=
"index"
collection=
"tIncomeDetail.idCardList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</if>
</if>
</sql>
</sql>
...
...
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