Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
6ea16477
You need to sign in or sign up before continuing.
Commit
6ea16477
authored
Jul 19, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同优化-待提交
parent
e1eaf909
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+7
-1
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-0
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+9
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
6ea16477
...
@@ -135,7 +135,7 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -135,7 +135,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 签订类型(字典也是汉字
* 签订类型(字典也是汉字
*/
*/
@NotBlank
(
message
=
"签订类型不能为空"
)
@NotBlank
(
message
=
"签订类型不能为空"
)
@Length
(
max
=
1
,
message
=
"签订类型不能超过1个字符"
)
@Length
(
max
=
1
00
,
message
=
"签订类型不能超过1个字符"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
)
@Schema
(
description
=
"签订类型(字典也是汉字)"
,
name
=
"situation"
)
@Schema
(
description
=
"签订类型(字典也是汉字)"
,
name
=
"situation"
)
private
String
situation
;
private
String
situation
;
...
@@ -435,6 +435,12 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -435,6 +435,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema
(
description
=
"原因说明"
,
name
=
"reason"
)
@Schema
(
description
=
"原因说明"
,
name
=
"reason"
)
private
String
reason
;
private
String
reason
;
/**
* 是否附件 0是/1否
*/
@Schema
(
description
=
"是否附件 0是/1否"
)
@TableField
(
exist
=
false
)
private
String
isAtta
;
@Schema
(
description
=
"附件idList"
)
@Schema
(
description
=
"附件idList"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
6ea16477
...
@@ -69,6 +69,7 @@ public class TEmployeeContractInfoController {
...
@@ -69,6 +69,7 @@ public class TEmployeeContractInfoController {
@Operation
(
summary
=
"归档分页查询(审核通过的数据(后面加上权限:自己创建的))"
,
description
=
"归档分页查询"
)
@Operation
(
summary
=
"归档分页查询(审核通过的数据(后面加上权限:自己创建的))"
,
description
=
"归档分页查询"
)
@GetMapping
(
"/filingPage"
)
@GetMapping
(
"/filingPage"
)
public
R
<
IPage
<
TEmployeeContractInfo
>>
getFilingPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
public
R
<
IPage
<
TEmployeeContractInfo
>>
getFilingPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
tEmployeeContractInfo
.
setSituation
(
CommonConstants
.
ZERO_STRING
);
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
dingleDigitIntArray
[
2
]);
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
dingleDigitIntArray
[
2
]);
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
6ea16477
...
@@ -240,7 +240,12 @@
...
@@ -240,7 +240,12 @@
AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
</if>
</if>
<if
test=
"tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''"
>
<if
test=
"tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''"
>
AND a.SITUATION = #{tEmployeeContractInfo.situation}
<if
test=
"tEmployeeContractInfo.situation == '0' "
>
AND a.SITUATION != '作废' AND a.SITUATION != '终止'
</if>
<if
test=
"tEmployeeContractInfo.situation != '0' "
>
AND a.SITUATION = #{tEmployeeContractInfo.situation}
</if>
</if>
</if>
<if
test=
"tEmployeeContractInfo.contractTerm != null"
>
<if
test=
"tEmployeeContractInfo.contractTerm != null"
>
AND a.CONTRACT_TERM = #{tEmployeeContractInfo.contractTerm}
AND a.CONTRACT_TERM = #{tEmployeeContractInfo.contractTerm}
...
@@ -257,6 +262,9 @@
...
@@ -257,6 +262,9 @@
<if
test=
"tEmployeeContractInfo.isFile != null and tEmployeeContractInfo.isFile.trim() != ''"
>
<if
test=
"tEmployeeContractInfo.isFile != null and tEmployeeContractInfo.isFile.trim() != ''"
>
AND a.IS_FILE = #{tEmployeeContractInfo.isFile}
AND a.IS_FILE = #{tEmployeeContractInfo.isFile}
</if>
</if>
<if
test=
"tEmployeeContractInfo.isAtta != null and tEmployeeContractInfo.isAtta.trim() != ''"
>
AND a.IS_FILE = #{tEmployeeContractInfo.isAtta}
</if>
<if
test=
"tEmployeeContractInfo.oldId != null"
>
<if
test=
"tEmployeeContractInfo.oldId != null"
>
AND a.OLD_ID = #{tEmployeeContractInfo.oldId}
AND a.OLD_ID = #{tEmployeeContractInfo.oldId}
</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