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
4212197a
Commit
4212197a
authored
Oct 20, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-法大大字段
parent
8a915caf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
TAutoContractScheme.java
...oud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
+7
-0
TAutoContractSchemeMapper.xml
...z/src/main/resources/mapper/TAutoContractSchemeMapper.xml
+5
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+3
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
View file @
4212197a
...
@@ -98,6 +98,13 @@ public class TAutoContractScheme extends BaseEntity {
...
@@ -98,6 +98,13 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelProperty
(
"发大大电子签模板"
)
@ExcelProperty
(
"发大大电子签模板"
)
@Schema
(
description
=
"发大大电子签模板"
)
@Schema
(
description
=
"发大大电子签模板"
)
private
String
fadadaTemplate
;
private
String
fadadaTemplate
;
/**
* 发大大电子签模板ID
*/
@ExcelAttribute
(
name
=
"发大大电子签模板ID"
,
maxLength
=
50
)
@ExcelProperty
(
"发大大电子签模板ID"
)
@Schema
(
description
=
"发大大电子签模板ID"
)
private
String
fadadaTemplateId
;
/**
/**
* 签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限
* 签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限
* // 电子签-签订期限(既有字典)
* // 电子签-签订期限(既有字典)
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoContractSchemeMapper.xml
View file @
4212197a
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"signatory"
column=
"SIGNATORY"
/>
<result
property=
"signatory"
column=
"SIGNATORY"
/>
<result
property=
"fadadaTemplate"
column=
"FADADA_TEMPLATE"
/>
<result
property=
"fadadaTemplate"
column=
"FADADA_TEMPLATE"
/>
<result
property=
"fadadaTemplateId"
column=
"FADADA_TEMPLATE_ID"
/>
<result
property=
"contractTerm"
column=
"CONTRACT_TERM"
/>
<result
property=
"contractTerm"
column=
"CONTRACT_TERM"
/>
<result
property=
"contractDurationYear"
column=
"CONTRACT_DURATION_YEAR"
/>
<result
property=
"contractDurationYear"
column=
"CONTRACT_DURATION_YEAR"
/>
<result
property=
"contractDurationMonth"
column=
"CONTRACT_DURATION_MONTH"
/>
<result
property=
"contractDurationMonth"
column=
"CONTRACT_DURATION_MONTH"
/>
...
@@ -87,6 +88,7 @@
...
@@ -87,6 +88,7 @@
a.CONTRACT_TYPE,
a.CONTRACT_TYPE,
a.SIGNATORY,
a.SIGNATORY,
a.FADADA_TEMPLATE,
a.FADADA_TEMPLATE,
a.FADADA_TEMPLATE_ID,
a.CONTRACT_TERM,
a.CONTRACT_TERM,
a.CONTRACT_DURATION_YEAR,
a.CONTRACT_DURATION_YEAR,
a.CONTRACT_DURATION_MONTH,
a.CONTRACT_DURATION_MONTH,
...
@@ -157,6 +159,9 @@
...
@@ -157,6 +159,9 @@
<if
test=
"tAutoContractScheme.fadadaTemplate != null and tAutoContractScheme.fadadaTemplate.trim() != ''"
>
<if
test=
"tAutoContractScheme.fadadaTemplate != null and tAutoContractScheme.fadadaTemplate.trim() != ''"
>
AND a.FADADA_TEMPLATE = #{tAutoContractScheme.fadadaTemplate}
AND a.FADADA_TEMPLATE = #{tAutoContractScheme.fadadaTemplate}
</if>
</if>
<if
test=
"tAutoContractScheme.fadadaTemplateId != null and tAutoContractScheme.fadadaTemplateId.trim() != ''"
>
AND a.FADADA_TEMPLATE_ID = #{tAutoContractScheme.fadadaTemplateId}
</if>
<if
test=
"tAutoContractScheme.contractTerm != null and tAutoContractScheme.contractTerm.trim() != ''"
>
<if
test=
"tAutoContractScheme.contractTerm != null and tAutoContractScheme.contractTerm.trim() != ''"
>
AND a.CONTRACT_TERM = #{tAutoContractScheme.contractTerm}
AND a.CONTRACT_TERM = #{tAutoContractScheme.contractTerm}
</if>
</if>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
4212197a
...
@@ -238,6 +238,9 @@
...
@@ -238,6 +238,9 @@
<if
test=
"tEmployeeContractPre.signType != null and tEmployeeContractPre.signType.trim() != ''"
>
<if
test=
"tEmployeeContractPre.signType != null and tEmployeeContractPre.signType.trim() != ''"
>
AND a.sign_type = #{tEmployeeContractPre.signType}
AND a.sign_type = #{tEmployeeContractPre.signType}
</if>
</if>
<if
test=
"tEmployeeContractPre.fadadaTemplateId != null and tEmployeeContractPre.fadadaTemplateId.trim() != ''"
>
AND a.fadada_template_id = #{tEmployeeContractPre.fadadaTemplateId}
</if>
<if
test=
"tEmployeeContractPre.fadadaTemplate != null and tEmployeeContractPre.fadadaTemplate.trim() != ''"
>
<if
test=
"tEmployeeContractPre.fadadaTemplate != null and tEmployeeContractPre.fadadaTemplate.trim() != ''"
>
AND a.fadada_template like CONCAT('%',#{tEmployeeContractPre.fadadaTemplate},'%')
AND a.fadada_template like CONCAT('%',#{tEmployeeContractPre.fadadaTemplate},'%')
</if>
</if>
...
...
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