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
15fe9ecc
Commit
15fe9ecc
authored
May 20, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
d434c5a2
2e3d1749
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
232 additions
and
412 deletions
+232
-412
disable_tax_month_plan.md
.trae/documents/MVP1.7.23/disable_tax_month_plan.md
+143
-0
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+0
-9
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+0
-6
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+0
-18
TPreEmployeeProject.java
...oud/plus/v1/yifu/archives/entity/TPreEmployeeProject.java
+0
-8
EmployeeInsertVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
+2
-2
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+1
-5
PreUploadEmpImportVo.java
.../cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
+1
-5
TMainExportAllVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
+0
-2
TPreEmpMainVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/TPreEmpMainVo.java
+4
-3
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-5
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+6
-90
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+0
-2
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+0
-5
TPreEmployeeInfoMapper.xml
...-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
+0
-4
TPreEmployeeProjectMapper.xml
...z/src/main/resources/mapper/TPreEmployeeProjectMapper.xml
+0
-5
TSalaryEmployeeExportVo.java
...cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeExportVo.java
+1
-8
TSalaryEmployeeUpdateVo.java
...cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeUpdateVo.java
+1
-9
TSalaryEmployeeVo.java
.../yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeVo.java
+1
-9
TSalaryEmpModLogServiceImpl.java
...yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
+2
-2
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+22
-35
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+44
-172
TSalaryEmployeeMapper.xml
...y-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
+0
-6
No files found.
.trae/documents/MVP1.7.23/disable_tax_month_plan.md
0 → 100644
View file @
15fe9ecc
# 禁用计税月份更新入口 - 完整实施计划
## 一、需求概述
根据薪酬计税新规,启用0元申报后,需要将原计税月份更新入口禁用。具体需求包括:
| 序号 | 需求点 | 涉及模块 | 状态 |
| :--- | :--- | :--- | :--- |
| 1 | 薪酬人员查询:详情、编辑、计税月份隐藏 | 薪酬模块 | 待处理 |
| 2 | 薪酬批量导入/更新模板删除计税月份列 | 薪酬模块 | 待处理 |
| 3 | 项目档案详情-发薪信息中计税月份隐藏 | 档案模块 | 待处理 |
| 4 | 在档人员详情-发薪信息中计税月份隐藏 | 档案模块 | 待处理 |
| 5 | 在档人员-编辑 计税月份隐藏 | 档案模块 | 待处理 |
| 6 | 预入职-编辑 计税月份隐藏,批量预入职模版、批量更新模版、批量完善模版中计税月份隐藏 | 预入职模块 | 待处理 |
| 7 | 档案完整度监控-基础信息编辑 计税月份隐藏 | 档案模块 | 待处理 |
| 8 | 作业自动化-待办任务中心-我的待办-档案待完善-基础信息编辑 计税月份隐藏 | 档案模块 | 待处理 |
| 9 | 薪酬导入模版表中,计税月份删除,上传时删除相应校验 | 薪酬模块 | 待处理 |
| 10 | 新资源表配置新增、编辑中对应字段下拉选择需要隐藏计税月份,新资源表配置详情中需要隐藏计税月份 | 系统管理模块 | 待处理 |
| 11 | 导出中若包含计税月份,也需要隐藏 | 全模块 | 待处理 |
## 二、文件分析
### 2.1 薪酬模块文件
| 文件路径 | 用途 | 计税月份字段位置 |
| :--- | :--- | :--- |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryEmployeeVo.java`
| 薪酬人员导入VO | 第93-98行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryEmployeeUpdateVo.java`
| 薪酬人员更新VO | 第148-153行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryEmployeeExportVo.java`
| 薪酬人员导出VO | 第143-148行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryZeroVo.java`
| 0申报导入VO | 第94-101行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryZeroExportVo.java`
| 0申报导出VO | 第111-117行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryAccountVo.java`
| 工资报账VO | 第224-228行:taxMonth |
|
`yifu-salary/yifu-salary-api/src/main/java/.../vo/TSalaryAccountExportVo.java`
| 工资报账导出VO | 第49-51行:taxMonth |
|
`yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml`
| 薪酬人员Mapper | 第48行、第67行、第168行 |
### 2.2 档案模块文件
| 文件路径 | 用途 | 计税月份字段位置 |
| :--- | :--- | :--- |
|
`yifu-archives/yifu-archives-api/src/main/java/.../entity/TEmployeeInfo.java`
| 在档人员实体 | 第493-500行:taxMonth |
|
`yifu-archives/yifu-archives-api/src/main/java/.../entity/TPreEmployeeInfo.java`
| 预入职人员实体 | 第458-465行:taxMonth |
|
`yifu-archives/yifu-archives-api/src/main/java/.../vo/TMainExportAllVO.java`
| 档案导出VO | 第199-200行:field78(计税月份) |
|
`yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml`
| 在档人员Mapper | 第87行 |
|
`yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml`
| 预入职Mapper | 第88行 |
|
`yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml`
| 完整度监控Mapper | 第494行:e.TAX_MONTH field78 |
### 2.3 批量导入模块文件
| 文件路径 | 用途 | 计税月份字段位置 |
| :--- | :--- | :--- |
|
`yifu-archives/yifu-archives-api/src/main/java/.../vo/PreUploadEmpImportVo.java`
| 预入职导入VO | 第195-196行:taxMonth,第275-276行:taxMonthValue |
|
`yifu-archives/yifu-archives-api/src/main/java/.../vo/PreUploadEmpImportTwoVo.java`
| 批量更新导入VO | 第153-154行:taxMonth,第236-237行:taxMonthValue |
### 2.4 系统管理模块文件
| 文件路径 | 用途 | 说明 |
| :--- | :--- | :--- |
|
`yifu-upms/yifu-upms-api/src/main/java/.../entity/SysOutEmpFormInfo.java`
| 新资源表配置实体 | 此为字段配置表,需要在业务代码中过滤计税月份字段 |
## 三、修改方案
### 3.1 薪酬模块修改
| 文件 | 修改内容 |
| :--- | :--- |
| TSalaryEmployeeVo.java | 删除taxMonth字段及其注解(第93-98行) |
| TSalaryEmployeeUpdateVo.java | 删除taxMonth字段及其注解(第148-153行) |
| TSalaryEmployeeExportVo.java | 删除taxMonth字段及其注解(第143-148行) |
| TSalaryEmployeeMapper.xml | 删除第48行和第67行的taxMonth映射,删除第168行的taxMonth查询条件,删除Base_Column_List中的TAX_MONTH |
| TSalaryZeroVo.java | 删除taxMonth字段及其注解(第94-101行) |
| TSalaryZeroExportVo.java | 删除taxMonth字段及其注解(第111-117行) |
| TSalaryAccountVo.java | 删除taxMonth字段及其注解(第224-228行) |
| TSalaryAccountExportVo.java | 删除taxMonth字段及其注解(第49-51行) |
### 3.2 档案模块修改
| 文件 | 修改内容 |
| :--- | :--- |
| TEmployeeInfo.java | 删除taxMonth字段及其注解(第493-500行) |
| TEmployeeInfoMapper.xml | 删除taxMonth映射(第87行) |
| TPreEmployeeInfo.java | 删除taxMonth字段及其注解(第458-465行),保留taxMonthFlag字段 |
| TPreEmployeeInfoMapper.xml | 删除taxMonth映射(第88行),保留taxMonthFlag映射 |
| TMainExportAllVO.java | 删除field78计税月份字段(第199-200行) |
| TCompleteMonitorMapper.xml | 删除
`,e.TAX_MONTH field78`
(第494行) |
### 3.3 批量导入模块修改
| 文件 | 修改内容 |
| :--- | :--- |
| PreUploadEmpImportVo.java | 删除taxMonth字段(第195-196行)和taxMonthValue字段(第275-276行) |
| PreUploadEmpImportTwoVo.java | 删除taxMonth字段(第153-154行)和taxMonthValue字段(第236-237行) |
## 四、修改步骤
1.
修改薪酬模块所有VO文件
2.
修改薪酬模块Mapper文件
3.
修改档案模块实体类和VO文件
4.
修改档案模块Mapper文件
5.
修改批量导入模块VO文件
## 五、风险评估
| 风险点 | 风险等级 | 应对措施 |
| :--- | :--- | :--- |
| 数据库字段依赖 | 中 | 仅删除VO层字段,数据库字段保留以兼容历史数据 |
| API接口兼容性 | 低 | 字段删除不影响现有API调用(JSON字段缺失不报错) |
| 导出功能影响 | 低 | 导出模板自动适配,无计税月份列 |
| 导入功能影响 | 低 | 导入校验自动忽略计税月份列 |
| Mapper映射影响 | 低 | 删除对应result映射,不影响数据库查询 |
## 六、验证标准
1.
薪酬人员导入模板不包含计税月份列
2.
薪酬人员更新模板不包含计税月份列
3.
薪酬人员详情/编辑页面不显示计税月份字段
4.
在档人员详情/编辑页面不显示计税月份字段
5.
预入职编辑页面不显示计税月份字段
6.
档案完整度监控导出不包含计税月份
7.
批量导入/更新功能正常,不校验计税月份
8.
所有Mapper文件编译通过
9.
0申报导入导出不包含计税月份
10.
工资报账相关功能不包含计税月份
## 七、修改清单
| 文件 | 修改内容 | 修改类型 |
| :--- | :--- | :--- |
| TSalaryEmployeeVo.java | 删除taxMonth字段 | 删除 |
| TSalaryEmployeeUpdateVo.java | 删除taxMonth字段 | 删除 |
| TSalaryEmployeeExportVo.java | 删除taxMonth字段 | 删除 |
| TSalaryEmployeeMapper.xml | 删除taxMonth映射和查询条件 | 删除 |
| TSalaryZeroVo.java | 删除taxMonth字段 | 删除 |
| TSalaryZeroExportVo.java | 删除taxMonth字段 | 删除 |
| TSalaryAccountVo.java | 删除taxMonth字段 | 删除 |
| TSalaryAccountExportVo.java | 删除taxMonth字段 | 删除 |
| TEmployeeInfo.java | 删除taxMonth字段 | 删除 |
| TEmployeeInfoMapper.xml | 删除taxMonth映射 | 删除 |
| TPreEmployeeInfo.java | 删除taxMonth字段 | 删除 |
| TPreEmployeeInfoMapper.xml | 删除taxMonth映射 | 删除 |
| TMainExportAllVO.java | 删除field78计税月份 | 删除 |
| TCompleteMonitorMapper.xml | 删除e.TAX_MONTH field78 | 删除 |
| PreUploadEmpImportVo.java | 删除taxMonth和taxMonthValue | 删除 |
| PreUploadEmpImportTwoVo.java | 删除taxMonth和taxMonthValue | 删除 |
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
15fe9ecc
...
@@ -491,15 +491,6 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -491,15 +491,6 @@ public class TEmployeeInfo extends BaseEntity {
@ExcelProperty
(
"银行卡号"
)
@ExcelProperty
(
"银行卡号"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
bankNo
;
private
String
bankNo
;
/**
* 计税月份
*/
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Length
(
max
=
6
,
message
=
"计税月份不能超过6个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
taxMonth
;
/**
/**
* 通信地址省
* 通信地址省
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
15fe9ecc
...
@@ -252,12 +252,6 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -252,12 +252,6 @@ public class TEmployeeProject extends BaseEntity {
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职,9瓜子)"
)
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职,9瓜子)"
)
private
String
projectSource
;
private
String
projectSource
;
/**
* 计税月份
*/
@Schema
(
description
=
"计税月份"
)
private
String
taxMonth
;
/**
/**
* 项目档案状态(0草稿、1已审核)
* 项目档案状态(0草稿、1已审核)
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
15fe9ecc
...
@@ -456,24 +456,6 @@ public class TPreEmployeeInfo extends BaseEntity {
...
@@ -456,24 +456,6 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelProperty
(
"银行卡号"
)
@ExcelProperty
(
"银行卡号"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
bankNo
;
private
String
bankNo
;
/**
* 计税月份
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Length
(
max
=
6
,
message
=
"计税月份不能超过6个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份"
)
private
String
taxMonth
;
/**
* 计税月份是否可编辑:0否;1是(默认是)
*/
@ExcelAttribute
(
name
=
"计税月份是否可编辑"
,
maxLength
=
1
)
@Length
(
max
=
1
,
message
=
"计税月份是否可编辑不能超过6个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份是否可编辑"
)
private
String
taxMonthFlag
;
/**
/**
* 封面抬头
* 封面抬头
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeProject.java
View file @
15fe9ecc
...
@@ -295,14 +295,6 @@ public class TPreEmployeeProject extends BaseEntity {
...
@@ -295,14 +295,6 @@ public class TPreEmployeeProject extends BaseEntity {
@ExcelProperty
(
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)"
)
@ExcelProperty
(
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)"
)
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)"
)
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)"
)
private
String
projectSource
;
private
String
projectSource
;
/**
* 计税月份
*/
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Length
(
max
=
6
,
message
=
"计税月份不能超过6个字符"
)
@ExcelProperty
(
"计税月份"
)
@Schema
(
description
=
"计税月份"
)
private
String
taxMonth
;
/**
/**
* 项目档案状态(0草稿、1已审核)
* 项目档案状态(0草稿、1已审核)
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
View file @
15fe9ecc
...
@@ -281,7 +281,7 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
...
@@ -281,7 +281,7 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
private String bankCity;
private String bankCity;
@ExcelAttribute(name = "开户支行", maxLength = 50)
@ExcelAttribute(name = "开户支行", maxLength = 50)
private String bankSubName;
private String bankSubName;
@ExcelAttribute(name = "计税月份", isDate = true, dateFormat = "yyyyMM", maxLength = 6)
@ExcelAttribute(name = "计
111
税月份", isDate = true, dateFormat = "yyyyMM", maxLength = 6)
private String taxMonth;*/
private String tax
1
Month;*/
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
15fe9ecc
...
@@ -151,8 +151,6 @@ public class PreUploadEmpImportTwoVo implements Serializable {
...
@@ -151,8 +151,6 @@ public class PreUploadEmpImportTwoVo implements Serializable {
private
String
bankCity
;
private
String
bankCity
;
@ExcelAttribute
(
name
=
"开户支行"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"开户支行"
,
maxLength
=
50
)
private
String
bankSubName
;
private
String
bankSubName
;
@ExcelAttribute
(
name
=
"计税月份"
,
isDate
=
true
,
dateFormat
=
"yyyyMM"
,
maxLength
=
6
)
private
String
taxMonth
;
@ExcelAttribute
(
name
=
"是否有不良记录"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否有不良记录"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
badRecordFlag
;
private
String
badRecordFlag
;
...
@@ -230,13 +228,11 @@ public class PreUploadEmpImportTwoVo implements Serializable {
...
@@ -230,13 +228,11 @@ public class PreUploadEmpImportTwoVo implements Serializable {
private
String
isCollegeValue
;
private
String
isCollegeValue
;
@ExcelAttribute
(
name
=
"学历-值"
)
@ExcelAttribute
(
name
=
"学历-值"
)
private
String
educationNameValue
;
private
String
educationNameValue
;
// 银行卡号 开户总行 开户省 开户市 开户支行
计税月份
// 银行卡号 开户总行 开户省 开户市 开户支行
@ExcelAttribute
(
name
=
"开户省-值"
)
@ExcelAttribute
(
name
=
"开户省-值"
)
private
String
bankProvinceValue
;
private
String
bankProvinceValue
;
@ExcelAttribute
(
name
=
"开户市-值"
)
@ExcelAttribute
(
name
=
"开户市-值"
)
private
String
bankCityValue
;
private
String
bankCityValue
;
@ExcelAttribute
(
name
=
"计税月份-值"
)
private
String
taxMonthValue
;
@ExcelAttribute
(
name
=
"身份证开始日期-值"
)
@ExcelAttribute
(
name
=
"身份证开始日期-值"
)
private
Date
validityStartValue
;
private
Date
validityStartValue
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
View file @
15fe9ecc
...
@@ -194,8 +194,6 @@ public class PreUploadEmpImportVo implements Serializable {
...
@@ -194,8 +194,6 @@ public class PreUploadEmpImportVo implements Serializable {
private
String
bankCity
;
private
String
bankCity
;
@ExcelAttribute
(
name
=
"开户支行"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"开户支行"
,
maxLength
=
50
)
private
String
bankSubName
;
private
String
bankSubName
;
@ExcelAttribute
(
name
=
"计税月份"
,
isDate
=
true
,
dateFormat
=
"yyyyMM"
,
maxLength
=
6
)
private
String
taxMonth
;
// 字典值起始
// 字典值起始
@ExcelAttribute
(
name
=
"员工类型"
)
@ExcelAttribute
(
name
=
"员工类型"
)
...
@@ -269,13 +267,11 @@ public class PreUploadEmpImportVo implements Serializable {
...
@@ -269,13 +267,11 @@ public class PreUploadEmpImportVo implements Serializable {
private
String
disabilityLevelValue
;
private
String
disabilityLevelValue
;
@ExcelAttribute
(
name
=
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"
)
@ExcelAttribute
(
name
=
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"
)
private
String
otherFlagValue
;
private
String
otherFlagValue
;
// 银行卡号 开户总行 开户省 开户市 开户支行
计税月份
// 银行卡号 开户总行 开户省 开户市 开户支行
@ExcelAttribute
(
name
=
"开户省"
)
@ExcelAttribute
(
name
=
"开户省"
)
private
String
bankProvinceValue
;
private
String
bankProvinceValue
;
@ExcelAttribute
(
name
=
"开户市"
)
@ExcelAttribute
(
name
=
"开户市"
)
private
String
bankCityValue
;
private
String
bankCityValue
;
@ExcelAttribute
(
name
=
"计税月份"
)
private
String
taxMonthValue
;
@ExcelAttribute
(
name
=
"身份证开始日期"
)
@ExcelAttribute
(
name
=
"身份证开始日期"
)
private
Date
validityStartValue
;
private
Date
validityStartValue
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
View file @
15fe9ecc
...
@@ -198,8 +198,6 @@ public class TMainExportAllVO {
...
@@ -198,8 +198,6 @@ public class TMainExportAllVO {
private
String
field76
;
private
String
field76
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"开户支行"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"开户支行"
)
private
String
field77
;
private
String
field77
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"计税月份"
)
private
String
field78
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreEmpMainVo.java
View file @
15fe9ecc
...
@@ -57,8 +57,9 @@ public class TPreEmpMainVo extends RowIndex implements Serializable {
...
@@ -57,8 +57,9 @@ public class TPreEmpMainVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"档案所在地县"
,
isArea
=
true
,
parentField
=
"fileCity"
,
isNotEmpty
=
false
,
errorInfo
=
"档案所在地县不能为空"
)
@ExcelAttribute
(
name
=
"档案所在地县"
,
isArea
=
true
,
parentField
=
"fileCity"
,
isNotEmpty
=
false
,
errorInfo
=
"档案所在地县不能为空"
)
@ExcelProperty
(
"档案所在地县"
)
@ExcelProperty
(
"档案所在地县"
)
private
String
fileTown
;
private
String
fileTown
;
@ExcelAttribute
(
name
=
"计税月份"
)
/*
@ExcelProperty
(
"计税月份"
)
@ExcelAttribute(name = "计111税月份")
private
String
taxMonth
;
@ExcelProperty("计111税月份")
private String tax111Month;*/
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
15fe9ecc
...
@@ -619,7 +619,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -619,7 +619,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户省"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户省"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户市"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户市"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户支行"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"开户支行"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"计税月份"
}));
Set
<
String
>
titleContent
=
getExportFieldNameDetailByClass
(
TMainExportAllVO
.
class
);
Set
<
String
>
titleContent
=
getExportFieldNameDetailByClass
(
TMainExportAllVO
.
class
);
//ExcelUtil<TMainExportAllVO> util = new ExcelUtil<>(TMainExportAllVO.class)
//ExcelUtil<TMainExportAllVO> util = new ExcelUtil<>(TMainExportAllVO.class)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
15fe9ecc
...
@@ -3733,7 +3733,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3733,7 +3733,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
,
"是否曾被认定为工伤"
,
"是否有职业病"
,
"职业病名称"
,
"是否有传染性疾病"
,
"传染病名称"
,
"是否被劳动能力鉴定委员会鉴定为具有伤残等级"
,
"伤残病名称"
,
"伤残等级"
,
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"
,
"是否曾被认定为工伤"
,
"是否有职业病"
,
"职业病名称"
,
"是否有传染性疾病"
,
"传染病名称"
,
"是否被劳动能力鉴定委员会鉴定为具有伤残等级"
,
"伤残病名称"
,
"伤残等级"
,
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种"
,
"是否有不良记录"
,
"是否有不良记录"
,
"紧急联系人姓名"
,
"紧急联系人与本人关系"
,
"联系地址-省"
,
"联系地址-市"
,
"联系地址-区/县"
,
"联系地址-详细地址"
,
"紧急联系人姓名"
,
"紧急联系人与本人关系"
,
"联系地址-省"
,
"联系地址-市"
,
"联系地址-区/县"
,
"联系地址-详细地址"
,
"手机号码(紧急联系人)"
,
"银行卡号"
,
"开户总行"
,
"开户省"
,
"开户市"
,
"开户支行"
,
"计税月份"
};
,
"手机号码(紧急联系人)"
,
"银行卡号"
,
"开户总行"
,
"开户省"
,
"开户市"
,
"开户支行"
};
Map
<
String
,
String
>
modelTitleMap
=
new
HashMap
<>();
Map
<
String
,
String
>
modelTitleMap
=
new
HashMap
<>();
for
(
String
title
:
modelTitle
)
{
for
(
String
title
:
modelTitle
)
{
modelTitleMap
.
put
(
title
,
title
);
modelTitleMap
.
put
(
title
,
title
);
...
@@ -4019,7 +4019,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4019,7 +4019,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
saveEmp
.
getFileStatus
()
==
CommonConstants
.
ZERO_INT
)
{
if
(
saveEmp
.
getFileStatus
()
==
CommonConstants
.
ZERO_INT
)
{
// 第二步:其他信息并行校验
// 第二步:其他信息并行校验
// 1必填项未填写:紧急联系人
// 1必填项未填写:紧急联系人
// 2格式不正确:计税月份
// 2格式不正确:计
111
税月份
// 3校验是否通过:姓名&身份证号是否一致、手机号是否真实、姓名&银行卡号是否一致
// 3校验是否通过:姓名&身份证号是否一致、手机号是否真实、姓名&银行卡号是否一致
// 1必填项未填写:紧急联系人
// 1必填项未填写:紧急联系人
...
@@ -4410,9 +4410,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4410,9 +4410,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getBankCityValue
()))
{
if
(
Common
.
isNotNull
(
excel
.
getBankCityValue
()))
{
saveEmp
.
setBankCity
(
excel
.
getBankCityValue
());
saveEmp
.
setBankCity
(
excel
.
getBankCityValue
());
}
}
if
(
Common
.
isNotNull
(
excel
.
getTaxMonthValue
()))
{
saveEmp
.
setTaxMonth
(
excel
.
getTaxMonthValue
());
}
// 1.9.6: 是否有职业资格证书
// 1.9.6: 是否有职业资格证书
if
(
Common
.
isNotNull
(
excel
.
getHaveQualification
()))
{
if
(
Common
.
isNotNull
(
excel
.
getHaveQualification
()))
{
String
flag
=
CommonConstants
.
ZERO_STRING
;
String
flag
=
CommonConstants
.
ZERO_STRING
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
15fe9ecc
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
15fe9ecc
...
@@ -495,7 +495,7 @@
...
@@ -495,7 +495,7 @@
,e.HIGN_EDUCATION field40
,e.HIGN_EDUCATION field40
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51
,e.BANK_NO field73,e.BANK_NAME field74,e.BANK_PROVINCE field75,e.BANK_CITY field76,e.BANK_SUB_NAME field77
,e.TAX_MONTH field78
,e.BANK_NO field73,e.BANK_NAME field74,e.BANK_PROVINCE field75,e.BANK_CITY field76,e.BANK_SUB_NAME field77
FROM t_complete_monitor a
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
left join t_employee_info e on p.EMP_ID=e.id
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
15fe9ecc
...
@@ -84,7 +84,6 @@
...
@@ -84,7 +84,6 @@
<result
property=
"invoiceTitle"
column=
"INVOICE_TITLE"
/>
<result
property=
"invoiceTitle"
column=
"INVOICE_TITLE"
/>
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"taxMonth"
column=
"TAX_MONTH"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
...
@@ -263,7 +262,6 @@
...
@@ -263,7 +262,6 @@
a.INVOICE_TITLE,
a.INVOICE_TITLE,
a.BANK_PROVINCE,
a.BANK_PROVINCE,
a.BANK_CITY,
a.BANK_CITY,
a.TAX_MONTH,
a.CONTACT_PROVINCE,
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_CITY,
a.CONTACT_TOWN,
a.CONTACT_TOWN,
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
15fe9ecc
...
@@ -34,7 +34,6 @@
...
@@ -34,7 +34,6 @@
<result
property=
"enjoinDate"
column=
"ENJOIN_DATE"
/>
<result
property=
"enjoinDate"
column=
"ENJOIN_DATE"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"projectSource"
column=
"PROJECT_SOURCE"
/>
<result
property=
"projectSource"
column=
"PROJECT_SOURCE"
/>
<result
property=
"taxMonth"
column=
"TAX_MONTH"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
/>
...
@@ -156,7 +155,6 @@
...
@@ -156,7 +155,6 @@
a.ENJOIN_DATE,
a.ENJOIN_DATE,
a.TRY_PERIOD,
a.TRY_PERIOD,
a.PROJECT_SOURCE,
a.PROJECT_SOURCE,
a.TAX_MONTH,
a.STATUS,
a.STATUS,
a.PROJECT_STATUS,
a.PROJECT_STATUS,
a.DELETE_FLAG,
a.DELETE_FLAG,
...
@@ -339,9 +337,6 @@
...
@@ -339,9 +337,6 @@
<if
test=
"tEmployeeProject.projectSource != null and tEmployeeProject.projectSource.trim() != ''"
>
<if
test=
"tEmployeeProject.projectSource != null and tEmployeeProject.projectSource.trim() != ''"
>
AND a.PROJECT_SOURCE = #{tEmployeeProject.projectSource}
AND a.PROJECT_SOURCE = #{tEmployeeProject.projectSource}
</if>
</if>
<if
test=
"tEmployeeProject.taxMonth != null and tEmployeeProject.taxMonth.trim() != ''"
>
AND a.TAX_MONTH = #{tEmployeeProject.taxMonth}
</if>
<if
test=
"tEmployeeProject.status != null"
>
<if
test=
"tEmployeeProject.status != null"
>
AND a.STATUS = #{tEmployeeProject.status}
AND a.STATUS = #{tEmployeeProject.status}
</if>
</if>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
View file @
15fe9ecc
...
@@ -85,11 +85,9 @@
...
@@ -85,11 +85,9 @@
<result
property=
"invoiceTitle"
column=
"INVOICE_TITLE"
/>
<result
property=
"invoiceTitle"
column=
"INVOICE_TITLE"
/>
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"taxMonth"
column=
"TAX_MONTH"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"taxMonthFlag"
column=
"TAX_MONTH_FLAG"
/>
<result
property=
"weChatId"
column=
"WE_CHAT_ID"
/>
<result
property=
"weChatId"
column=
"WE_CHAT_ID"
/>
</resultMap>
</resultMap>
...
@@ -155,11 +153,9 @@
...
@@ -155,11 +153,9 @@
a.INVOICE_TITLE,
a.INVOICE_TITLE,
a.BANK_PROVINCE,
a.BANK_PROVINCE,
a.BANK_CITY,
a.BANK_CITY,
a.TAX_MONTH,
a.CONTACT_PROVINCE,
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_CITY,
a.CONTACT_TOWN,
a.CONTACT_TOWN,
a.TAX_MONTH_FLAG,
a.WE_CHAT_ID
a.WE_CHAT_ID
</sql>
</sql>
<sql
id=
"tPreEmployeeInfo_where"
>
<sql
id=
"tPreEmployeeInfo_where"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeProjectMapper.xml
View file @
15fe9ecc
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
<result
property=
"enjoinDate"
column=
"ENJOIN_DATE"
/>
<result
property=
"enjoinDate"
column=
"ENJOIN_DATE"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"projectSource"
column=
"PROJECT_SOURCE"
/>
<result
property=
"projectSource"
column=
"PROJECT_SOURCE"
/>
<result
property=
"taxMonth"
column=
"TAX_MONTH"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
...
@@ -107,7 +106,6 @@
...
@@ -107,7 +106,6 @@
a.ENJOIN_DATE,
a.ENJOIN_DATE,
a.TRY_PERIOD,
a.TRY_PERIOD,
a.PROJECT_SOURCE,
a.PROJECT_SOURCE,
a.TAX_MONTH,
a.STATUS,
a.STATUS,
a.PROJECT_STATUS,
a.PROJECT_STATUS,
a.CONTRACT_STATUS,
a.CONTRACT_STATUS,
...
@@ -221,9 +219,6 @@
...
@@ -221,9 +219,6 @@
<if
test=
"tPreEmployeeProject.projectSource != null and tPreEmployeeProject.projectSource.trim() != ''"
>
<if
test=
"tPreEmployeeProject.projectSource != null and tPreEmployeeProject.projectSource.trim() != ''"
>
AND a.PROJECT_SOURCE = #{tPreEmployeeProject.projectSource}
AND a.PROJECT_SOURCE = #{tPreEmployeeProject.projectSource}
</if>
</if>
<if
test=
"tPreEmployeeProject.taxMonth != null and tPreEmployeeProject.taxMonth.trim() != ''"
>
AND a.TAX_MONTH = #{tPreEmployeeProject.taxMonth}
</if>
<if
test=
"tPreEmployeeProject.status != null"
>
<if
test=
"tPreEmployeeProject.status != null"
>
AND a.STATUS = #{tPreEmployeeProject.status}
AND a.STATUS = #{tPreEmployeeProject.status}
</if>
</if>
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeExportVo.java
View file @
15fe9ecc
...
@@ -141,14 +141,7 @@ public class TSalaryEmployeeExportVo{
...
@@ -141,14 +141,7 @@ public class TSalaryEmployeeExportVo{
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手机号码"
)
@ExcelProperty
(
"手机号码"
)
private
String
empPhone
;
private
String
empPhone
;
/**
* 计税月份
*/
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Length
(
max
=
6
,
message
=
"计税月份不能超过6个字符"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份"
)
private
String
taxMonth
;
/**
/**
* 在职状态(0在职;1离职)
* 在职状态(0在职;1离职)
*/
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeUpdateVo.java
View file @
15fe9ecc
...
@@ -146,15 +146,7 @@ public class TSalaryEmployeeUpdateVo extends RowIndex implements Serializable {
...
@@ -146,15 +146,7 @@ public class TSalaryEmployeeUpdateVo extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手机号码"
)
@ExcelProperty
(
"手机号码"
)
private
String
empPhone
;
private
String
empPhone
;
/**
* 计税月份
*/
@Length
(
max
=
6
,
message
=
"计税月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Schema
(
description
=
"计税月份"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份"
)
private
String
taxMonth
;
/**
/**
* 在职状态(0在职;1离职)
* 在职状态(0在职;1离职)
*/
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeVo.java
View file @
15fe9ecc
...
@@ -184,15 +184,7 @@ public class TSalaryEmployeeVo extends RowIndex implements Serializable {
...
@@ -184,15 +184,7 @@ public class TSalaryEmployeeVo extends RowIndex implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手机号码"
)
@ExcelProperty
(
"手机号码"
)
private
String
empPhone
;
private
String
empPhone
;
/**
* 计税月份
*/
@Length
(
max
=
6
,
message
=
"计税月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"计税月份"
,
maxLength
=
6
)
@Schema
(
description
=
"计税月份"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"计税月份"
)
private
String
taxMonth
;
/**
/**
* 在职状态(0在职;1离职)
* 在职状态(0在职;1离职)
*/
*/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
View file @
15fe9ecc
...
@@ -103,14 +103,14 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
...
@@ -103,14 +103,14 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
}
}
extracted
(
newEntity
,
oldEntity
,
str
);
extracted
(
newEntity
,
oldEntity
,
str
);
//计税月份
//计税月份
if
(
Common
.
isNotNull
(
newEntity
.
getTaxMonth
())
/*
if (Common.isNotNull(newEntity.getTaxMonth())
&& Common.isNotNull(oldEntity.getTaxMonth()) && !oldEntity.getTaxMonth().equals(newEntity.getTaxMonth())){
&& Common.isNotNull(oldEntity.getTaxMonth()) && !oldEntity.getTaxMonth().equals(newEntity.getTaxMonth())){
str.append("计税月份:");
str.append("计税月份:");
str.append(oldEntity.getTaxMonth());
str.append(oldEntity.getTaxMonth());
str.append("->");
str.append("->");
str.append(newEntity.getTaxMonth());
str.append(newEntity.getTaxMonth());
str.append(" ");
str.append(" ");
}
}
*/
//开户行省
//开户行省
if
(
Common
.
isNotNull
(
newEntity
.
getBankProvince
())
if
(
Common
.
isNotNull
(
newEntity
.
getBankProvince
())
&&
Common
.
isNotNull
(
oldEntity
.
getBankProvince
())
&&
!
oldEntity
.
getBankProvince
().
equals
(
newEntity
.
getBankProvince
())){
&&
Common
.
isNotNull
(
oldEntity
.
getBankProvince
())
&&
!
oldEntity
.
getBankProvince
().
equals
(
newEntity
.
getBankProvince
())){
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
15fe9ecc
...
@@ -134,12 +134,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -134,12 +134,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
noPageDiy
(
searchVo
);
list
=
noPageDiy
(
searchVo
);
/*if (Common.isNotNull(list)) {
util = new ExcelUtil<>(TSalaryEmployeeExportVo.class);
for (TSalaryEmployeeExportVo vo : list) {
util.convertEntity(vo, null, null, null);
}
}*/
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
writeSheet
=
EasyExcel
.
writerSheet
(
"薪酬人员表"
+
index
).
build
();
writeSheet
=
EasyExcel
.
writerSheet
(
"薪酬人员表"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
...
@@ -891,7 +885,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -891,7 +885,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TSalaryEmployee
emp
;
TSalaryEmployee
emp
;
// 开户行省市的区域暂存
// 开户行省市的区域暂存
String
areaStr
;
String
areaStr
;
boolean
curTaxMonth
;
//
boolean curTaxMonth;
Map
<
String
,
String
>
bankMap
=
tBankSetService
.
getBankMap
(
null
);
Map
<
String
,
String
>
bankMap
=
tBankSetService
.
getBankMap
(
null
);
ExcelUtil
<
TSalaryEmployee
>
util
=
new
ExcelUtil
<>(
TSalaryEmployee
.
class
);
ExcelUtil
<
TSalaryEmployee
>
util
=
new
ExcelUtil
<>(
TSalaryEmployee
.
class
);
TSalaryEmployee
old
;
TSalaryEmployee
old
;
...
@@ -968,12 +962,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -968,12 +962,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
old
=
new
TSalaryEmployee
();
old
=
new
TSalaryEmployee
();
if
(
Common
.
isNotNull
(
emp
)
&&
Common
.
isNotNull
(
emp
.
getId
()))
{
if
(
Common
.
isNotNull
(
emp
)
&&
Common
.
isNotNull
(
emp
.
getId
()))
{
BeanUtil
.
copyProperties
(
emp
,
old
);
BeanUtil
.
copyProperties
(
emp
,
old
);
curTaxMonth
=
false
;
/*
curTaxMonth = false;
if (Common.isNotNull(emp.getTaxMonth()) && Common.isNotNull(excel.getTaxMonth()) && emp.getTaxMonth().length()==6) {
if (Common.isNotNull(emp.getTaxMonth()) && Common.isNotNull(excel.getTaxMonth()) && emp.getTaxMonth().length()==6) {
curTaxMonth = true;
curTaxMonth = true;
} else if (Common.isNotNull(excel.getTaxMonth())) {
} else if (Common.isNotNull(excel.getTaxMonth())) {
emp.setTaxMonth(excel.getTaxMonth());
emp.setTaxMonth(excel.getTaxMonth());
}
}
*/
if
(
Common
.
isNotNull
(
excel
.
getBankName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getBankName
()))
{
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
BANK_NAME_ERROR
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
BANK_NAME_ERROR
));
...
@@ -1024,11 +1018,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1024,11 +1018,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
// 变更日志 fxj 2023-10-24
// 变更日志 fxj 2023-10-24
logService
.
initModLog
(
old
,
emp
,
CommonConstants
.
ONE_STRING
,
user
.
getNickname
(),
util
);
logService
.
initModLog
(
old
,
emp
,
CommonConstants
.
ONE_STRING
,
user
.
getNickname
(),
util
);
baseMapper
.
updateById
(
emp
);
baseMapper
.
updateById
(
emp
);
if
(
curTaxMonth
)
{
/*
if (curTaxMonth) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO));
} else {
} else {
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
}*/
}
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
NOT_HAVE_EMP
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SalaryConstants
.
NOT_HAVE_EMP
));
}
}
...
@@ -1213,7 +1207,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1213,7 +1207,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
// 开户行省市的区域暂存
// 开户行省市的区域暂存
String
areaProvince
;
String
areaProvince
;
String
areaCity
;
String
areaCity
;
boolean
curTaxMonth
;
//
boolean curTaxMonth;
TSalaryEmployee
excel
;
TSalaryEmployee
excel
;
// 是否可更新
// 是否可更新
boolean
canUpdate
=
Common
.
isNotNull
(
vo
.
getIsUpdate
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getIsUpdate
());
boolean
canUpdate
=
Common
.
isNotNull
(
vo
.
getIsUpdate
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getIsUpdate
());
...
@@ -1304,7 +1298,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1304,7 +1298,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
emp
=
empMap
.
get
(
idCard
);
emp
=
empMap
.
get
(
idCard
);
if
(
Common
.
isNotNull
(
emp
))
{
if
(
Common
.
isNotNull
(
emp
))
{
if
(
canUpdate
)
{
if
(
canUpdate
)
{
curTaxMonth
=
false
;
/*
curTaxMonth = false;
if (Common.isNotNull(emp.getTaxMonth())) {
if (Common.isNotNull(emp.getTaxMonth())) {
curTaxMonth = true;
curTaxMonth = true;
} else if (Common.isNotNull(excel.getTaxMonth())) {
} else if (Common.isNotNull(excel.getTaxMonth())) {
...
@@ -1320,7 +1314,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1320,7 +1314,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
continue;
continue;
}
}
}
}
*/
if
(
Common
.
isNotNull
(
excel
.
getBankName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getBankName
()))
{
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
SalaryConstants
.
BANK_NAME_ERROR
));
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
SalaryConstants
.
BANK_NAME_ERROR
));
...
@@ -1377,11 +1371,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1377,11 +1371,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
emp
.
setIssueStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setIssueStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setLineNums
(
null
);
emp
.
setLineNums
(
null
);
updateList
.
add
(
emp
);
updateList
.
add
(
emp
);
if
(
curTaxMonth
)
{
/*
if (curTaxMonth) {
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.CUR_TAX_INFO));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.CUR_TAX_INFO));
} else {
} else {
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
CommonConstants
.
SAVE_SUCCESS
));
}*/
}
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
CommonConstants
.
SAVE_SUCCESS
));
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
"已存在,不可更新"
));
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
"已存在,不可更新"
));
}
}
...
@@ -1390,7 +1384,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1390,7 +1384,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if
(
Common
.
isEmpty
(
excel
.
getEmpName
())
||
Common
.
isEmpty
(
idCard
)
if
(
Common
.
isEmpty
(
excel
.
getEmpName
())
||
Common
.
isEmpty
(
idCard
)
||
Common
.
isEmpty
(
excel
.
getEmpPhone
())
||
Common
.
isEmpty
(
excel
.
getBankName
())
||
Common
.
isEmpty
(
excel
.
getEmpPhone
())
||
Common
.
isEmpty
(
excel
.
getBankName
())
||
Common
.
isEmpty
(
excel
.
getBankNo
())
||
Common
.
isEmpty
(
excel
.
getBankProvince
())
||
Common
.
isEmpty
(
excel
.
getBankNo
())
||
Common
.
isEmpty
(
excel
.
getBankProvince
())
||
Common
.
isEmpty
(
excel
.
getBankCity
())
||
Common
.
isEmpty
(
excel
.
getTaxMonth
())
)
{
||
Common
.
isEmpty
(
excel
.
getBankCity
())
)
{
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
"新增员工,除了支行,其他必填"
));
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
"新增员工,除了支行,其他必填"
));
continue
;
continue
;
}
else
{
}
else
{
...
@@ -1398,7 +1392,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1398,7 +1392,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
CommonConstants
.
UNDER_16_ERROR
));
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
CommonConstants
.
UNDER_16_ERROR
));
continue
;
continue
;
}
}
if
(
excel
.
getTaxMonth
().
length
()
==
6
)
{
/*
if (excel.getTaxMonth().length() == 6) {
try {
try {
Integer.parseInt(excel.getTaxMonth());
Integer.parseInt(excel.getTaxMonth());
} catch (NumberFormatException e) {
} catch (NumberFormatException e) {
...
@@ -1408,7 +1402,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1408,7 +1402,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
} else {
} else {
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
continue;
continue;
}
}
*/
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
if
(
bankMap
.
get
(
excel
.
getBankName
())
==
null
)
{
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
SalaryConstants
.
BANK_NAME_ERROR
));
errorMessageList
.
add
(
new
ErrorMessage
((
i
),
SalaryConstants
.
BANK_NAME_ERROR
));
continue
;
continue
;
...
@@ -1644,14 +1638,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1644,14 +1638,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
public
String
getEmpTaxMonth
(
String
empIdCard
)
{
public
String
getEmpTaxMonth
(
String
empIdCard
)
{
// 0表示 未找到薪资记录,C端可编辑
// 0表示 未找到薪资记录,C端可编辑
String
taxMonth
=
CommonConstants
.
ZERO_STRING
;
String
taxMonth
=
CommonConstants
.
ZERO_STRING
;
TSalaryEmployee
employee
=
baseMapper
.
getByEmpIdCard
(
empIdCard
);
if
(
employee
!=
null
&&
Common
.
isNotNull
(
employee
.
getTaxMonth
()))
{
// 查找本年度薪资,有则返回薪资人员的计税月份,无则返回空,可编辑
int
count
=
salaryAccountMapper
.
getAccountIdByIdCard
(
empIdCard
);
if
(
count
>
0
)
{
taxMonth
=
employee
.
getTaxMonth
();
}
}
return
taxMonth
;
return
taxMonth
;
}
}
...
@@ -1677,21 +1664,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -1677,21 +1664,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
@Override
@Override
public
String
savePreNewEmpInfo
(
TSalaryEmployee
newEmp
)
{
public
String
savePreNewEmpInfo
(
TSalaryEmployee
newEmp
)
{
// true表示 未找到薪资记录,C端可编辑计税月份
// true表示 未找到薪资记录,C端可编辑计税月份
boolean
canSaveFlag
=
true
;
//
boolean canSaveFlag = true;
TSalaryEmployee
employee
=
baseMapper
.
getByEmpIdCard
(
newEmp
.
getEmpIdcard
());
TSalaryEmployee
employee
=
baseMapper
.
getByEmpIdCard
(
newEmp
.
getEmpIdcard
());
if
(
employee
!=
null
)
{
/*
if (employee != null) {
// 查找本年度薪资,有则返回薪资人员的计税月份,无则返回空,可编辑
// 查找本年度薪资,有则返回薪资人员的计税月份,无则返回空,可编辑
int count = salaryAccountMapper.getAccountIdByIdCard(newEmp.getEmpIdcard());
int count = salaryAccountMapper.getAccountIdByIdCard(newEmp.getEmpIdcard());
if (count > 0) {
if (count > 0) {
canSaveFlag = false;
canSaveFlag = false;
}
}
}
}
*/
if
(
employee
!=
null
)
{
if
(
employee
!=
null
)
{
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"createBy"
,
"createName"
,
"createTime"
};
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"createBy"
,
"createName"
,
"createTime"
,
"taxMonth"
};
// 当年有发薪纪录,不允许编辑计税月
// 当年有发薪纪录,不允许编辑计税月
if
(!
canSaveFlag
)
{
/*
if (!canSaveFlag) {
newEmp.setTaxMonth(employee.getTaxMonth());
newEmp.setTaxMonth(employee.getTaxMonth());
}
}
*/
// 变更日志 hgw 2024-7-16 18:19:57
// 变更日志 hgw 2024-7-16 18:19:57
logService
.
initModLog
(
newEmp
,
employee
,
CommonConstants
.
THREE_STRING
,
newEmp
.
getCreateName
(),
null
);
logService
.
initModLog
(
newEmp
,
employee
,
CommonConstants
.
THREE_STRING
,
newEmp
.
getCreateName
(),
null
);
BeanUtil
.
copyProperties
(
newEmp
,
employee
,
ignoreProperties
);
BeanUtil
.
copyProperties
(
newEmp
,
employee
,
ignoreProperties
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
15fe9ecc
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
View file @
15fe9ecc
...
@@ -64,7 +64,6 @@
...
@@ -64,7 +64,6 @@
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankProvince"
column=
"BANK_PROVINCE"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"bankCity"
column=
"BANK_CITY"
/>
<result
property=
"empPhone"
column=
"EMP_PHONE"
/>
<result
property=
"empPhone"
column=
"EMP_PHONE"
/>
<result
property=
"taxMonth"
column=
"TAX_MONTH"
/>
<result
property=
"fileStatus"
column=
"FILE_STATUS"
/>
<result
property=
"fileStatus"
column=
"FILE_STATUS"
/>
</resultMap>
</resultMap>
<resultMap
id=
"salaryEmpRosterMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmpRosterVo"
>
<resultMap
id=
"salaryEmpRosterMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmpRosterVo"
>
...
@@ -97,7 +96,6 @@
...
@@ -97,7 +96,6 @@
a.BANK_PROVINCE,
a.BANK_PROVINCE,
a.BANK_CITY,
a.BANK_CITY,
a.EMP_PHONE,
a.EMP_PHONE,
a.TAX_MONTH,
a.FILE_STATUS
a.FILE_STATUS
</sql>
</sql>
<sql
id=
"tSalaryEmployee_where"
>
<sql
id=
"tSalaryEmployee_where"
>
...
@@ -165,9 +163,6 @@
...
@@ -165,9 +163,6 @@
<if
test=
"tSalaryEmployee.empPhone != null and tSalaryEmployee.empPhone.trim() != ''"
>
<if
test=
"tSalaryEmployee.empPhone != null and tSalaryEmployee.empPhone.trim() != ''"
>
AND a.EMP_PHONE = #{tSalaryEmployee.empPhone}
AND a.EMP_PHONE = #{tSalaryEmployee.empPhone}
</if>
</if>
<if
test=
"tSalaryEmployee.taxMonth != null and tSalaryEmployee.taxMonth.trim() != ''"
>
AND a.TAX_MONTH = #{tSalaryEmployee.taxMonth}
</if>
<if
test=
"tSalaryEmployee.fileStatus != null"
>
<if
test=
"tSalaryEmployee.fileStatus != null"
>
AND a.FILE_STATUS = #{tSalaryEmployee.fileStatus}
AND a.FILE_STATUS = #{tSalaryEmployee.fileStatus}
</if>
</if>
...
@@ -211,7 +206,6 @@
...
@@ -211,7 +206,6 @@
a1.area_name as "BANK_PROVINCE",
a1.area_name as "BANK_PROVINCE",
a2.area_name as "BANK_CITY",
a2.area_name as "BANK_CITY",
a.EMP_PHONE,
a.EMP_PHONE,
a.TAX_MONTH,
case when a.FILE_STATUS = 0 then "在职"
case when a.FILE_STATUS = 0 then "在职"
when a.FILE_STATUS = 1 then "离职"
when a.FILE_STATUS = 1 then "离职"
else null end as "FILE_STATUS"
else null end as "FILE_STATUS"
...
...
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