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
1b3b6107
Commit
1b3b6107
authored
Jul 19, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
6676e0f3
db068b39
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
86 additions
and
24 deletions
+86
-24
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+7
-1
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+16
-0
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+9
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+36
-5
SysBaseSetInfo.java
...yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
+16
-16
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
1b3b6107
...
@@ -135,7 +135,7 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -135,7 +135,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 签订类型(字典也是汉字
* 签订类型(字典也是汉字
*/
*/
@NotBlank
(
message
=
"签订类型不能为空"
)
@NotBlank
(
message
=
"签订类型不能为空"
)
@Length
(
max
=
1
,
message
=
"签订类型不能超过1个字符"
)
@Length
(
max
=
1
00
,
message
=
"签订类型不能超过1个字符"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
)
@Schema
(
description
=
"签订类型(字典也是汉字)"
,
name
=
"situation"
)
@Schema
(
description
=
"签订类型(字典也是汉字)"
,
name
=
"situation"
)
private
String
situation
;
private
String
situation
;
...
@@ -435,6 +435,12 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -435,6 +435,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema
(
description
=
"原因说明"
,
name
=
"reason"
)
@Schema
(
description
=
"原因说明"
,
name
=
"reason"
)
private
String
reason
;
private
String
reason
;
/**
* 是否附件 0是/1否
*/
@Schema
(
description
=
"是否附件 0是/1否"
)
@TableField
(
exist
=
false
)
private
String
isAtta
;
@Schema
(
description
=
"附件idList"
)
@Schema
(
description
=
"附件idList"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
1b3b6107
...
@@ -389,4 +389,20 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -389,4 +389,20 @@ public class TEmployeeInfo extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
leaveTimeEnd
;
private
String
leaveTimeEnd
;
@Schema
(
description
=
"社保状态多个"
)
@TableField
(
exist
=
false
)
private
String
[]
socialStatusArray
;
@Schema
(
description
=
"公积金状态多个"
)
@TableField
(
exist
=
false
)
private
String
[]
fundStatusArray
;
@Schema
(
description
=
"商险状态多个"
)
@TableField
(
exist
=
false
)
private
String
[]
insuranceStatusArray
;
@Schema
(
description
=
"合同状态多个"
)
@TableField
(
exist
=
false
)
private
String
[]
contractStatusArray
;
@Schema
(
description
=
"员工类型多个"
)
@TableField
(
exist
=
false
)
private
String
[]
empNatureArray
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
1b3b6107
...
@@ -69,6 +69,7 @@ public class TEmployeeContractInfoController {
...
@@ -69,6 +69,7 @@ public class TEmployeeContractInfoController {
@Operation
(
summary
=
"归档分页查询(审核通过的数据(后面加上权限:自己创建的))"
,
description
=
"归档分页查询"
)
@Operation
(
summary
=
"归档分页查询(审核通过的数据(后面加上权限:自己创建的))"
,
description
=
"归档分页查询"
)
@GetMapping
(
"/filingPage"
)
@GetMapping
(
"/filingPage"
)
public
R
<
IPage
<
TEmployeeContractInfo
>>
getFilingPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
public
R
<
IPage
<
TEmployeeContractInfo
>>
getFilingPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
tEmployeeContractInfo
.
setSituation
(
CommonConstants
.
ZERO_STRING
);
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
dingleDigitIntArray
[
2
]);
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
dingleDigitIntArray
[
2
]);
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
1b3b6107
...
@@ -197,7 +197,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -197,7 +197,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private
void
initEmployeeContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
TEmployeeInfo
tEmployeeInfo
private
void
initEmployeeContract
(
TEmployeeContractInfo
tEmployeeContractInfo
,
TEmployeeInfo
tEmployeeInfo
,
TEmployeeProject
tEmployeeProject
,
YifuUser
user
)
{
,
TEmployeeProject
tEmployeeProject
,
YifuUser
user
)
{
tEmployeeContractInfo
.
setEmpId
(
tEmployeeInfo
.
getId
());
tEmployeeContractInfo
.
setEmpId
(
tEmployeeInfo
.
getId
());
tEmployeeContractInfo
.
setEmpNatrue
(
tEmployee
Info
.
getEmpNatrue
());
tEmployeeContractInfo
.
setEmpNatrue
(
tEmployee
Project
.
getEmpNatrue
());
tEmployeeContractInfo
.
setEmpIdcard
(
tEmployeeInfo
.
getEmpIdcard
());
tEmployeeContractInfo
.
setEmpIdcard
(
tEmployeeInfo
.
getEmpIdcard
());
tEmployeeContractInfo
.
setEmpName
(
tEmployeeInfo
.
getEmpName
());
tEmployeeContractInfo
.
setEmpName
(
tEmployeeInfo
.
getEmpName
());
tEmployeeContractInfo
.
setEmpNo
(
tEmployeeInfo
.
getEmpCode
());
tEmployeeContractInfo
.
setEmpNo
(
tEmployeeInfo
.
getEmpCode
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
1b3b6107
...
@@ -240,8 +240,13 @@
...
@@ -240,8 +240,13 @@
AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
</if>
</if>
<if
test=
"tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''"
>
<if
test=
"tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''"
>
<if
test=
"tEmployeeContractInfo.situation == '0' "
>
AND a.SITUATION != '作废' AND a.SITUATION != '终止'
</if>
<if
test=
"tEmployeeContractInfo.situation != '0' "
>
AND a.SITUATION = #{tEmployeeContractInfo.situation}
AND a.SITUATION = #{tEmployeeContractInfo.situation}
</if>
</if>
</if>
<if
test=
"tEmployeeContractInfo.contractTerm != null"
>
<if
test=
"tEmployeeContractInfo.contractTerm != null"
>
AND a.CONTRACT_TERM = #{tEmployeeContractInfo.contractTerm}
AND a.CONTRACT_TERM = #{tEmployeeContractInfo.contractTerm}
</if>
</if>
...
@@ -257,6 +262,9 @@
...
@@ -257,6 +262,9 @@
<if
test=
"tEmployeeContractInfo.isFile != null and tEmployeeContractInfo.isFile.trim() != ''"
>
<if
test=
"tEmployeeContractInfo.isFile != null and tEmployeeContractInfo.isFile.trim() != ''"
>
AND a.IS_FILE = #{tEmployeeContractInfo.isFile}
AND a.IS_FILE = #{tEmployeeContractInfo.isFile}
</if>
</if>
<if
test=
"tEmployeeContractInfo.isAtta != null and tEmployeeContractInfo.isAtta.trim() != ''"
>
AND a.IS_FILE = #{tEmployeeContractInfo.isAtta}
</if>
<if
test=
"tEmployeeContractInfo.oldId != null"
>
<if
test=
"tEmployeeContractInfo.oldId != null"
>
AND a.OLD_ID = #{tEmployeeContractInfo.oldId}
AND a.OLD_ID = #{tEmployeeContractInfo.oldId}
</if>
</if>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
1b3b6107
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
AND a.EMP_CODE = #{tEmployeeInfo.empCode}
AND a.EMP_CODE = #{tEmployeeInfo.empCode}
</if>
</if>
<if
test=
"tEmployeeInfo.empNatrue != null and tEmployeeInfo.empNatrue.trim() != ''"
>
<if
test=
"tEmployeeInfo.empNatrue != null and tEmployeeInfo.empNatrue.trim() != ''"
>
AND a.EMP_NATRUE
in (${tEmployeeInfo.empNatrue})
AND a.EMP_NATRUE
= #{tEmployeeInfo.empNatrue}
</if>
</if>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
AND a.EMP_NAME = #{tEmployeeInfo.empName}
AND a.EMP_NAME = #{tEmployeeInfo.empName}
...
@@ -348,16 +348,16 @@
...
@@ -348,16 +348,16 @@
</if>
</if>
</if>
</if>
<if
test=
"tEmployeeInfo.contractStatus != null"
>
<if
test=
"tEmployeeInfo.contractStatus != null"
>
AND a.CONTRACT_STATUS
in (${tEmployeeInfo.contractStatus})
AND a.CONTRACT_STATUS
= #{tEmployeeInfo.contractStatus}
</if>
</if>
<if
test=
"tEmployeeInfo.insuranceStatus != null"
>
<if
test=
"tEmployeeInfo.insuranceStatus != null"
>
AND a.INSURANCE_STATUS
in (${tEmployeeInfo.insuranceStatus})
AND a.INSURANCE_STATUS
= #{tEmployeeInfo.insuranceStatus}
</if>
</if>
<if
test=
"tEmployeeInfo.socialStatus != null"
>
<if
test=
"tEmployeeInfo.socialStatus != null"
>
AND a.SOCIAL_STATUS
in (${tEmployeeInfo.socialStatus})
AND a.SOCIAL_STATUS
= #{tEmployeeInfo.socialStatus}
</if>
</if>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
AND a.FUND_STATUS
in (${tEmployeeInfo.fundStatus})
AND a.FUND_STATUS
= #(${tEmployeeInfo.fundStatus}
</if>
</if>
<if
test=
"tEmployeeInfo.salaryStatus != null"
>
<if
test=
"tEmployeeInfo.salaryStatus != null"
>
AND a.SALARY_STATUS = #{tEmployeeInfo.salaryStatus}
AND a.SALARY_STATUS = #{tEmployeeInfo.salaryStatus}
...
@@ -404,6 +404,37 @@
...
@@ -404,6 +404,37 @@
<if
test=
"tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''"
>
<if
test=
"tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''"
>
AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress}
AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress}
</if>
</if>
<if
test=
"tEmployeeInfo.empNatureArray != null"
>
AND a.EMP_NATRUE in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeInfo.empNatureArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeInfo.contractStatusArray != null"
>
AND a.CONTRACT_STATUS in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeInfo.contractStatusArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeInfo.insuranceStatusArray != null"
>
AND a.INSURANCE_STATUS in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeInfo.insuranceStatusArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeInfo.socialStatusArray != null"
>
AND a.SOCIAL_STATUS in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeInfo.socialStatusArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tEmployeeInfo.fundStatusArray != null"
>
AND a.FUND_STATUS in
<foreach
item=
"idStr"
index=
"index"
collection=
"tEmployeeInfo.fundStatusArray"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
</if>
</if>
</if>
</if>
</sql>
</sql>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
View file @
1b3b6107
...
@@ -205,19 +205,19 @@ public class SysBaseSetInfo extends BaseEntity {
...
@@ -205,19 +205,19 @@ public class SysBaseSetInfo extends BaseEntity {
private
BigDecimal
personalProSum
;
private
BigDecimal
personalProSum
;
/**
/**
* 是否大病:
1.是 2.否
* 是否大病:
0收取;1不收取
*/
*/
@ExcelAttribute
(
name
=
"是否大病:
1.是 2.否
"
)
@ExcelAttribute
(
name
=
"是否大病:
0收取;1不收取
"
)
@Schema
(
description
=
"是否大病:
1.是 2.否
"
)
@Schema
(
description
=
"是否大病:
0收取;1不收取
"
)
@ExcelProperty
(
"是否大病:
1.是 2.否
"
)
@ExcelProperty
(
"是否大病:
0收取;1不收取
"
)
private
String
isIllness
;
private
String
isIllness
;
/**
/**
*
收费模式:新员工入职是否收费 1.是 2
.否
*
新员工入职是否收费 0.是 1
.否
*/
*/
@ExcelAttribute
(
name
=
"
收费模式:新员工入职是否收费 1.是 2
.否"
)
@ExcelAttribute
(
name
=
"
新员工入职是否收费 0.是 1
.否"
)
@Schema
(
description
=
"
收费模式:新员工入职是否收费 1.是 2
.否"
)
@Schema
(
description
=
"
新员工入职是否收费 0.是 1
.否"
)
@ExcelProperty
(
"
收费模式:新员工入职是否收费 1.是 2
.否"
)
@ExcelProperty
(
"
新员工入职是否收费 0.是 1
.否"
)
private
String
isChargePersonal
;
private
String
isChargePersonal
;
/**
/**
...
@@ -237,11 +237,11 @@ public class SysBaseSetInfo extends BaseEntity {
...
@@ -237,11 +237,11 @@ public class SysBaseSetInfo extends BaseEntity {
private
BigDecimal
chargePersonal
;
private
BigDecimal
chargePersonal
;
/**
/**
* 大病缴纳周期:收取方式
1.年 2.
月
* 大病缴纳周期:收取方式
0.按年 1.按
月
*/
*/
@ExcelAttribute
(
name
=
"大病缴纳周期:收取方式
1.年 2.
月"
)
@ExcelAttribute
(
name
=
"大病缴纳周期:收取方式
0.按年 1.按
月"
)
@Schema
(
description
=
"大病缴纳周期:收取方式
1.年 2.
月"
)
@Schema
(
description
=
"大病缴纳周期:收取方式
0.按年 1.按
月"
)
@ExcelProperty
(
"大病缴纳周期:收取方式
1.年 2.
月"
)
@ExcelProperty
(
"大病缴纳周期:收取方式
0.按年 1.按
月"
)
private
String
collectType
;
private
String
collectType
;
/**
/**
...
@@ -309,11 +309,11 @@ public class SysBaseSetInfo extends BaseEntity {
...
@@ -309,11 +309,11 @@ public class SysBaseSetInfo extends BaseEntity {
private
Integer
fundPayPoint
;
private
Integer
fundPayPoint
;
/**
/**
* 公积金类型
1.市直 2
. 省直
* 公积金类型
0.市直 1
. 省直
*/
*/
@ExcelAttribute
(
name
=
"公积金类型
1.市直 2
. 省直"
)
@ExcelAttribute
(
name
=
"公积金类型
0.市直 1
. 省直"
)
@Schema
(
description
=
"公积金类型
1.市直 2
. 省直"
)
@Schema
(
description
=
"公积金类型
0.市直 1
. 省直"
)
@ExcelProperty
(
"公积金类型
1.市直 2
. 省直"
)
@ExcelProperty
(
"公积金类型
0.市直 1
. 省直"
)
private
Integer
fundPayType
;
private
Integer
fundPayType
;
/**
/**
...
...
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