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
86274d7a
Commit
86274d7a
authored
Sep 26, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签&工时制导出添加-fxj
parent
938ce2df
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
3 deletions
+26
-3
TEmpContractAlert.java
...cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
+18
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+3
-0
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+5
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
View file @
86274d7a
...
@@ -24,10 +24,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
...
@@ -24,10 +24,12 @@ 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.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -324,4 +326,20 @@ public class TEmpContractAlert extends BaseEntity {
...
@@ -324,4 +326,20 @@ public class TEmpContractAlert extends BaseEntity {
@Schema
(
description
=
"申请编码"
)
@Schema
(
description
=
"申请编码"
)
private
String
applyNo
;
private
String
applyNo
;
/**
* 工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制
*/
@Length
(
max
=
32
,
message
=
"工时制不能超过32个字符"
)
@ExcelAttribute
(
name
=
"工时制"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
WORKING_HOURS
)
@Schema
(
description
=
"工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制"
,
name
=
"workingHours"
)
private
String
workingHours
;
/**
* 合同岗位
*/
@Length
(
max
=
32
,
message
=
"合同岗位不能超过32个字符"
)
@ExcelAttribute
(
name
=
"合同岗位"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"合同岗位"
,
name
=
"post"
)
private
String
post
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
86274d7a
...
@@ -408,6 +408,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -408,6 +408,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
alert
.
setContractStart
(
contract
.
getContractStart
());
alert
.
setContractStart
(
contract
.
getContractStart
());
alert
.
setContractEnd
(
contract
.
getContractEnd
());
alert
.
setContractEnd
(
contract
.
getContractEnd
());
alert
.
setAuditTime
(
LocalDateTimeUtils
.
convertLDTToDate
(
contract
.
getAuditTimeLast
()));
alert
.
setAuditTime
(
LocalDateTimeUtils
.
convertLDTToDate
(
contract
.
getAuditTimeLast
()));
//2024-09-26 添加岗位和工时制
alert
.
setPost
(
contract
.
getPost
());
alert
.
setWorkingHours
(
contract
.
getWorkingHours
());
if
(
Common
.
isNotNull
(
contract
.
getFileProvince
())){
if
(
Common
.
isNotNull
(
contract
.
getFileProvince
())){
alert
.
setFileProvince
(
Integer
.
toString
(
contract
.
getFileProvince
()));
alert
.
setFileProvince
(
Integer
.
toString
(
contract
.
getFileProvince
()));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
86274d7a
...
@@ -55,8 +55,8 @@
...
@@ -55,8 +55,8 @@
<result
property=
"feedbackDetail"
column=
"FEEDBACK_DATAIL"
/>
<result
property=
"feedbackDetail"
column=
"FEEDBACK_DATAIL"
/>
<result
property=
"contractId"
column=
"CONTRACT_ID"
/>
<result
property=
"contractId"
column=
"CONTRACT_ID"
/>
<result
property=
"applyNo"
column=
"APPLY_NO"
/>
<result
property=
"applyNo"
column=
"APPLY_NO"
/>
<result
property=
"workingHours"
column=
"WORKING_HOURS"
/>
<result
property=
"post"
column=
"POST"
/>
</resultMap>
</resultMap>
<update
id=
"truncate"
>
<update
id=
"truncate"
>
TRUNCATE t_emp_contract_alert
TRUNCATE t_emp_contract_alert
...
@@ -78,7 +78,9 @@
...
@@ -78,7 +78,9 @@
a.EMP_NAME,
a.EMP_NAME,
a.PROJECT_NO,
a.PROJECT_NO,
a.APPLY_NO,
a.APPLY_NO,
a.EMP_IDCARD
a.EMP_IDCARD,
a.WORKING_HOURS,
a.post
from t_emp_contract_alert a
from t_emp_contract_alert a
where a.EMP_IDCARD in
where a.EMP_IDCARD in
<foreach
item=
"idStr"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"idStr"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
...
...
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