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
bb26ebcc
Commit
bb26ebcc
authored
Apr 16, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.22-发薪日
parent
2a899af0
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
48 additions
and
3 deletions
+48
-3
TAutoContractScheme.java
...oud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
+7
-0
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+9
-0
TEmployeeContractPreNew.java
...plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
+7
-0
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+7
-0
TAutoContractSchemeMapper.xml
...z/src/main/resources/mapper/TAutoContractSchemeMapper.xml
+6
-1
TEmployeeContractPreHistoryMapper.xml
...in/resources/mapper/TEmployeeContractPreHistoryMapper.xml
+1
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+5
-1
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+6
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
View file @
bb26ebcc
...
...
@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity {
@Schema
(
description
=
"其他工作时间 (工作方式为第二种方式)"
)
private
String
otherWorkDay
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
bb26ebcc
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
cn.hutool.core.date.DateTime
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
...
...
@@ -377,4 +379,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"是否已确认离职: 0 是 1 "
)
private
String
isLeave
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPreNew.java
View file @
bb26ebcc
...
...
@@ -735,4 +735,11 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute
(
name
=
"邮箱"
)
private
String
empEmail
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
bb26ebcc
...
...
@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty
(
"法大大模版ID"
)
private
String
fadadaTemplateId
;
// MVP1.7.22版本新字段:
@ExcelAttribute
(
name
=
"发薪日"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"发薪日不能超过2个字符"
)
@ExcelProperty
(
"发薪日"
)
@Schema
(
description
=
"发薪日"
)
private
String
salaryDay
;
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoContractSchemeMapper.xml
View file @
bb26ebcc
...
...
@@ -80,6 +80,7 @@
<result
property=
"workDay"
column=
"WORK_DAY"
/>
<result
property=
"workHours"
column=
"WORK_HOURS"
/>
<result
property=
"otherWorkDay"
column=
"OTHER_WORK_DAY"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -137,7 +138,8 @@
a.WORK_DAY_COUNT,
a.WORK_DAY,
a.WORK_HOURS,
a.OTHER_WORK_DAY
a.OTHER_WORK_DAY,
a.SALARY_DAY
</sql>
<sql
id=
"tAutoContractScheme_where"
>
<if
test=
"tAutoContractScheme != null"
>
...
...
@@ -300,6 +302,9 @@
<if
test=
"tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''"
>
AND a.WORK_HOURS = #{tAutoContractScheme.workHours}
</if>
<if
test=
"tAutoContractScheme.salaryDay != null and tAutoContractScheme.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tAutoContractScheme.salaryDay}
</if>
</if>
</sql>
<!--tAutoContractScheme简单分页查询-->
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreHistoryMapper.xml
View file @
bb26ebcc
...
...
@@ -93,5 +93,6 @@
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
bb26ebcc
...
...
@@ -93,6 +93,7 @@
<result
property=
"changeTypeUser"
column=
"change_type_user"
/>
<result
property=
"changeTypeTime"
column=
"change_type_time"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id
...
...
@@ -175,7 +176,7 @@
,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.SALARY_DAY
</sql>
<sql
id=
"tEmployeeContractPre_where"
>
<if
test=
"tEmployeeContractPre != null"
>
...
...
@@ -262,6 +263,9 @@
<if
test=
"tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''"
>
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
</if>
<if
test=
"tEmployeeContractPre.salaryDay != null and tEmployeeContractPre.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tEmployeeContractPre.salaryDay}
</if>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
bb26ebcc
...
...
@@ -110,6 +110,7 @@
<result
property=
"createName"
column=
"create_name"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"salaryDay"
column=
"SALARY_DAY"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
...
...
@@ -196,7 +197,8 @@
a.create_by,
a.create_name,
a.create_time,
a.update_by
a.update_by,
a.SALARY_DAY
</sql>
<sql
id=
"tEmpContractAlert_where"
>
<if
test=
"tEmpContractAlert != null"
>
...
...
@@ -638,6 +640,9 @@
<if
test=
"tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''"
>
AND a.update_by = #{tEmployeeContractPreNew.updateBy}
</if>
<if
test=
"tEmployeeContractPreNew.salaryDay != null and tEmployeeContractPreNew.salaryDay.trim() != ''"
>
AND a.SALARY_DAY = #{tEmployeeContractPreNew.salaryDay}
</if>
</if>
</sql>
<!--tEmployeeContractPreNew简单分页查询-->
...
...
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