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
e238d405
Commit
e238d405
authored
Jul 28, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量办理 100%
parent
29a27c01
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
201 additions
and
122 deletions
+201
-122
DispatchEmpVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
+12
-0
EmpProjectDispatchVo.java
.../cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java
+6
-6
ProjectSetInfoVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
+0
-2
TEmpFamilyController.java
...lus/v1/yifu/archives/controller/TEmpFamilyController.java
+0
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+6
-2
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+1
-1
ErrorCodes.java
....cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
+13
-1
ExcelUtil.java
...m/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
+2
-2
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+6
-0
DispatchConstants.java
...loud/plus/v1/yifu/social/constants/DispatchConstants.java
+1
-1
TSocialFundHistory.java
.../cloud/plus/v1/yifu/social/entity/TSocialFundHistory.java
+4
-4
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+4
-4
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+5
-5
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+3
-3
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+6
-6
TSocialFundHistoryVo.java
...fu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
+2
-2
TSocialFundInfoExportVo.java
...cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java
+2
-2
TSocialFundInfoVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoVo.java
+2
-2
TSocialInfoVo.java
.../com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java
+4
-4
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+14
-11
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+101
-56
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
View file @
e238d405
...
...
@@ -30,8 +30,15 @@ public class DispatchEmpVo implements Serializable {
*/
@Schema
(
description
=
"主键"
)
private
String
id
;
@ExcelProperty
(
value
=
"员工主码"
)
private
String
empCode
;
/**
* 员工项目编码
*/
@ExcelProperty
(
value
=
"员工项目编码"
)
private
String
empNo
;
@Schema
(
description
=
"员工类型"
)
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
...
...
@@ -191,4 +198,9 @@ public class DispatchEmpVo implements Serializable {
@Schema
(
description
=
"业务细分(存lable)"
,
name
=
"contractName"
)
private
String
contractSubName
;
/**
* 项目状态(0正常;1已减项)
*/
@Schema
(
description
=
"项目状态(0正常;1已减项)"
)
private
Integer
projectStatus
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java
View file @
e238d405
...
...
@@ -31,10 +31,10 @@ public class EmpProjectDispatchVo implements Serializable {
@Size
(
max
=
32
,
message
=
"人员档案主表id不可超过32位"
)
private
String
empId
;
/**
* 员工
编
码
* 员工
主
码
*/
@Schema
(
description
=
"员工
编
码"
)
@Size
(
max
=
20
,
message
=
"员工
编
码不可超过20位"
)
@Schema
(
description
=
"员工
主
码"
)
@Size
(
max
=
20
,
message
=
"员工
主
码不可超过20位"
)
private
String
empCode
;
/**
* 员工类型(字典值,0外包1派遣2代理)
...
...
@@ -92,9 +92,9 @@ public class EmpProjectDispatchVo implements Serializable {
private
String
post
;
/**
* 员工编码
* 员工
项目
编码
*/
@Schema
(
description
=
"员工编码"
)
@Size
(
max
=
20
,
message
=
"员工编码不可超过20位"
)
@Schema
(
description
=
"员工
项目
编码"
)
@Size
(
max
=
20
,
message
=
"员工
项目
编码不可超过20位"
)
private
String
empNo
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
View file @
e238d405
...
...
@@ -59,6 +59,4 @@ public class ProjectSetInfoVo implements Serializable {
*/
@Schema
(
description
=
"商险结算类型"
)
private
String
insuranceSettleType
=
CommonConstants
.
ONE_STRING
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java
View file @
e238d405
...
...
@@ -19,19 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpFamily
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmpFamilyService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.FamilySearchVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -44,10 +40,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
e238d405
...
...
@@ -2110,6 +2110,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
contractMapper
.
insert
(
contract
);
contractAdd
.
setId
(
contract
.
getId
());
contractAdd
.
setEmpNo
(
contract
.
getEmpNo
());
contractsMap
.
put
(
contractAdd
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
contractAdd
.
getDeptNo
(),
contractAdd
);
}
}
catch
(
Exception
e
)
{
...
...
@@ -2131,8 +2132,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo
=
new
TEmployeeInfo
();
BeanUtil
.
copyProperties
(
empAdd
,
employeeInfo
);
employeeInfo
.
setEmpCode
(
getCode
());
employeeInfo
.
setStatus
(
CommonConstants
.
ZERO_INT
);
baseMapper
.
insert
(
employeeInfo
);
empAdd
.
setId
(
employeeInfo
.
getId
());
empAdd
.
setEmpCode
(
employeeInfo
.
getEmpCode
());
empAddsMap
.
put
(
empAdd
.
getEmpIdcard
(),
empAdd
);
}
}
catch
(
Exception
e
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
e238d405
...
...
@@ -142,6 +142,8 @@
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
<result
property=
"hignEducation"
column=
"HIGN_EDUCATION"
/>
<result
property=
"fileStatus"
column=
"FILE_STATUS"
/>
<result
property=
"projectStatus"
column=
"PROJECT_STATUS"
/>
<result
property=
"contractName"
column=
"CONTRACT_NAME"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
...
...
@@ -157,6 +159,8 @@
<result
property=
"deptName"
column=
"DEPT_NAME"
/>
<result
property=
"deptNo"
column=
"DEPT_NO"
/>
<result
property=
"post"
column=
"POST"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
</resultMap>
<sql
id=
"baseParam"
>
a
...
...
@@ -673,7 +677,7 @@
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,b.CONTRACT_ID,
c.UNIT_NAME,
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST
,c.EMP_NO,c.PROJECT_STATUS
from (
select e.ID,e.EMP_CODE,e.EMP_NATRUE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS
...
...
@@ -689,7 +693,7 @@
</if>
) a
left join (
select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID
select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID
,p.EMP_NO,P.PROJECT_STATUS
from t_employee_project p
where 1=1
<if
test=
"checkVo != null"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
e238d405
...
...
@@ -290,7 +290,7 @@ public interface CommonConstants {
public
static
final
String
ZIP_TYPE
=
"zip"
;
int
BATCH_COUNT
=
100
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式"
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式
(1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)
"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
String
ID
=
"ID"
;
String
PARAM_IS_NOT_ERROR
=
"传参异常,请检查参数"
;
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @
e238d405
...
...
@@ -337,7 +337,7 @@ public interface ErrorCodes {
String
EMP_DISPATCH_SOCIAL_NOT_EMPTY
=
"emp.dispatch.social.not.empty"
;
/**
* 派单信息不可为空
* 派单
公积金
信息不可为空
*/
String
EMP_DISPATCH_FUND_NOT_EMPTY
=
"emp.dispatch.fund.not.empty"
;
...
...
@@ -424,4 +424,16 @@ public interface ErrorCodes {
* 派增异常: 自定义缴纳养老基数不可为空
*/
String
EMP_DISPATCH_SOCIAL_DIY_NOT_EMPTY
=
"emp.dispatch.social.diy.not.empty"
;
/**
* 派增异常: 对应项目编码的项目档案已减项,请去项目档案处复项
*/
String
EMP_DISPATCH_EMP_PROJECT_NOT_USED
=
"emp.dispatch.emp.project.not.used"
;
/**
* 派增异常: 对应身份证的人员档案已减档
*/
String
EMP_DISPATCH_EMP_NOT_USED
=
"emp.dispatch.emp.not.used"
;
/**
* 派增异常: 社保派单基数不可小于最低基数且不可大于最高基数
*/
String
EMP_DISPATCH_SOCIAL_LIMIT_ERROR
=
"emp.dispatch.social.limit.error"
;
}
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
View file @
e238d405
...
...
@@ -312,7 +312,7 @@ public class ExcelUtil <T> implements Serializable {
}
if
(
Common
.
isNotNull
(
tempStr
)){
c
=
tempStr
;
mapArea
.
put
(
tempStr
,
field
);
mapArea
.
put
(
tempStr
+
CommonConstants
.
DOWN_LINE_STRING
+
attr
.
name
()
,
field
);
}
// 取得类型,并根据对象类型设置值.
fieldType
=
field
.
getType
();
...
...
@@ -377,7 +377,7 @@ public class ExcelUtil <T> implements Serializable {
}
if
(
Common
.
isNotNull
(
mapArea
)){
for
(
Map
.
Entry
<
String
,
Field
>
entry:
mapArea
.
entrySet
()){
entry
.
getValue
().
set
(
data
,
entry
.
getKey
());
entry
.
getValue
().
set
(
data
,
entry
.
getKey
()
.
substring
(
0
,
entry
.
getKey
().
indexOf
(
CommonConstants
.
DOWN_LINE_STRING
))
);
}
}
}
catch
(
Exception
e
){
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
e238d405
...
...
@@ -153,7 +153,13 @@ emp.dispatch.reduce.exists=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672C\u6B21\u6D3E\u58
socialinfo.list.num.large
=
\u
5F53
\u
524D
\u
793E
\u
4FDD
\u
5BFC
\u5165\u
961F
\u5217\u
4E0D
\u
8DB3
\u6216\u8005\u6570\u
636E
\u
91CF
\u
8FC7
\u5927\u
FF0C
\u
8BF7
\u
7A0D
\u
540E
\u
91CD
\u
8BD5
\u
FF01
emp.dispatch.social.diy.not.empty
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
81EA
\u
5B9A
\u
4E49
\u
7F34
\u
7EB3
\u
517B
\u8001\u
57FA
\u6570\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.emp.project.not.used
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
5BF9
\u
5E94
\u9879\u
76EE
\u
7F16
\u7801\u7684\u9879\u
76EE
\u6863\u6848\u
5DF2
\u
51CF
\u9879\u
FF0C
\u
8BF7
\u
53BB
\u9879\u
76EE
\u6863\u6848\u5904\u
590D
\u9879
emp.dispatch.emp.not.used
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
5BF9
\u
5E94
\u
8EAB
\u
4EFD
\u
8BC1
\u7684\u
4EBA
\u5458\u6863\u6848\u
5DF2
\u
51CF
\u6863
emp.dispatch.social.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u
6D3E
\u5355\u
57FA
\u6570\u
4E0D
\u
53EF
\u
5C0F
\u
4E8E
\u6700\u
4F4E
\u
57FA
\u6570\u
4E14
\u
4E0D
\u
53EF
\u5927\u
4E8E
\u6700\u
9AD8
\u
57FA
\u6570
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java
View file @
e238d405
...
...
@@ -38,7 +38,7 @@ public class DispatchConstants {
/**
* 社保派单
* '缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳) PAYMENT_TYPE
* '缴纳类型(0最低缴纳、1自定义、2最高缴纳) PAYMENT_TYPE
*/
enum
PaymentType
{
LATEST
(
"0"
,
"最低"
),
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundHistory.java
View file @
e238d405
...
...
@@ -298,11 +298,11 @@ public class TSocialFundHistory extends BaseEntity {
@ExcelProperty
(
"个人公积金金额"
)
private
BigDecimal
personalFundMoney
;
/**
* 缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳)
*/
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
private
Integer
paymentType
;
/**
* 是否是社保:0否1是
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
e238d405
...
...
@@ -610,10 +610,10 @@ public class TSocialFundInfo extends BaseEntity {
/**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
*/
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳) 不能超过1个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
private
String
paymentType
;
/**
* 基数上限(社保或公积金)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
e238d405
...
...
@@ -625,12 +625,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty
(
"电信编号"
)
private
String
telecomNumber
;
/**
* 缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳)
*/
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳) 不能超过1个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
private
String
paymentType
;
/**
* 备案基数
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
e238d405
...
...
@@ -203,10 +203,10 @@ public class SocialHandleExportVo implements Serializable {
private
String
recordBase
;
/**
* 缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳)
*/
@ExcelAttribute
(
name
=
"缴纳类型"
,
isDataId
=
true
,
readConverterExp
=
"0=最低缴纳,1=自定义
缴纳
,2=最高缴纳"
,
needExport
=
true
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
isDataId
=
true
,
readConverterExp
=
"0=最低缴纳,1=自定义,2=最高缴纳"
,
needExport
=
true
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型"
)
private
Integer
paymentType
;
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
e238d405
...
...
@@ -130,7 +130,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 档案-县
*/
@ExcelAttribute
(
name
=
"档案-县"
,
isArea
=
true
,
parentField
=
"fileCity"
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"档案-县"
,
isArea
=
true
,
parentField
=
"fileCity"
)
@Schema
(
description
=
"档案-县"
)
@ExcelProperty
(
"档案-县"
)
private
String
fileTown
;
...
...
@@ -239,9 +239,9 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 学历名称
*/
@ExcelAttribute
(
name
=
"学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
)
@ExcelAttribute
(
name
=
"学历"
)
@NotNull
(
message
=
"学历不可为空"
)
@Schema
(
description
=
"学历:
无档案的时候 新增档案时同步新增学历
"
)
@Schema
(
description
=
"学历:
派增只做记录
"
)
@ExcelProperty
(
value
=
"学历"
)
private
String
educationName
;
...
...
@@ -306,11 +306,11 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty
(
"大病起缴日期"
)
private
Date
bigailmentStart
;
/**
* 缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)
* 缴纳类型(0最低缴纳、1自定义、2最高缴纳)
*/
@Length
(
max
=
1
,
message
=
"缴纳类型 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
isDataId
=
true
,
readConverterExp
=
"0=最低缴纳,1=自定义
缴纳
,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型:(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
isDataId
=
true
,
readConverterExp
=
"0=最低缴纳,1=自定义,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型:(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型"
)
private
String
paymentType
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
View file @
e238d405
...
...
@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelAttribute
(
name
=
"缴纳类型"
,
isNotEmpty
=
true
,
errorInfo
=
"缴纳类型必填"
,
readConverterExp
=
"0=最低缴纳,1=自定义
缴纳
,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
isNotEmpty
=
true
,
errorInfo
=
"缴纳类型必填"
,
readConverterExp
=
"0=最低缴纳,1=自定义,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型"
)
private
String
paymentType
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java
View file @
e238d405
...
...
@@ -303,8 +303,8 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty
(
"大病起缴日期"
)
private
Date
bigailmentStart
;
@ExcelAttribute
(
name
=
"缴纳类型"
,
readConverterExp
=
"0=最低缴纳,1=自定义
缴纳
,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
readConverterExp
=
"0=最低缴纳,1=自定义,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型"
)
private
String
paymentType
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoVo.java
View file @
e238d405
...
...
@@ -301,8 +301,8 @@ public class TSocialFundInfoVo extends RowIndex implements Serializable {
@ExcelProperty
(
"大病起缴日期"
)
private
Date
bigailmentStart
;
@ExcelAttribute
(
name
=
"缴纳类型"
,
readConverterExp
=
"0=最低缴纳,1=自定义
缴纳
,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelAttribute
(
name
=
"缴纳类型"
,
readConverterExp
=
"0=最低缴纳,1=自定义,2=最高缴纳"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型"
)
private
String
paymentType
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java
View file @
e238d405
...
...
@@ -622,10 +622,10 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
/**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
*/
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳) 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义
缴纳
、2最高缴纳)"
)
@Length
(
max
=
1
,
message
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳) 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
,
maxLength
=
1
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义、2最高缴纳)"
)
private
String
paymentType
;
/**
* 备案基数
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
e238d405
...
...
@@ -28,24 +28,21 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.SneakyThrows
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.List
;
/**
...
...
@@ -73,6 +70,7 @@ public class TDispatchInfoController {
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchInfoPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
...
...
@@ -85,6 +83,7 @@ public class TDispatchInfoController {
@PostMapping
(
"/noPage"
)
//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo_get')" )
public
R
<
List
<
TDispatchInfo
>>
getTDispatchInfoNoPage
(
@RequestBody
TDispatchInfoSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
R
.
ok
(
tDispatchInfoService
.
noPageDiy
(
tDispatchInfo
));
}
/**
...
...
@@ -101,6 +100,7 @@ public class TDispatchInfoController {
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
tDispatchInfo
.
setCreateBy
(
user
.
getId
());
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
...
...
@@ -114,6 +114,7 @@ public class TDispatchInfoController {
@GetMapping
(
"/pageAudit"
)
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchAuditPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setStatus
(
CommonConstants
.
ZERO_STRING
);
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
...
...
@@ -130,6 +131,7 @@ public class TDispatchInfoController {
List
<
String
>
settleDomains
=
null
;
// 获取自定义sql TODO
String
sql
=
CommonConstants
.
EMPTY_STRING
;
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchSocialHandlePage
(
page
,
tDispatchInfo
,
settleDomains
,
sql
));
}
...
...
@@ -146,6 +148,7 @@ public class TDispatchInfoController {
List
<
String
>
settleDomains
=
null
;
// 获取自定义sql TODO
String
sql
=
CommonConstants
.
EMPTY_STRING
;
tDispatchInfo
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchFundHandlePage
(
page
,
tDispatchInfo
,
settleDomains
,
sql
));
}
/**
...
...
@@ -262,9 +265,9 @@ public class TDispatchInfoController {
* @Param
* @return
**/
@Operation
(
description
=
"派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit')"
)
@Operation
(
description
=
"派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit')
auditStatus:1审核通过 2审核不通过
"
)
@PostMapping
(
"/addApplyAudit"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')"
)
//
@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
public
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
@RequestParam
(
name
=
"ids"
,
required
=
true
)
String
ids
,
@RequestParam
(
name
=
"auditStatus"
,
required
=
true
)
String
auditStatus
,
@RequestParam
(
name
=
"auditRemark"
,
required
=
false
)
String
auditRemark
)
{
...
...
@@ -283,9 +286,9 @@ public class TDispatchInfoController {
* @Author fxj
* @Date 2019-09-27
**/
@Operation
(
description
=
"派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle')"
)
@Operation
(
description
=
"派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle')
handleStatus 1 办理成功 2 办理失败
"
)
@PostMapping
(
"/addApplyHandle"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')"
)
//
@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
public
R
<
List
<
ErrorMessage
>>
addApplyHandle
(
@RequestParam
(
name
=
"ids"
,
required
=
true
)
String
ids
,
@RequestParam
(
name
=
"typeSub"
,
required
=
true
)
String
typeSub
,
@RequestParam
(
name
=
"auditStatus"
,
required
=
true
)
String
handleStatus
,
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
e238d405
...
...
@@ -85,6 +85,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
IPage
<
TDispatchInfo
>
getTDispatchSocialHandlePage
(
Page
<
TDispatchInfo
>
page
,
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
tDispatchInfo
,
@Param
(
"settleDomainIds"
)
List
<
String
>
settleDomains
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
,
@Param
(
"sql"
)
String
sql
);
/**
* 公积金办理页面查询
...
...
@@ -98,6 +99,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
IPage
<
TDispatchInfo
>
getTDispatchFundHandlePage
(
Page
<
TDispatchInfo
>
page
,
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
tDispatchInfo
,
@Param
(
"settleDomainIds"
)
List
<
String
>
settleDomains
,
@Param
(
"idsStr"
)
List
<
String
>
idsStr
,
@Param
(
"sql"
)
String
sql
);
/**
* @Author fxj
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
e238d405
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
e238d405
...
...
@@ -1078,7 +1078,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @param library 预估库
* @param socialInfo 社保
* @param sysBaseSetInfo 基数配置
* @param paymentType 0最低缴纳、1自定义
缴纳
、2最高缴纳
* @param paymentType 0最低缴纳、1自定义、2最高缴纳
* @Description: 塞大病金额
* @Author: hgw
* @Date: 2020/11/25 15:51
...
...
@@ -1145,7 +1145,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
private
void
changeSocialInfoByBase
(
TSocialFundInfo
social
,
SysBaseSetInfo
socialSet
)
{
if
(
Common
.
isNotNull
(
socialSet
))
{
social
.
setCanOverpay
(
socialSet
.
getCanOverpay
());
social
.
setSocialHousehold
(
socialSet
.
getId
());
social
.
setSocialHousehold
(
socialSet
.
get
Depart
Id
());
social
.
setCollectMoth
(
socialSet
.
getCollectMoth
());
social
.
setCollectType
(
socialSet
.
getCollectType
());
social
.
setHaveThisMonth
(
socialSet
.
getHaveThisMonth
());
...
...
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