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
ef4ad0cd
Commit
ef4ad0cd
authored
Jun 18, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
50078eba
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
11 deletions
+10
-11
TAutoContractScheme.java
...oud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
+2
-2
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+2
-2
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+5
-5
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
TGzOfferInfoMapper.xml
...ives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
+0
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
View file @
ef4ad0cd
...
@@ -349,12 +349,12 @@ public class TAutoContractScheme extends BaseEntity {
...
@@ -349,12 +349,12 @@ public class TAutoContractScheme extends BaseEntity {
@Schema
(
description
=
"用工单位名称"
)
@Schema
(
description
=
"用工单位名称"
)
private
String
workingCompany
;
private
String
workingCompany
;
/**
/**
* 工资形式
0 计时工资 1计件工资 2
其他
* 工资形式
1.计时工资 2.计件工资 3.
其他
*/
*/
@ExcelAttribute
(
name
=
"工资形式"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"工资形式"
,
maxLength
=
2
)
@Length
(
max
=
1
,
message
=
"工资形式不能超过2个字符"
)
@Length
(
max
=
1
,
message
=
"工资形式不能超过2个字符"
)
@ExcelProperty
(
"工资形式"
)
@ExcelProperty
(
"工资形式"
)
@Schema
(
description
=
"工资形式
0 计时工资 1计件工资 2
其他"
)
@Schema
(
description
=
"工资形式
1.计时工资 2.计件工资 3.
其他"
)
private
String
salaryType
;
private
String
salaryType
;
/**
/**
* 购买补充保险说明
* 购买补充保险说明
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
ef4ad0cd
...
@@ -544,8 +544,8 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -544,8 +544,8 @@ public class TEmployeeContractInfo extends BaseEntity {
/**
/**
* preName
* preName
*/
*/
@
ExcelAttribute
(
name
=
"
preName"
)
@
Schema
(
description
=
"合同待签订列表
preName"
)
@
ExcelProperty
(
value
=
"preName"
)
@
TableField
(
exist
=
false
)
private
String
preName
;
private
String
preName
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
ef4ad0cd
...
@@ -142,12 +142,12 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
...
@@ -142,12 +142,12 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty
(
"前端客服登录名"
)
@ExcelProperty
(
"前端客服登录名"
)
private
String
customerUserLoginname
;
private
String
customerUserLoginname
;
/**
/**
* 签署方式
0线下签1
电子签
* 签署方式
1线下签0
电子签
*/
*/
@Length
(
max
=
1
,
message
=
"签署方式
0线下签1
电子签 不能超过1 个字符"
)
@Length
(
max
=
1
,
message
=
"签署方式
1线下签0
电子签 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"签署方式
0线下签1
电子签"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"签署方式
1线下签0
电子签"
,
maxLength
=
1
)
@Schema
(
description
=
"签署方式
0线下签1
电子签"
)
@Schema
(
description
=
"签署方式
1线下签0
电子签"
)
@ExcelProperty
(
"签署方式
0线下签1
电子签"
)
@ExcelProperty
(
"签署方式
1线下签0
电子签"
)
private
String
signType
;
private
String
signType
;
/**
/**
* 法大大模版名称
* 法大大模版名称
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
ef4ad0cd
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
AND a.period_end = #{tEmployeeContractPre.periodEnd}
AND a.period_end = #{tEmployeeContractPre.periodEnd}
</if>
</if>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
AND
a.expected_confirm_time = #{tEmployeeContractPre.expectedConfirmTime}
AND
DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") = DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
</if>
</if>
<if
test=
"tEmployeeContractPre.configName != null and tEmployeeContractPre.configName.trim() != ''"
>
<if
test=
"tEmployeeContractPre.configName != null and tEmployeeContractPre.configName.trim() != ''"
>
AND a.config_name = #{tEmployeeContractPre.configName}
AND a.config_name = #{tEmployeeContractPre.configName}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
View file @
ef4ad0cd
...
@@ -268,6 +268,5 @@
...
@@ -268,6 +268,5 @@
a.del_flag = '0'
a.del_flag = '0'
<include
refid=
"tGzOfferInfo_where"
/>
<include
refid=
"tGzOfferInfo_where"
/>
</where>
</where>
ORDER by a.create_time desc,a.id desc
</select>
</select>
</mapper>
</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