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
b2f5ac30
Commit
b2f5ac30
authored
Jun 30, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post2
parent
04122721
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
334 additions
and
103 deletions
+334
-103
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+1
-1
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+15
-15
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+3
-3
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+13
-2
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+12
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+16
-5
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+274
-0
TEmployeeContrctInfoMapper.xml
.../src/main/resources/mapper/TEmployeeContrctInfoMapper.xml
+0
-75
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContrctInfo.java
→
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContr
a
ctInfo.java
View file @
b2f5ac30
...
...
@@ -37,7 +37,7 @@ import java.time.LocalDateTime;
@TableName
(
"t_employee_contract_info"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"员工合同"
)
public
class
TEmployeeContrctInfo
extends
BaseEntity
{
public
class
TEmployeeContr
a
ctInfo
extends
BaseEntity
{
/**
* 主键
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContrctInfoController.java
→
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContr
a
ctInfoController.java
View file @
b2f5ac30
...
...
@@ -19,8 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContrctInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContr
a
ctInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContr
a
ctInfoService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
io.swagger.v3.oas.annotations.Operation
;
...
...
@@ -43,22 +43,22 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping
(
"/temployeecontrctinfo"
)
@Tag
(
name
=
"员工合同管理"
)
@SecurityRequirement
(
name
=
HttpHeaders
.
AUTHORIZATION
)
public
class
TEmployeeContrctInfoController
{
public
class
TEmployeeContr
a
ctInfoController
{
private
final
TEmployeeContr
ctInfoService
tEmployeeContr
ctInfoService
;
private
final
TEmployeeContr
actInfoService
tEmployeeContra
ctInfoService
;
/**
* 分页查询
*
* @param page 分页对象
* @param tEmployeeContrctInfo 员工合同
* @param tEmployeeContr
a
ctInfo 员工合同
* @return
*/
@Operation
(
summary
=
"分页查询"
,
description
=
"分页查询"
)
@GetMapping
(
"/page"
)
@PreAuthorize
(
"@pms.hasPermission('contract_temployeecontrctinfo_get')"
)
public
R
getTEmployeeContrctInfoPage
(
Page
page
,
TEmployeeContrctInfo
tEmployeeContr
ctInfo
)
{
return
R
.
ok
(
tEmployeeContrctInfoService
.
page
(
page
,
Wrappers
.
query
(
tEmployeeContrctInfo
)
));
public
R
getTEmployeeContrctInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContra
ctInfo
)
{
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
}
...
...
@@ -72,35 +72,35 @@ public class TEmployeeContrctInfoController {
@GetMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('contract_temployeecontrctinfo_get')"
)
public
R
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tEmployeeContrctInfoService
.
getById
(
id
));
return
R
.
ok
(
tEmployeeContr
a
ctInfoService
.
getById
(
id
));
}
/**
* 新增员工合同
*
* @param tEmployeeContrctInfo 员工合同
* @param tEmployeeContr
a
ctInfo 员工合同
* @return R
*/
@Operation
(
summary
=
"新增员工合同"
,
description
=
"新增员工合同:hasPermission('contract_temployeecontrctinfo_add')"
)
@SysLog
(
"新增员工合同"
)
@PostMapping
@PreAuthorize
(
"@pms.hasPermission('contract_temployeecontrctinfo_add')"
)
public
R
save
(
@RequestBody
TEmployeeContr
ctInfo
tEmployeeContr
ctInfo
)
{
return
R
.
ok
(
tEmployeeContr
ctInfoService
.
save
(
tEmployeeContr
ctInfo
));
public
R
save
(
@RequestBody
TEmployeeContr
actInfo
tEmployeeContra
ctInfo
)
{
return
R
.
ok
(
tEmployeeContr
actInfoService
.
save
(
tEmployeeContra
ctInfo
));
}
/**
* 修改员工合同
*
* @param tEmployeeContrctInfo 员工合同
* @param tEmployeeContr
a
ctInfo 员工合同
* @return R
*/
@Operation
(
summary
=
"修改员工合同"
,
description
=
"修改员工合同:hasPermission('contract_temployeecontrctinfo_edit')"
)
@SysLog
(
"修改员工合同"
)
@PutMapping
@PreAuthorize
(
"@pms.hasPermission('contract_temployeecontrctinfo_edit')"
)
public
R
updateById
(
@RequestBody
TEmployeeContr
ctInfo
tEmployeeContr
ctInfo
)
{
return
R
.
ok
(
tEmployeeContr
ctInfoService
.
updateById
(
tEmployeeContr
ctInfo
));
public
R
updateById
(
@RequestBody
TEmployeeContr
actInfo
tEmployeeContra
ctInfo
)
{
return
R
.
ok
(
tEmployeeContr
actInfoService
.
updateById
(
tEmployeeContra
ctInfo
));
}
/**
...
...
@@ -114,7 +114,7 @@ public class TEmployeeContrctInfoController {
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('contract_temployeecontrctinfo_del')"
)
public
R
removeById
(
@PathVariable
String
id
)
{
return
R
.
ok
(
tEmployeeContrctInfoService
.
removeById
(
id
));
return
R
.
ok
(
tEmployeeContr
a
ctInfoService
.
removeById
(
id
));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
b2f5ac30
...
...
@@ -233,9 +233,9 @@ public class TEmployeeInfoController {
* @Date: 2022/6/21 19:42
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
summary
=
"通过id
s
批量删除人员档案表"
,
description
=
"通过ids批量删除人员档案表"
)
@SysLog
(
"通过id
s
批量删除人员档案表"
)
@
Ge
tMapping
(
"/batchDeleteEmployee"
)
@Operation
(
summary
=
"通过id
List
批量删除人员档案表"
,
description
=
"通过ids批量删除人员档案表"
)
@SysLog
(
"通过id
List
批量删除人员档案表"
)
@
Pos
tMapping
(
"/batchDeleteEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_batch_del')"
)
public
R
<
List
<
ErrorMessageVO
>>
batchDeleteEmployee
(
@RequestBody
List
<
String
>
idList
)
{
return
tEmployeeInfoService
.
batchDeleteEmployee
(
idList
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContrctInfoMapper.java
→
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContr
a
ctInfoMapper.java
View file @
b2f5ac30
...
...
@@ -18,8 +18,11 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* 员工合同
...
...
@@ -28,6 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2022-06-29 20:45:22
*/
@Mapper
public
interface
TEmployeeContrctInfoMapper
extends
BaseMapper
<
TEmployeeContrctInfo
>
{
public
interface
TEmployeeContractInfoMapper
extends
BaseMapper
<
TEmployeeContractInfo
>
{
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContrctInfoService.java
→
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContr
a
ctInfoService.java
View file @
b2f5ac30
...
...
@@ -17,8 +17,10 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContr
a
ctInfo
;
/**
* 员工合同
...
...
@@ -26,6 +28,14 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo;
* @author hgw
* @date 2022-06-29 20:45:22
*/
public
interface
TEmployeeContrctInfoService
extends
IService
<
TEmployeeContrctInfo
>
{
public
interface
TEmployeeContractInfoService
extends
IService
<
TEmployeeContractInfo
>
{
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContrctInfoServiceImpl.java
→
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContr
a
ctInfoServiceImpl.java
View file @
b2f5ac30
...
...
@@ -16,10 +16,12 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContrctInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContrctInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContr
a
ctInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContr
a
ctInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContr
a
ctInfoService
;
import
org.springframework.stereotype.Service
;
/**
...
...
@@ -29,6 +31,15 @@ import org.springframework.stereotype.Service;
* @date 2022-06-29 20:45:22
*/
@Service
public
class
TEmployeeContrctInfoServiceImpl
extends
ServiceImpl
<
TEmployeeContrctInfoMapper
,
TEmployeeContrctInfo
>
implements
TEmployeeContrctInfoService
{
public
class
TEmployeeContractInfoServiceImpl
extends
ServiceImpl
<
TEmployeeContractInfoMapper
,
TEmployeeContractInfo
>
implements
TEmployeeContractInfoService
{
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
@Override
public
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
return
baseMapper
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
);
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
0 → 100644
View file @
b2f5ac30
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContrctInfoMapper.xml
deleted
100644 → 0
View file @
04122721
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"archives.contract.mapper.TEmployeeContrctInfoMapper"
>
<resultMap
id=
"tEmployeeContrctInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
<result
property=
"empId"
column=
"EMP_ID"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"contractName"
column=
"CONTRACT_NAME"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"contractStart"
column=
"CONTRACT_START"
/>
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"subjectDepart"
column=
"SUBJECT_DEPART"
/>
<result
property=
"subjectUnit"
column=
"SUBJECT_UNIT"
/>
<result
property=
"situation"
column=
"SITUATION"
/>
<result
property=
"contractTerm"
column=
"CONTRACT_TERM"
/>
<result
property=
"contractNo"
column=
"CONTRACT_NO"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"isObsolete"
column=
"IS_OBSOLETE"
/>
<result
property=
"isFile"
column=
"IS_FILE"
/>
<result
property=
"oldId"
column=
"OLD_ID"
/>
<result
property=
"enjoinDate"
column=
"ENJOIN_DATE"
/>
<result
property=
"post"
column=
"POST"
/>
<result
property=
"workingHours"
column=
"WORKING_HOURS"
/>
<result
property=
"fileCabinetNo"
column=
"FILE_CABINET_NO"
/>
<result
property=
"settleDomain"
column=
"SETTLE_DOMAIN"
/>
<result
property=
"inUse"
column=
"IN_USE"
/>
<result
property=
"obsoleteReason"
column=
"OBSOLETE_REASON"
/>
<result
property=
"customerId"
column=
"CUSTOMER_ID"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
<result
property=
"workingStatusSub"
column=
"WORKING_STATUS_SUB"
/>
<result
property=
"workFlag"
column=
"WORK_FLAG"
/>
<result
property=
"periodStart"
column=
"PERIOD_START"
/>
<result
property=
"periodEnd"
column=
"PERIOD_END"
/>
<result
property=
"periodSalaryPerMonth"
column=
"PERIOD_SALARY_PER_MONTH"
/>
<result
property=
"salaryType"
column=
"SALARY_TYPE"
/>
<result
property=
"salaryStandardPerHour"
column=
"SALARY_STANDARD_PER_HOUR"
/>
<result
property=
"salaryStandardPerPiece"
column=
"SALARY_STANDARD_PER_PIECE"
/>
<result
property=
"dispatchFlag"
column=
"DISPATCH_FLAG"
/>
<result
property=
"warnEmailUserId"
column=
"WARN_EMAIL_USER_ID"
/>
<result
property=
"fddFlag"
column=
"FDD_FLAG"
/>
<result
property=
"isSign"
column=
"IS_SIGN"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
</resultMap>
</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