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
07a87957
Commit
07a87957
authored
Jun 24, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
7b58ec80
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
35 deletions
+13
-35
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+2
-8
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+3
-19
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+1
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+7
-7
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
07a87957
...
...
@@ -105,12 +105,6 @@ public class TEmployeeContractPre extends BaseEntity {
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
expectedCollectionTime
;
@Schema
(
description
=
"确认人"
)
private
String
confirmUser
;
@Schema
(
description
=
"合同名称"
)
private
String
contractName
;
@Schema
(
description
=
"合同起始时间"
)
private
Date
contractStart
;
...
...
@@ -120,7 +114,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"签订类型"
)
private
String
situation
;
@Schema
(
description
=
"签订期限
, 0 固定期限 1 无固定期限 3.以完成一定工作任务为
期限"
)
@Schema
(
description
=
"签订期限
0已完成一定工作任务为期限、1固定期限、2无固定
期限"
)
private
String
contractTerm
;
@Schema
(
description
=
"合同年限-年"
)
...
...
@@ -249,7 +243,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发"
)
private
String
timeoutElecSign
;
@Schema
(
description
=
"合同截止日期类型 "
)
@Schema
(
description
=
"合同截止日期类型
0合同年限推算/1同商务合同一致/2已完成固定工作位期限
"
)
private
String
contractEndType
;
@Schema
(
description
=
"合同岗位名称"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
07a87957
...
...
@@ -168,14 +168,6 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"预计发起时间"
)
@ExcelProperty
(
"预计发起时间"
)
private
Date
expectedCollectionTime
;
/**
* 确认人
*/
@Length
(
max
=
30
,
message
=
"确认人 不能超过30 个字符"
)
@ExcelAttribute
(
name
=
"确认人"
,
maxLength
=
30
)
@Schema
(
description
=
"确认人"
)
@ExcelProperty
(
"确认人"
)
private
String
confirmUser
;
@Schema
(
description
=
"创建人-姓名"
)
private
String
createName
;
...
...
@@ -185,14 +177,6 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
/**
* 合同名称
*/
@Length
(
max
=
50
,
message
=
"合同名称 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"合同名称"
,
maxLength
=
50
)
@Schema
(
description
=
"合同名称"
)
@ExcelProperty
(
"合同名称"
)
private
String
contractName
;
/**
* 合同起始时间
*/
...
...
@@ -218,8 +202,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
* 签订期限
*/
@ExcelAttribute
(
name
=
"签订期限 0
固定期限 1 无固定期限 3.以完成一定工作任务为
期限"
)
@Schema
(
description
=
"签订期限 0
固定期限 1 无固定期限 3.以完成一定工作任务为
期限"
)
@ExcelAttribute
(
name
=
"签订期限 0
已完成一定工作任务为期限、1固定期限、2无固定
期限"
)
@Schema
(
description
=
"签订期限 0
已完成一定工作任务为期限、1固定期限、2无固定
期限"
)
private
String
contractTerm
;
@ExcelAttribute
(
name
=
"合同年限-年"
)
...
...
@@ -563,7 +547,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
private
String
workAddress
;
@ExcelAttribute
(
name
=
"合同截止日期类型"
)
@Schema
(
description
=
"合同截止日期类型"
)
@Schema
(
description
=
"合同截止日期类型
0合同年限推算1同商务合同一致2已完成固定工作位期限
"
)
@ExcelProperty
(
"合同截止日期类型"
)
private
String
contractEndType
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
View file @
07a87957
...
...
@@ -137,7 +137,7 @@ public class EmployeeRegistrationPreController {
}
/**
*
入职确认信息信息修改
*
查询各个tab页签的入职待办条数
* @param searchVo type 查询类型 1待办列表 2 监控列表
* @return R
*/
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
07a87957
...
...
@@ -26,8 +26,6 @@
<result
property=
"fadadaTemplate"
column=
"fadada_template"
/>
<result
property=
"dataSource"
column=
"data_source"
/>
<result
property=
"expectedCollectionTime"
column=
"expected_collection_time"
/>
<result
property=
"confirmUser"
column=
"confirm_user"
/>
<result
property=
"contractName"
column=
"contract_name"
/>
<result
property=
"contractStart"
column=
"contract_start"
/>
<result
property=
"contractEnd"
column=
"contract_end"
/>
<result
property=
"situation"
column=
"situation"
/>
...
...
@@ -108,8 +106,6 @@
,data_source
,expected_confirm_time
,expected_collection_time
,confirm_user
,contract_name
,contract_start
,contract_end
,situation
...
...
@@ -382,7 +378,8 @@
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_employee_contract_pre a
where a.process_status = '0' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE()
where a.process_status = '0' and a.expected_confirm_time is not null
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") = CURDATE()
group by a.customer_user_loginname
</select>
...
...
@@ -390,7 +387,10 @@
SELECT
id
FROM t_employee_contract_pre a
where a.process_status in ('1','3','5','7')
where
a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d")
<![CDATA[ <= ]]>
CURDATE()
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
a.process_status in ('1','3','5','7'))
</select>
</mapper>
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