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
4029aa2b
Commit
4029aa2b
authored
Jul 25, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
3d0ef50a
353a4e12
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
487 additions
and
386 deletions
+487
-386
DispatchEmpVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
+7
-0
EmployeeVO.java
...a/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
+1
-1
ProjectSetInfoVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
+2
-1
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+15
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+3
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+4
-2
ErrorMessage.java
...ifu/cloud/plus/v1/yifu/common/core/util/ErrorMessage.java
+1
-1
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+18
-0
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+16
-0
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+93
-18
pom.xml
yifu-social/yifu-social-api/pom.xml
+7
-1
TAuditInfo.java
...com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java
+22
-0
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+8
-0
DispatchDetailVo.java
...m/yifu/cloud/plus/v1/yifu/social/vo/DispatchDetailVo.java
+51
-0
TSocialFundHistoryVo.java
...fu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
+59
-318
SocialConstants.java
.../cloud/plus/v1/yifu/social/constants/SocialConstants.java
+1
-0
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+62
-1
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+3
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+54
-2
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+50
-19
TAuditInfoMapper.xml
...social-biz/src/main/resources/mapper/TAuditInfoMapper.xml
+6
-20
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+4
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
View file @
4029aa2b
...
@@ -175,6 +175,13 @@ public class DispatchEmpVo implements Serializable {
...
@@ -175,6 +175,13 @@ public class DispatchEmpVo implements Serializable {
@Schema
(
description
=
"合同年限"
,
name
=
"contractTerm"
)
@Schema
(
description
=
"合同年限"
,
name
=
"contractTerm"
)
private
String
contractTerm
;
private
String
contractTerm
;
/**
* 合同ID
*/
@ExcelAttribute
(
name
=
"合同ID"
)
@Schema
(
description
=
"合同ID"
)
private
String
contractId
;
/**
/**
* 业务细分
* 业务细分
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
View file @
4029aa2b
...
@@ -66,7 +66,7 @@ public class EmployeeVO extends RowIndex implements Serializable {
...
@@ -66,7 +66,7 @@ public class EmployeeVO extends RowIndex implements Serializable {
* 项目编码
* 项目编码
*/
*/
@ExcelProperty
(
value
=
"项目编码"
)
@ExcelProperty
(
value
=
"项目编码"
)
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
32
,
needExport
=
true
,
errorInfo
=
"
身份证号
必填且不可超过20位"
)
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
32
,
needExport
=
true
,
errorInfo
=
"
项目编码
必填且不可超过20位"
)
@Size
(
max
=
32
,
message
=
"项目编码不可超过32位"
)
@Size
(
max
=
32
,
message
=
"项目编码不可超过32位"
)
private
String
deptNo
;
private
String
deptNo
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
View file @
4029aa2b
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -57,7 +58,7 @@ public class ProjectSetInfoVo implements Serializable {
...
@@ -57,7 +58,7 @@ public class ProjectSetInfoVo implements Serializable {
* 商险结算类型:0预估 1 实缴
* 商险结算类型:0预估 1 实缴
*/
*/
@Schema
(
description
=
"商险结算类型"
)
@Schema
(
description
=
"商险结算类型"
)
private
String
insuranceSettleType
;
private
String
insuranceSettleType
=
CommonConstants
.
ONE_STRING
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
4029aa2b
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...
@@ -28,6 +28,7 @@ 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.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -279,4 +280,18 @@ public class TEmployeeContractInfoController {
...
@@ -279,4 +280,18 @@ public class TEmployeeContractInfoController {
tEmployeeContractInfoService
.
exportContractInfoHistory
(
contractInfo
,
response
);
tEmployeeContractInfoService
.
exportContractInfoHistory
(
contractInfo
,
response
);
}
}
/**
* @Author fxj
* @Description 通过id查询员工合同
* @Date 10:41 2022/7/25
* @Param
* @return
**/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询员工合同"
)
@Inner
@PostMapping
(
"/getContractById"
)
public
R
<
TEmployeeContractInfo
>
getContractById
(
@RequestBody
String
id
)
{
return
R
.
ok
(
tEmployeeContractInfoService
.
getById
(
id
));
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
4029aa2b
...
@@ -416,10 +416,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -416,10 +416,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
2
])
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
dingleDigitIntArray
[
2
])
{
//
作废、终止,不
变为在用
//
非作废、终止,本条
变为在用
if
(
Common
.
isEmpty
(
contractInfo
.
getSituation
())
if
(
Common
.
isEmpty
(
contractInfo
.
getSituation
())
||
(!
EmployeeConstants
.
SITUATION_SIX
.
equals
(
contractInfo
.
getSituation
())
||
(!
EmployeeConstants
.
SITUATION_SIX
.
equals
(
contractInfo
.
getSituation
())
&&
!
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
())))
{
&&
!
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
())))
{
// 其他变为不在用
baseMapper
.
updateInUseStatusById
(
contractInfo
.
getEmpId
(),
contractInfo
.
getSettleDomain
(),
contractInfo
.
getId
(),
CommonConstants
.
ONE_STRING
);
tEmployeeContractInfo
.
setAuditTimeLast
(
LocalDateTime
.
now
());
tEmployeeContractInfo
.
setAuditTimeLast
(
LocalDateTime
.
now
());
tEmployeeContractInfo
.
setInUse
(
CommonConstants
.
ZERO_STRING
);
tEmployeeContractInfo
.
setInUse
(
CommonConstants
.
ZERO_STRING
);
// 更新档案、项目合同状态为(1可用)
// 更新档案、项目合同状态为(1可用)
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
4029aa2b
...
@@ -149,6 +149,7 @@
...
@@ -149,6 +149,7 @@
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"contractTerm"
column=
"CONTRACT_TERM"
/>
<result
property=
"contractTerm"
column=
"CONTRACT_TERM"
/>
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"contractId"
column=
"CONTRACT_ID"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
<result
property=
"unitNo"
column=
"UNIT_NO"
/>
<result
property=
"unitNo"
column=
"UNIT_NO"
/>
...
@@ -669,7 +670,7 @@
...
@@ -669,7 +670,7 @@
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
b.CONTRACT_NAME,b.CONTRACT_TYPE,
b.CONTRACT_NAME,b.CONTRACT_TYPE,
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,
b.CONTRACT_ID
c.UNIT_NAME,
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
...
@@ -710,7 +711,8 @@
...
@@ -710,7 +711,8 @@
x.CONTRACT_START,
x.CONTRACT_START,
x.CONTRACT_END,
x.CONTRACT_END,
x.CONTRACT_TERM,
x.CONTRACT_TERM,
x.CONTRACT_SUB_NAME
x.CONTRACT_SUB_NAME,
x.ID as "CONTRACT_ID"
FROM
FROM
t_employee_contract_info x
t_employee_contract_info x
WHERE
WHERE
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ErrorMessage.java
View file @
4029aa2b
...
@@ -22,7 +22,7 @@ public class ErrorMessage implements Serializable {
...
@@ -22,7 +22,7 @@ public class ErrorMessage implements Serializable {
/**
/**
* @param 用于展示勾选的名称
* @param 用于展示勾选的名称
* @Author:
wangan
* @Author:
fxj
**/
**/
private
String
name
;
private
String
name
;
/**
/**
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
4029aa2b
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.alibaba.fastjson.TypeReference
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
...
@@ -143,4 +144,21 @@ public class ArchivesDaprUtil {
...
@@ -143,4 +144,21 @@ public class ArchivesDaprUtil {
}
}
return
res
;
return
res
;
}
}
/**
* @param id
* @Description: 获取档案合同
* @Author: fxj
* @Date: 2022/7/25 10:38
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
**/
public
R
<
TEmployeeContractInfo
>
getContractById
(
String
id
)
{
R
<
TEmployeeContractInfo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
()
,
"/temployeeinfo/inner/getContractById"
,
id
,
TEmployeeContractInfo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"获取档案信息失败!"
);
}
return
res
;
}
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
4029aa2b
...
@@ -144,18 +144,34 @@ public class InsurancesConstants {
...
@@ -144,18 +144,34 @@ public class InsurancesConstants {
* 商险购买地省名称不能为空
* 商险购买地省名称不能为空
*/
*/
public
static
final
String
INSURANCE_PROVINCE_NAME_NOT_EMPTY
=
"商险购买地省名称不能为空"
;
public
static
final
String
INSURANCE_PROVINCE_NAME_NOT_EMPTY
=
"商险购买地省名称不能为空"
;
/**
* 商险购买地省名称不存在
*/
public
static
final
String
INSURANCE_PROVINCE_NAME_NOT_EXIST
=
"商险购买地省名称不存在"
;
/**
/**
* 商险购买地市名称
* 商险购买地市名称
*/
*/
public
static
final
String
INSURANCE_CITY_NAME_NOT_EMPTY
=
"商险购买地市名称不能为空"
;
public
static
final
String
INSURANCE_CITY_NAME_NOT_EMPTY
=
"商险购买地市名称不能为空"
;
/**
* 商险购买地市名称不存在
*/
public
static
final
String
INSURANCE_CITY_NAME_NOT_EXIST
=
"商险购买地市名称不存在"
;
/**
/**
* 商险办理省名称不能为空
* 商险办理省名称不能为空
*/
*/
public
static
final
String
INSURANCE_HANDLE_PROVINCE_NAME_NOT_EMPTY
=
"商险办理省名称不能为空"
;
public
static
final
String
INSURANCE_HANDLE_PROVINCE_NAME_NOT_EMPTY
=
"商险办理省名称不能为空"
;
/**
* 商险办理省名称不存在
*/
public
static
final
String
INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST
=
"商险办理省名称不存在"
;
/**
/**
* 商险办理城市名称不能为空
* 商险办理城市名称不能为空
*/
*/
public
static
final
String
INSURANCE_HANDLE_CITY_NAME_NOT_EMPTY
=
"商险办理城市名称不能为空"
;
public
static
final
String
INSURANCE_HANDLE_CITY_NAME_NOT_EMPTY
=
"商险办理城市名称不能为空"
;
/**
* 商险办理城市名称不存在
*/
public
static
final
String
INSURANCE_HANDLE_CITY_NAME_NOT_EXIST
=
"商险办理城市名称不存在"
;
/**
/**
* 结算月不能为空
* 结算月不能为空
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
4029aa2b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
service
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
@@ -10,9 +9,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -10,9 +9,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.google.common.collect.Sets
;
import
com.google.common.collect.Sets
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
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.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
...
@@ -32,7 +33,6 @@ import org.springframework.stereotype.Service;
...
@@ -32,7 +33,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.validation.constraints.NotBlank
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.*
;
...
@@ -85,7 +85,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -85,7 +85,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//根据项目编码获取项目名称
//根据项目编码获取项目名称
List
<
String
>
collect
=
insuranceList
.
getRecords
().
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
insuranceList
.
getRecords
().
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
!
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
=
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
for
(
InsuranceListVO
record
:
insuranceList
.
getRecords
())
{
for
(
InsuranceListVO
record
:
insuranceList
.
getRecords
())
{
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
...
@@ -113,7 +113,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -113,7 +113,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//根据项目编码获取项目名称
//根据项目编码获取项目名称
List
<
String
>
collect
=
insuranceList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
insuranceList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
!
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
=
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
for
(
InsuranceListVO
record
:
insuranceList
)
{
for
(
InsuranceListVO
record
:
insuranceList
)
{
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
...
@@ -441,7 +441,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -441,7 +441,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//根据项目编码获取项目名称
//根据项目编码获取项目名称
List
<
String
>
collect
=
insuranceExportList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
insuranceExportList
.
stream
().
map
(
e
->
e
.
getDeptNo
()).
distinct
().
collect
(
Collectors
.
toList
());
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
!
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
=
=
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
for
(
InsuranceExportListVO
record
:
insuranceExportList
)
{
for
(
InsuranceExportListVO
record
:
insuranceExportList
)
{
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
...
@@ -673,14 +673,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -673,14 +673,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue
;
continue
;
}
}
// 身份证号位数校验(18 位合法)
// 身份证号位数校验(18 位合法)
if
(
ValidityUtil
.
validateIDCard
(
param
.
getEmpIdcardNo
())){
if
(
!
ValidityUtil
.
validateIDCard
(
param
.
getEmpIdcardNo
())){
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_IDCARD_NO_NOT_LEGITIMATE
);
param
.
setErrorMessage
(
InsurancesConstants
.
EMP_IDCARD_NO_NOT_LEGITIMATE
);
listResult
.
add
(
param
);
listResult
.
add
(
param
);
continue
;
continue
;
}
}
// todo 校验身份合法
//根据项目编码查询项目是否存在
//根据项目编码查询项目是否存在
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
Arrays
.
asList
(
param
.
getDeptNo
()));
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
Arrays
.
asList
(
param
.
getDeptNo
()));
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
!
=
CommonConstants
.
SUCCESS
)
{
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
=
=
CommonConstants
.
SUCCESS
)
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
if
(
MapUtils
.
isEmpty
(
data
)){
if
(
MapUtils
.
isEmpty
(
data
)){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_IS_NOT_EXIST
);
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_IS_NOT_EXIST
);
...
@@ -705,11 +707,40 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -705,11 +707,40 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
}
}
}
}
//todo 省市校验是否正确并设置对应code
//param.setInsuranceProvince();
//省市区域校验是否正确并设置对应id
//param.setInsuranceCity();
String
redisProvinceName
=
getRedisAreaValue
(
param
.
getInsuranceProvinceName
());
//param.setInsuranceHandleProvince();
if
(
Common
.
isEmpty
(
redisProvinceName
)){
//param.setInsuranceHandleCity();
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_PROVINCE_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceProvince
(
Integer
.
parseInt
(
redisProvinceName
));
}
String
redisCityName
=
getRedisAreaValue
(
param
.
getInsuranceCityName
()
+
"_"
+
param
.
getInsuranceProvinceName
());
if
(
Common
.
isEmpty
(
redisCityName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_CITY_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceCity
(
Integer
.
parseInt
(
redisCityName
));
}
String
redisHandleProvinceName
=
getRedisAreaValue
(
param
.
getInsuranceHandleProvinceName
());
if
(
Common
.
isEmpty
(
redisHandleProvinceName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceHandleProvince
(
Integer
.
parseInt
(
redisHandleProvinceName
));
}
String
redisHandleCityName
=
getRedisAreaValue
(
param
.
getInsuranceHandleCityName
()
+
"_"
+
param
.
getInsuranceHandleProvinceName
());
if
(
Common
.
isEmpty
(
redisHandleCityName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_HANDLE_CITY_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceHandleCity
(
Integer
.
parseInt
(
redisHandleCityName
));
}
// 保单开始日期 > 当前派单日期
// 保单开始日期 > 当前派单日期
if
(!
LocalDateUtil
.
isDate
(
param
.
getPolicyStart
(),
LocalDateUtil
.
NORM_DATE_PATTERN
)){
if
(!
LocalDateUtil
.
isDate
(
param
.
getPolicyStart
(),
LocalDateUtil
.
NORM_DATE_PATTERN
)){
...
@@ -892,9 +923,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -892,9 +923,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
listResult
.
add
(
param
);
continue
;
continue
;
}
}
//todo 检验身份合法
//根据项目编码查询项目是否存在
//根据项目编码查询项目是否存在
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
Arrays
.
asList
(
param
.
getDeptNo
()));
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
Arrays
.
asList
(
param
.
getDeptNo
()));
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
!
=
CommonConstants
.
SUCCESS
)
{
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
=
=
CommonConstants
.
SUCCESS
)
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
if
(
MapUtils
.
isEmpty
(
data
)){
if
(
MapUtils
.
isEmpty
(
data
)){
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_IS_NOT_EXIST
);
param
.
setErrorMessage
(
InsurancesConstants
.
DEPT_NO_IS_NOT_EXIST
);
...
@@ -919,11 +953,40 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -919,11 +953,40 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
}
}
}
}
//todo 省市校验是否正确并设置对应code
//param.setInsuranceProvince();
//省市区域校验是否正确并设置对应id
//param.setInsuranceCity();
String
redisProvinceName
=
getRedisAreaValue
(
param
.
getInsuranceProvinceName
());
//param.setInsuranceHandleProvince();
if
(
Common
.
isEmpty
(
redisProvinceName
)){
//param.setInsuranceHandleCity();
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_PROVINCE_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceProvince
(
Integer
.
parseInt
(
redisProvinceName
));
}
String
redisCityName
=
getRedisAreaValue
(
param
.
getInsuranceCityName
()
+
"_"
+
param
.
getInsuranceProvinceName
());
if
(
Common
.
isEmpty
(
redisCityName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_CITY_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceCity
(
Integer
.
parseInt
(
redisCityName
));
}
String
redisHandleProvinceName
=
getRedisAreaValue
(
param
.
getInsuranceHandleProvinceName
());
if
(
Common
.
isEmpty
(
redisHandleProvinceName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceHandleProvince
(
Integer
.
parseInt
(
redisHandleProvinceName
));
}
String
redisHandleCityName
=
getRedisAreaValue
(
param
.
getInsuranceHandleCityName
()
+
"_"
+
param
.
getInsuranceHandleProvinceName
());
if
(
Common
.
isEmpty
(
redisHandleCityName
)){
param
.
setErrorMessage
(
InsurancesConstants
.
INSURANCE_HANDLE_CITY_NAME_NOT_EXIST
);
listResult
.
add
(
param
);
continue
;
}
else
{
param
.
setInsuranceHandleCity
(
Integer
.
parseInt
(
redisHandleCityName
));
}
// 保险公司-险种-购买标准 是否存在
// 保险公司-险种-购买标准 是否存在
TInsuranceCompany
insuranceCompany
=
tInsuranceCompanyService
.
getOne
(
Wrappers
.<
TInsuranceCompany
>
query
().
lambda
()
TInsuranceCompany
insuranceCompany
=
tInsuranceCompanyService
.
getOne
(
Wrappers
.<
TInsuranceCompany
>
query
().
lambda
()
...
@@ -1095,6 +1158,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1095,6 +1158,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
listResult
.
add
(
param
);
continue
;
continue
;
}
}
// todo校验身份合法
if
(!
LocalDateUtil
.
isDate
(
param
.
getPolicyStart
(),
LocalDateUtil
.
NORM_DATE_PATTERN
)){
if
(!
LocalDateUtil
.
isDate
(
param
.
getPolicyStart
(),
LocalDateUtil
.
NORM_DATE_PATTERN
)){
param
.
setErrorMessage
(
InsurancesConstants
.
POLICY_START_PARSE_ERROR
);
param
.
setErrorMessage
(
InsurancesConstants
.
POLICY_START_PARSE_ERROR
);
listResult
.
add
(
param
);
listResult
.
add
(
param
);
...
@@ -1249,6 +1313,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1249,6 +1313,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
map
;
return
map
;
}
}
/**
* 根据区域名称获取区域id
*
* @author licancan
* @param areaString
* @return {@link String}
*/
private
String
getRedisAreaValue
(
String
areaString
)
{
return
String
.
valueOf
(
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
AREA_VALUE
+
areaString
));
}
/***********************减员办理********************************/
/***********************减员办理********************************/
/**
/**
* 减员导入校验
* 减员导入校验
...
...
yifu-social/yifu-social-api/pom.xml
View file @
4029aa2b
...
@@ -35,5 +35,11 @@
...
@@ -35,5 +35,11 @@
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<artifactId>
fastjson
</artifactId>
</dependency>
</dependency>
</dependencies>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-archives-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</project>
</project>
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java
View file @
4029aa2b
...
@@ -134,4 +134,26 @@ public class TAuditInfo implements Serializable {
...
@@ -134,4 +134,26 @@ public class TAuditInfo implements Serializable {
@ExcelProperty
(
"type类型"
)
@ExcelProperty
(
"type类型"
)
private
String
type
;
private
String
type
;
/**
* 部门---员工所在部门
*/
@ExcelAttribute
(
name
=
"部门"
)
@Schema
(
description
=
"部门---员工所在部门"
)
private
String
organName
;
/**
* 操作内容
*/
@ExcelAttribute
(
name
=
"操作内容"
)
@Schema
(
description
=
"操作内容"
)
private
String
title
;
/**
* 颜色: red green yellow grey
*/
@ExcelAttribute
(
name
=
"颜色"
)
@Schema
(
description
=
"颜色: red green yellow grey"
)
private
String
color
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
4029aa2b
...
@@ -265,6 +265,14 @@ public class TDispatchInfo extends BaseEntity {
...
@@ -265,6 +265,14 @@ public class TDispatchInfo extends BaseEntity {
@Schema
(
description
=
"合同年限"
)
@Schema
(
description
=
"合同年限"
)
@ExcelProperty
(
"合同年限"
)
@ExcelProperty
(
"合同年限"
)
private
String
contractTerm
;
private
String
contractTerm
;
/**
* 合同ID ---- 派增持有
*/
@ExcelAttribute
(
name
=
"合同ID"
)
@Schema
(
description
=
"合同ID---- 派增持有"
)
@ExcelProperty
(
"合同ID"
)
private
String
contractId
;
/**
/**
* 户口性质
* 户口性质
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/DispatchDetailVo.java
0 → 100644
View file @
4029aa2b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TProvidentFund
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @Author fxj
* @Date 2022/7/25
* @Description
* @Version 1.0
*/
@Data
public
class
DispatchDetailVo
implements
Serializable
{
/**
* 员工信息
**/
private
TEmployeeInfo
employee
;
/**
* 员工信息
**/
private
TEmployeeProject
project
;
/**
* 合同
**/
private
TEmployeeContractInfo
contract
;
/**
* 派单
**/
private
TDispatchInfo
dispatch
;
/**
* 社保
**/
private
TSocialInfo
social
;
/**
* 公积金
**/
private
TProvidentFund
fund
;
/**
* 流程进展明细
**/
private
List
<
TAuditInfo
>
audits
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
View file @
4029aa2b
...
@@ -17,8 +17,6 @@
...
@@ -17,8 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -29,7 +27,7 @@ import java.io.Serializable;
...
@@ -29,7 +27,7 @@ import java.io.Serializable;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
/**
/**
* 社保公积金调基
历史记录
表
* 社保公积金调基
导出
表
*
*
* @author fxj
* @author fxj
* @date 2022-07-15 11:38:05
* @date 2022-07-15 11:38:05
...
@@ -37,332 +35,75 @@ import java.math.BigDecimal;
...
@@ -37,332 +35,75 @@ import java.math.BigDecimal;
@Data
@Data
public
class
TSocialFundHistoryVo
extends
RowIndex
implements
Serializable
{
public
class
TSocialFundHistoryVo
extends
RowIndex
implements
Serializable
{
/**
@ExcelProperty
(
value
=
"项目编码"
)
* id
private
String
deptNo
;
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Length
(
max
=
20
,
message
=
"员工姓名 不能超过20 个字符"
)
@Schema
(
description
=
"id"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
isNotEmpty
=
true
,
maxLength
=
20
,
needExport
=
true
,
errorInfo
=
"员工姓名必填且不可超过20位"
)
@ExcelProperty
(
"id"
)
@Schema
(
description
=
"员工姓名"
)
private
String
id
;
@ExcelProperty
(
"员工姓名"
)
/**
* name
*/
@Length
(
max
=
20
,
message
=
"name 不能超过20 个字符"
)
@ExcelAttribute
(
name
=
"name"
,
maxLength
=
20
)
@Schema
(
description
=
"name"
)
@ExcelProperty
(
"name"
)
private
String
name
;
private
String
name
;
/**
* idCard
@Length
(
max
=
20
,
message
=
"身份证号 不能超过20 个字符"
)
*/
@ExcelAttribute
(
name
=
"身份证号"
,
isNotEmpty
=
true
,
maxLength
=
20
,
needExport
=
true
,
errorInfo
=
"身份证号必填且不可超过20位"
)
@Length
(
max
=
20
,
message
=
"idCard 不能超过20 个字符"
)
@Schema
(
description
=
"身份证号"
)
@ExcelAttribute
(
name
=
"idCard"
,
maxLength
=
20
)
@ExcelProperty
(
"身份证号"
)
@Schema
(
description
=
"idCard"
)
@ExcelProperty
(
"idCard"
)
private
String
idCard
;
private
String
idCard
;
/**
* employeeId
@ExcelAttribute
(
name
=
"缴纳类型"
,
isNotEmpty
=
true
,
errorInfo
=
"缴纳类型必填"
,
readConverterExp
=
"0=最低缴纳,1=自定义缴纳,2=最高缴纳"
)
*/
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)"
)
@Length
(
max
=
32
,
message
=
"employeeId 不能超过32 个字符"
)
@ExcelProperty
(
"缴纳类型"
)
@ExcelAttribute
(
name
=
"employeeId"
,
maxLength
=
32
)
private
String
paymentType
;
@Schema
(
description
=
"employeeId"
)
@ExcelProperty
(
"employeeId"
)
@ExcelAttribute
(
name
=
"养老基数"
)
private
String
employeeId
;
@Schema
(
description
=
"养老基数"
)
/**
@ExcelProperty
(
"养老基数"
)
* 单位养老基数
*/
@ExcelAttribute
(
name
=
"单位养老基数"
)
@Schema
(
description
=
"单位养老基数"
)
@ExcelProperty
(
"单位养老基数"
)
private
BigDecimal
unitPensionBase
;
private
BigDecimal
unitPensionBase
;
/**
@ExcelAttribute
(
name
=
"医疗基数"
)
* 单位医疗基数
@Schema
(
description
=
"医疗基数"
)
*/
@ExcelProperty
(
"医疗基数"
)
@ExcelAttribute
(
name
=
"单位医疗基数"
)
@Schema
(
description
=
"单位医疗基数"
)
@ExcelProperty
(
"单位医疗基数"
)
private
BigDecimal
unitMedicalBase
;
private
BigDecimal
unitMedicalBase
;
/**
@ExcelAttribute
(
name
=
"失业基数"
)
* 单位失业基数
@Schema
(
description
=
"失业基数"
)
*/
@ExcelProperty
(
"失业基数"
)
@ExcelAttribute
(
name
=
"单位失业基数"
)
@Schema
(
description
=
"单位失业基数"
)
@ExcelProperty
(
"单位失业基数"
)
private
BigDecimal
unitUnemploymentBase
;
private
BigDecimal
unitUnemploymentBase
;
/**
@ExcelAttribute
(
name
=
"工伤基数"
)
* 单位工伤基数
@Schema
(
description
=
"工伤基数"
)
*/
@ExcelProperty
(
"工伤基数"
)
@ExcelAttribute
(
name
=
"单位工伤基数"
)
@Schema
(
description
=
"单位工伤基数"
)
@ExcelProperty
(
"单位工伤基数"
)
private
BigDecimal
unitInjuryBase
;
private
BigDecimal
unitInjuryBase
;
/**
@ExcelAttribute
(
name
=
"生育基数"
)
* 单位生育基数
@Schema
(
description
=
"生育基数"
)
*/
@ExcelProperty
(
"生育基数"
)
@ExcelAttribute
(
name
=
"单位生育基数"
)
@Schema
(
description
=
"单位生育基数"
)
@ExcelProperty
(
"单位生育基数"
)
private
BigDecimal
unitBirthBase
;
private
BigDecimal
unitBirthBase
;
/**
* 单位大病基数
@ExcelAttribute
(
name
=
"单位大病救助金额"
)
*/
@Schema
(
description
=
"单位大病救助金额"
)
@ExcelAttribute
(
name
=
"单位大病基数"
)
@ExcelProperty
(
"单位大病救助金额"
)
@Schema
(
description
=
"单位大病基数"
)
@ExcelProperty
(
"单位大病基数"
)
private
BigDecimal
unitBigailmentBase
;
/**
* 个人养老基数
*/
@ExcelAttribute
(
name
=
"个人养老基数"
)
@Schema
(
description
=
"个人养老基数"
)
@ExcelProperty
(
"个人养老基数"
)
private
BigDecimal
personalPensionBase
;
/**
* 个人医疗基数
*/
@ExcelAttribute
(
name
=
"个人医疗基数"
)
@Schema
(
description
=
"个人医疗基数"
)
@ExcelProperty
(
"个人医疗基数"
)
private
BigDecimal
personalMedicalBase
;
/**
* 个人失业基数
*/
@ExcelAttribute
(
name
=
"个人失业基数"
)
@Schema
(
description
=
"个人失业基数"
)
@ExcelProperty
(
"个人失业基数"
)
private
BigDecimal
personalUnemploymentBase
;
/**
* 个人大病基数
*/
@ExcelAttribute
(
name
=
"个人大病基数"
)
@Schema
(
description
=
"个人大病基数"
)
@ExcelProperty
(
"个人大病基数"
)
private
BigDecimal
personalBigailmentBase
;
/**
* 单位养老比例
*/
@ExcelAttribute
(
name
=
"单位养老比例"
)
@Schema
(
description
=
"单位养老比例"
)
@ExcelProperty
(
"单位养老比例"
)
private
BigDecimal
unitPersionPro
;
/**
* unitPersionMoney
*/
@ExcelAttribute
(
name
=
"unitPersionMoney"
)
@Schema
(
description
=
"unitPersionMoney"
)
@ExcelProperty
(
"unitPersionMoney"
)
private
BigDecimal
unitPersionMoney
;
/**
* 单位医疗比例
*/
@ExcelAttribute
(
name
=
"单位医疗比例"
)
@Schema
(
description
=
"单位医疗比例"
)
@ExcelProperty
(
"单位医疗比例"
)
private
BigDecimal
unitMedicalPro
;
/**
* unitMedicalMoney
*/
@ExcelAttribute
(
name
=
"unitMedicalMoney"
)
@Schema
(
description
=
"unitMedicalMoney"
)
@ExcelProperty
(
"unitMedicalMoney"
)
private
BigDecimal
unitMedicalMoney
;
/**
* 单位失业比例
*/
@ExcelAttribute
(
name
=
"单位失业比例"
)
@Schema
(
description
=
"单位失业比例"
)
@ExcelProperty
(
"单位失业比例"
)
private
BigDecimal
unitUnemploymentPro
;
/**
* unitUnemploymentMoney
*/
@ExcelAttribute
(
name
=
"unitUnemploymentMoney"
)
@Schema
(
description
=
"unitUnemploymentMoney"
)
@ExcelProperty
(
"unitUnemploymentMoney"
)
private
BigDecimal
unitUnemploymentMoney
;
/**
* 单位工伤比例
*/
@ExcelAttribute
(
name
=
"单位工伤比例"
)
@Schema
(
description
=
"单位工伤比例"
)
@ExcelProperty
(
"单位工伤比例"
)
private
BigDecimal
unitInjuryPro
;
/**
* unitInjuryMoney
*/
@ExcelAttribute
(
name
=
"unitInjuryMoney"
)
@Schema
(
description
=
"unitInjuryMoney"
)
@ExcelProperty
(
"unitInjuryMoney"
)
private
BigDecimal
unitInjuryMoney
;
/**
* 单位生育比例
*/
@ExcelAttribute
(
name
=
"单位生育比例"
)
@Schema
(
description
=
"单位生育比例"
)
@ExcelProperty
(
"单位生育比例"
)
private
BigDecimal
unitBirthPro
;
/**
* unitBirthMoney
*/
@ExcelAttribute
(
name
=
"unitBirthMoney"
)
@Schema
(
description
=
"unitBirthMoney"
)
@ExcelProperty
(
"unitBirthMoney"
)
private
BigDecimal
unitBirthMoney
;
/**
* 单位大病比例
*/
@ExcelAttribute
(
name
=
"单位大病比例"
)
@Schema
(
description
=
"单位大病比例"
)
@ExcelProperty
(
"单位大病比例"
)
private
BigDecimal
unitBigailmentPro
;
/**
* unitBigailmentMoney
*/
@ExcelAttribute
(
name
=
"unitBigailmentMoney"
)
@Schema
(
description
=
"unitBigailmentMoney"
)
@ExcelProperty
(
"unitBigailmentMoney"
)
private
BigDecimal
unitBigailmentMoney
;
private
BigDecimal
unitBigailmentMoney
;
/**
* 个人养老比例
@ExcelAttribute
(
name
=
"个人大病救助金额"
)
*/
@Schema
(
description
=
"个人大病救助金额"
)
@ExcelAttribute
(
name
=
"个人养老比例"
)
@ExcelProperty
(
"个人大病救助金额"
)
@Schema
(
description
=
"个人养老比例"
)
@ExcelProperty
(
"个人养老比例"
)
private
BigDecimal
personalPersionPro
;
/**
* personalPersionMoney
*/
@ExcelAttribute
(
name
=
"personalPersionMoney"
)
@Schema
(
description
=
"personalPersionMoney"
)
@ExcelProperty
(
"personalPersionMoney"
)
private
BigDecimal
personalPersionMoney
;
/**
* 个人医疗比例
*/
@ExcelAttribute
(
name
=
"个人医疗比例"
)
@Schema
(
description
=
"个人医疗比例"
)
@ExcelProperty
(
"个人医疗比例"
)
private
BigDecimal
personalMedicalPro
;
/**
* personalMedicalMoney
*/
@ExcelAttribute
(
name
=
"personalMedicalMoney"
)
@Schema
(
description
=
"personalMedicalMoney"
)
@ExcelProperty
(
"personalMedicalMoney"
)
private
BigDecimal
personalMedicalMoney
;
/**
* 个人失业比例
*/
@ExcelAttribute
(
name
=
"个人失业比例"
)
@Schema
(
description
=
"个人失业比例"
)
@ExcelProperty
(
"个人失业比例"
)
private
BigDecimal
personalUnemploymentPro
;
/**
* personalUnemploymentMoney
*/
@ExcelAttribute
(
name
=
"personalUnemploymentMoney"
)
@Schema
(
description
=
"personalUnemploymentMoney"
)
@ExcelProperty
(
"personalUnemploymentMoney"
)
private
BigDecimal
personalUnemploymentMoney
;
/**
* 个人大病比例
*/
@ExcelAttribute
(
name
=
"个人大病比例"
)
@Schema
(
description
=
"个人大病比例"
)
@ExcelProperty
(
"个人大病比例"
)
private
BigDecimal
personalBigailmentPro
;
/**
* personalBigailmentMoney
*/
@ExcelAttribute
(
name
=
"personalBigailmentMoney"
)
@Schema
(
description
=
"personalBigailmentMoney"
)
@ExcelProperty
(
"personalBigailmentMoney"
)
private
BigDecimal
personalBigailmentMoney
;
private
BigDecimal
personalBigailmentMoney
;
/**
* 单位公积金基数
@ExcelAttribute
(
name
=
"单位公积金基数"
)
*/
@Schema
(
description
=
"单位公积金基数"
)
@ExcelAttribute
(
name
=
"单位公积金基数"
)
@ExcelProperty
(
"单位公积金基数"
)
@Schema
(
description
=
"单位公积金基数"
)
@ExcelProperty
(
"单位公积金基数"
)
private
BigDecimal
unitFundBase
;
private
BigDecimal
unitFundBase
;
/**
* 个人公积金基数
@ExcelAttribute
(
name
=
"单位公积金比例"
)
*/
@Schema
(
description
=
"单位公积金比例"
)
@ExcelAttribute
(
name
=
"个人公积金基数"
)
@ExcelProperty
(
"单位公积金比例"
)
@Schema
(
description
=
"个人公积金基数"
)
@ExcelProperty
(
"个人公积金基数"
)
private
BigDecimal
personalFundBase
;
/**
* 单位公积金比例
*/
@ExcelAttribute
(
name
=
"单位公积金比例"
)
@Schema
(
description
=
"单位公积金比例"
)
@ExcelProperty
(
"单位公积金比例"
)
private
BigDecimal
unitFundProp
;
private
BigDecimal
unitFundProp
;
/**
* 个人公积金比例
@ExcelAttribute
(
name
=
"个人公积金基数"
)
*/
@Schema
(
description
=
"个人公积金基数"
)
@ExcelAttribute
(
name
=
"个人公积金比例"
)
@ExcelProperty
(
"个人公积金基数"
)
@Schema
(
description
=
"个人公积金比例"
)
private
BigDecimal
personalFundBase
;
@ExcelProperty
(
"个人公积金比例"
)
@ExcelAttribute
(
name
=
"个人公积金比例"
)
@Schema
(
description
=
"个人公积金比例"
)
@ExcelProperty
(
"个人公积金比例"
)
private
BigDecimal
personalFundProp
;
private
BigDecimal
personalFundProp
;
/**
* unitFundMoney
*/
@ExcelAttribute
(
name
=
"unitFundMoney"
)
@Schema
(
description
=
"unitFundMoney"
)
@ExcelProperty
(
"unitFundMoney"
)
private
BigDecimal
unitFundMoney
;
/**
* personalFundMoney
*/
@ExcelAttribute
(
name
=
"personalFundMoney"
)
@Schema
(
description
=
"personalFundMoney"
)
@ExcelProperty
(
"personalFundMoney"
)
private
BigDecimal
personalFundMoney
;
/**
* 0老的调基,数据不对,将不使用;1新逻辑调基
*/
@ExcelAttribute
(
name
=
"0老的调基,数据不对,将不使用;1新逻辑调基"
)
@Schema
(
description
=
"0老的调基,数据不对,将不使用;1新逻辑调基"
)
@ExcelProperty
(
"0老的调基,数据不对,将不使用;1新逻辑调基"
)
private
Integer
isOld
;
/**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
*/
@ExcelAttribute
(
name
=
"缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)"
)
@Schema
(
description
=
"缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)"
)
@ExcelProperty
(
"缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)"
)
private
Integer
paymentType
;
/**
* 是否是社保:0否1是
*/
@ExcelAttribute
(
name
=
"是否是社保:0否1是"
)
@Schema
(
description
=
"是否是社保:0否1是"
)
@ExcelProperty
(
"是否是社保:0否1是"
)
private
Integer
isSocial
;
/**
* 是否是公积金:0否1是
*/
@ExcelAttribute
(
name
=
"是否是公积金:0否1是"
)
@Schema
(
description
=
"是否是公积金:0否1是"
)
@ExcelProperty
(
"是否是公积金:0否1是"
)
private
Integer
isFund
;
/**
* 社保id
*/
@Length
(
max
=
32
,
message
=
"社保id 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"社保id"
,
maxLength
=
32
)
@Schema
(
description
=
"社保id"
)
@ExcelProperty
(
"社保id"
)
private
String
socialId
;
/**
* 公积金id
*/
@Length
(
max
=
32
,
message
=
"公积金id 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"公积金id"
,
maxLength
=
32
)
@Schema
(
description
=
"公积金id"
)
@ExcelProperty
(
"公积金id"
)
private
String
fundId
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @
4029aa2b
...
@@ -8,4 +8,5 @@ package com.yifu.cloud.plus.v1.yifu.social.constants;
...
@@ -8,4 +8,5 @@ package com.yifu.cloud.plus.v1.yifu.social.constants;
public
class
SocialConstants
{
public
class
SocialConstants
{
// 社保补缴配置有误!
// 社保补缴配置有误!
public
static
final
String
SOCIAL_SET_ERROR
=
"社保补缴配置有误!"
;
public
static
final
String
SOCIAL_SET_ERROR
=
"社保补缴配置有误!"
;
public
static
final
String
EMP_NAME_ERROR
=
"员工姓名错误!"
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
4029aa2b
...
@@ -19,11 +19,16 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
...
@@ -19,11 +19,16 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
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.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
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.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.security.SecurityRequirement
;
import
io.swagger.v3.oas.annotations.security.SecurityRequirement
;
...
@@ -65,6 +70,7 @@ public class TDispatchInfoController {
...
@@ -65,6 +70,7 @@ public class TDispatchInfoController {
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchInfoPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchInfoPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
}
/**
/**
* 不分页查询
* 不分页查询
* @param tDispatchInfo 派单信息记录表
* @param tDispatchInfo 派单信息记录表
...
@@ -76,7 +82,48 @@ public class TDispatchInfoController {
...
@@ -76,7 +82,48 @@ public class TDispatchInfoController {
public
R
<
List
<
TDispatchInfo
>>
getTDispatchInfoNoPage
(
@RequestBody
TDispatchInfoSearchVo
tDispatchInfo
)
{
public
R
<
List
<
TDispatchInfo
>>
getTDispatchInfoNoPage
(
@RequestBody
TDispatchInfoSearchVo
tDispatchInfo
)
{
return
R
.
ok
(
tDispatchInfoService
.
noPageDiy
(
tDispatchInfo
));
return
R
.
ok
(
tDispatchInfoService
.
noPageDiy
(
tDispatchInfo
));
}
}
/**
* 简单分页查询--申请
* @param page 分页对象
* @param tDispatchInfo 派单信息记录表--申请
* @return
*/
@Operation
(
description
=
"简单分页查询--申请"
)
@GetMapping
(
"/pageApply"
)
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchApplyPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
user
)){
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
tDispatchInfo
.
setCreateBy
(
user
.
getId
());
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
/**
* 简单分页查询--审核
* @param page 分页对象
* @param tDispatchInfo 派单信息记录表--审核
* @return
*/
@Operation
(
description
=
"简单分页查询--审核"
)
@GetMapping
(
"/pageAudit"
)
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchAuditPage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setStatus
(
CommonConstants
.
ZERO_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
/**
* 简单分页查询--审核
* @param page 分页对象
* @param tDispatchInfo 派单信息记录表--审核
* @return
*/
@Operation
(
description
=
"简单分页查询--审核"
)
@GetMapping
(
"/pageHandle"
)
public
R
<
IPage
<
TDispatchInfo
>>
getTDispatchHandlePage
(
Page
<
TDispatchInfo
>
page
,
TDispatchInfoSearchVo
tDispatchInfo
)
{
tDispatchInfo
.
setStatus
(
CommonConstants
.
ONE_STRING
);
return
new
R
<>(
tDispatchInfoService
.
getTDispatchInfoPage
(
page
,
tDispatchInfo
));
}
/**
/**
* 通过id查询派单信息记录表
* 通过id查询派单信息记录表
* @param id id
* @param id id
...
@@ -89,7 +136,21 @@ public class TDispatchInfoController {
...
@@ -89,7 +136,21 @@ public class TDispatchInfoController {
return
R
.
ok
(
tDispatchInfoService
.
getById
(
id
));
return
R
.
ok
(
tDispatchInfoService
.
getById
(
id
));
}
}
/**
/**
* 通过id查询派单相关系信息
* @author fxj
* @param id id
* @return R
* @date 2022-07-25 10:19
*/
@Operation
(
summary
=
"通过id查询派单相关系信息"
,
description
=
"通过id查询派单相关系信息"
)
@GetMapping
(
"/getSocialAndFundInfoById"
)
public
R
<
DispatchDetailVo
>
getSocialAndFundInfoById
(
@RequestParam
(
value
=
"id"
)
String
id
)
{
return
R
.
ok
(
tDispatchInfoService
.
getSocialAndFundInfoById
(
id
));
}
/**
* 新增派单信息记录表
* 新增派单信息记录表
* @param tDispatchInfo 派单信息记录表
* @param tDispatchInfo 派单信息记录表
* @return R
* @return R
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
4029aa2b
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -50,4 +51,6 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
...
@@ -50,4 +51,6 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
);
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
);
R
<
Boolean
>
removeByIdDiy
(
String
id
);
R
<
Boolean
>
removeByIdDiy
(
String
id
);
DispatchDetailVo
getSocialAndFundInfoById
(
String
id
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4029aa2b
...
@@ -30,6 +30,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -30,6 +30,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
...
@@ -41,6 +44,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
...
@@ -41,6 +44,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.*
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchImportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchImportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchReduceVo
;
...
@@ -79,6 +83,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -79,6 +83,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
final
TProvidentFundMapper
fundMapper
;
private
final
TProvidentFundMapper
fundMapper
;
/**
/**
* 派单信息记录表简单分页查询
* 派单信息记录表简单分页查询
*
*
...
@@ -394,7 +399,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -394,7 +399,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Map
<
String
,
EmpProjectDispatchVo
>
projectsMap
=
null
;
Map
<
String
,
EmpProjectDispatchVo
>
projectsMap
=
null
;
TDispatchImportVo
excel
;
TDispatchImportVo
excel
;
DispatchEmpVo
empVo
;
DispatchEmpVo
empVo
;
EmpContractDispatchVo
contract
;
EmpContractDispatchVo
contract
=
null
;
EmpProjectDispatchVo
project
=
null
;
EmpProjectDispatchVo
project
=
null
;
EmpAddDispatchVo
emp
=
null
;
EmpAddDispatchVo
emp
=
null
;
TSocialInfo
social
=
null
;
TSocialInfo
social
=
null
;
...
@@ -458,6 +463,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -458,6 +463,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
fund
)){
if
(
Common
.
isNotNull
(
fund
)){
dispatch
.
setFundId
(
fund
.
getId
());
dispatch
.
setFundId
(
fund
.
getId
());
}
}
if
(
Common
.
isNotNull
(
contract
)){
dispatch
.
setContractId
(
contract
.
getId
());
}
}
}
insertDispatch
(
emp
,
dispatch
);
insertDispatch
(
emp
,
dispatch
);
}
}
...
@@ -789,6 +797,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -789,6 +797,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setFileProvince
(
empVo
.
getFileProvince
());
dispatch
.
setFileProvince
(
empVo
.
getFileProvince
());
dispatch
.
setFileCity
(
empVo
.
getFileCity
());
dispatch
.
setFileCity
(
empVo
.
getFileCity
());
dispatch
.
setFileTown
(
empVo
.
getFileTown
());
dispatch
.
setFileTown
(
empVo
.
getFileTown
());
dispatch
.
setContractId
(
empVo
.
getContractId
());
}
}
dispatchMap
.
put
(
excel
.
getEmpIdcard
(),
dispatch
);
dispatchMap
.
put
(
excel
.
getEmpIdcard
(),
dispatch
);
...
@@ -1593,7 +1602,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1593,7 +1602,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override
@Override
public
R
<
Boolean
>
removeByIdDiy
(
String
id
)
{
public
R
<
Boolean
>
removeByIdDiy
(
String
id
)
{
if
(
Common
.
isEmpty
(
id
)){
if
(
Common
.
isEmpty
(
id
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_EMPTY
)
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_EMPTY
)
;
}
}
TDispatchInfo
dispatch
=
baseMapper
.
selectById
(
id
);
TDispatchInfo
dispatch
=
baseMapper
.
selectById
(
id
);
if
(
Common
.
isEmpty
(
dispatch
)){
if
(
Common
.
isEmpty
(
dispatch
)){
...
@@ -1606,4 +1615,47 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1606,4 +1615,47 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
R
.
failed
(
false
,
CommonConstants
.
SAVE_FAILED
);
return
R
.
failed
(
false
,
CommonConstants
.
SAVE_FAILED
);
}
}
}
}
/**
* 通过id查询派单相关系信息
* @author fxj
* @param id id
* @return R
* @date 2022-07-25 10:19
*/
@Override
public
DispatchDetailVo
getSocialAndFundInfoById
(
String
id
)
{
DispatchDetailVo
detailVo
=
new
DispatchDetailVo
();
TDispatchInfo
dispatch
=
baseMapper
.
selectById
(
id
);
detailVo
.
setDispatch
(
dispatch
);
if
(
Common
.
isNotNull
(
dispatch
)){
if
(
Common
.
isNotNull
(
dispatch
.
getSocialId
())){
detailVo
.
setSocial
(
socialMapper
.
selectById
(
dispatch
.
getSocialId
()));
}
if
(
Common
.
isNotNull
(
dispatch
.
getFundId
())){
detailVo
.
setFund
(
fundMapper
.
selectById
(
dispatch
.
getFundId
()));
}
if
(
Common
.
isNotNull
(
dispatch
.
getContractId
())){
R
<
TEmployeeContractInfo
>
res
=
archivesDaprUtil
.
getContractById
(
dispatch
.
getContractId
());
if
(
Common
.
isNotNull
(
res
)){
detailVo
.
setContract
(
res
.
getData
());
}
}
if
(
Common
.
isNotNull
(
dispatch
.
getSettleDomain
())
&&
Common
.
isNotNull
(
dispatch
.
getEmpId
())){
TEmployeeProject
temp
=
new
TEmployeeProject
();
temp
.
setDeptId
(
dispatch
.
getSettleDomain
());
temp
.
setEmpId
(
dispatch
.
getEmpId
());
R
<
TEmployeeProject
>
res
=
archivesDaprUtil
.
getTEmployeeProjectById
(
temp
);
if
(
Common
.
isNotNull
(
res
)){
detailVo
.
setProject
(
res
.
getData
());
}
}
if
(
Common
.
isNotNull
(
dispatch
.
getEmpId
())){
R
<
TEmployeeInfo
>
res
=
archivesDaprUtil
.
getTEmployeeInfoById
(
dispatch
.
getEmpId
());
if
(
Common
.
isNotNull
(
res
)){
detailVo
.
setEmployee
(
res
.
getData
());
}
}
}
return
detailVo
;
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
4029aa2b
...
@@ -36,15 +36,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -36,15 +36,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialLog
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundHistoryVo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoVo
;
...
@@ -58,7 +54,9 @@ import java.io.IOException;
...
@@ -58,7 +54,9 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 社保公积金查询表
* 社保公积金查询表
...
@@ -75,6 +73,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
...
@@ -75,6 +73,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
private
final
TDispatchInfoService
tDispatchInfoService
;
private
final
TDispatchInfoService
tDispatchInfoService
;
private
final
TSocialLogService
tSocialLogService
;
private
final
TSocialLogService
tSocialLogService
;
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TForecastLibraryService
tForecastLibraryService
;
/**
/**
* 社保公积金查询表简单分页查询
* 社保公积金查询表简单分页查询
...
@@ -191,12 +190,12 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
...
@@ -191,12 +190,12 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
@Override
@Override
public
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
)
{
public
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
)
{
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
List
<
ErrorMessage
>
errorMessageList
=
new
ArrayList
<>();
ExcelUtil
<
TSocialFund
InfoVo
>
util1
=
new
ExcelUtil
<>(
TSocialFundInfo
Vo
.
class
);
ExcelUtil
<
TSocialFund
HistoryVo
>
util1
=
new
ExcelUtil
<>(
TSocialFundHistory
Vo
.
class
);
// 写法2:
// 写法2:
// 匿名内部类 不用额外写一个DemoDataListener
// 匿名内部类 不用额外写一个DemoDataListener
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
try
{
try
{
EasyExcel
.
read
(
inputStream
,
TSocialFundInfoVo
.
class
,
new
ReadListener
<
TSocialFund
Info
Vo
>()
{
EasyExcel
.
read
(
inputStream
,
TSocialFundInfoVo
.
class
,
new
ReadListener
<
TSocialFund
History
Vo
>()
{
/**
/**
* 单次缓存的数据量
* 单次缓存的数据量
*/
*/
...
@@ -204,10 +203,10 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
...
@@ -204,10 +203,10 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
/**
/**
*临时存储
*临时存储
*/
*/
private
List
<
TSocialFund
Info
Vo
>
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
BATCH_COUNT
);
private
List
<
TSocialFund
History
Vo
>
cachedDataList
=
ListUtils
.
newArrayListWithExpectedSize
(
BATCH_COUNT
);
@Override
@Override
public
void
invoke
(
TSocialFund
Info
Vo
data
,
AnalysisContext
context
)
{
public
void
invoke
(
TSocialFund
History
Vo
data
,
AnalysisContext
context
)
{
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
...
@@ -245,24 +244,56 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
...
@@ -245,24 +244,56 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
return
R
.
ok
(
errorMessageList
);
return
R
.
ok
(
errorMessageList
);
}
}
private
void
importTSocialFundInfo
(
List
<
TSocialFund
Info
Vo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
)
{
private
void
importTSocialFundInfo
(
List
<
TSocialFund
History
Vo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
)
{
// 个性化校验逻辑
// 个性化校验逻辑
ErrorMessage
errorMsg
;
ErrorMessage
errorMsg
;
// 执行数据插入操作 组装
// 执行数据插入操作 组装
TSocialFundHistoryVo
excel
;
List
<
String
>
idCardList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
idCardList
.
add
(
excelVOList
.
get
(
i
).
getIdCard
());
}
List
<
TSocialFundInfo
>
socialFundInfoList
=
this
.
list
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
idCardList
));
Map
<
String
,
TSocialFundInfo
>
socialFundInfoMap
=
new
HashMap
<>();
if
(
socialFundInfoList
!=
null
&&
!
socialFundInfoList
.
isEmpty
())
{
for
(
TSocialFundInfo
socialFundInfo
:
socialFundInfoList
)
{
socialFundInfoMap
.
put
(
socialFundInfo
.
getEmpIdcard
(),
socialFundInfo
);
}
socialFundInfoList
.
clear
();
}
TSocialFundInfo
oldSocialFundInfo
;
TSocialFundInfo
socialFundInfo
;
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
TSocialFundInfoVo
excel
=
excelVOList
.
get
(
i
);
excel
=
excelVOList
.
get
(
i
);
// 数据合法情况 TODO
socialFundInfo
=
socialFundInfoMap
.
get
(
excel
.
getIdCard
());
if
(
socialFundInfo
.
getEmpName
().
equals
(
excel
.
getName
()))
{
// 插入
// 0:校验数据有效性-TODO
insertExcel
(
excel
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
// 1:更新社保公积金查询-TODO
//updateSocialFundInfo(socialFundInfo, excel);
// 2:新增调基记录
insertExcel
(
excel
);
// 3:新增变更日志
oldSocialFundInfo
=
new
TSocialFundInfo
();
BeanUtil
.
copyProperties
(
socialFundInfo
,
oldSocialFundInfo
);
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
ONE_INT
,
oldSocialFundInfo
.
getId
(),
oldSocialFundInfo
,
socialFundInfo
);
// 4:同步预估库-TODO
//tForecastLibraryService.
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
SocialConstants
.
EMP_NAME_ERROR
));
}
}
}
}
}
/**
/**
* 插入excel bad record
* 插入excel bad record
*/
*/
private
void
insertExcel
(
TSocialFund
Info
Vo
excel
)
{
private
void
insertExcel
(
TSocialFund
History
Vo
excel
)
{
TSocialFundInfo
insert
=
new
TSocialFundInfo
();
TSocialFundInfo
insert
=
new
TSocialFundInfo
();
BeanUtil
.
copyProperties
(
excel
,
insert
);
BeanUtil
.
copyProperties
(
excel
,
insert
);
this
.
save
(
insert
);
this
.
save
(
insert
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TAuditInfoMapper.xml
View file @
4029aa2b
...
@@ -32,10 +32,9 @@
...
@@ -32,10 +32,9 @@
<result
property=
"auditTime"
column=
"AUDIT_TIME"
/>
<result
property=
"auditTime"
column=
"AUDIT_TIME"
/>
<result
property=
"isCommision"
column=
"IS_COMMISION"
/>
<result
property=
"isCommision"
column=
"IS_COMMISION"
/>
<result
property=
"providentId"
column=
"PROVIDENT_ID"
/>
<result
property=
"providentId"
column=
"PROVIDENT_ID"
/>
<result
property=
"cardinalId"
column=
"CARDINAL_ID"
/>
<result
property=
"organName"
column=
"ORGAN_NAME"
/>
<result
property=
"forecastFormId"
column=
"FORECAST_FORM_ID"
/>
<result
property=
"title"
column=
"TITLE"
/>
<result
property=
"empLeaveId"
column=
"EMP_LEAVE_ID"
/>
<result
property=
"color"
column=
"COLOR"
/>
<result
property=
"aprovalFormId"
column=
"APROVAL_FORM_ID"
/>
<result
property=
"dispatchInfoId"
column=
"DISPATCH_INFO_ID"
/>
<result
property=
"dispatchInfoId"
column=
"DISPATCH_INFO_ID"
/>
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"type"
column=
"TYPE"
/>
</resultMap>
</resultMap>
...
@@ -48,10 +47,9 @@
...
@@ -48,10 +47,9 @@
a.AUDIT_TIME,
a.AUDIT_TIME,
a.IS_COMMISION,
a.IS_COMMISION,
a.PROVIDENT_ID,
a.PROVIDENT_ID,
a.CARDINAL_ID,
a.ORGAN_NAME,
a.FORECAST_FORM_ID,
a.TITLE,
a.EMP_LEAVE_ID,
a.COLOR,
a.APROVAL_FORM_ID,
a.DISPATCH_INFO_ID,
a.DISPATCH_INFO_ID,
a.TYPE
a.TYPE
</sql>
</sql>
...
@@ -81,18 +79,6 @@
...
@@ -81,18 +79,6 @@
<if
test=
"tAuditInfo.providentId != null and tAuditInfo.providentId.trim() != ''"
>
<if
test=
"tAuditInfo.providentId != null and tAuditInfo.providentId.trim() != ''"
>
AND a.PROVIDENT_ID = #{tAuditInfo.providentId}
AND a.PROVIDENT_ID = #{tAuditInfo.providentId}
</if>
</if>
<if
test=
"tAuditInfo.cardinalId != null and tAuditInfo.cardinalId.trim() != ''"
>
AND a.CARDINAL_ID = #{tAuditInfo.cardinalId}
</if>
<if
test=
"tAuditInfo.forecastFormId != null and tAuditInfo.forecastFormId.trim() != ''"
>
AND a.FORECAST_FORM_ID = #{tAuditInfo.forecastFormId}
</if>
<if
test=
"tAuditInfo.empLeaveId != null and tAuditInfo.empLeaveId.trim() != ''"
>
AND a.EMP_LEAVE_ID = #{tAuditInfo.empLeaveId}
</if>
<if
test=
"tAuditInfo.aprovalFormId != null and tAuditInfo.aprovalFormId.trim() != ''"
>
AND a.APROVAL_FORM_ID = #{tAuditInfo.aprovalFormId}
</if>
<if
test=
"tAuditInfo.dispatchInfoId != null and tAuditInfo.dispatchInfoId.trim() != ''"
>
<if
test=
"tAuditInfo.dispatchInfoId != null and tAuditInfo.dispatchInfoId.trim() != ''"
>
AND a.DISPATCH_INFO_ID = #{tAuditInfo.dispatchInfoId}
AND a.DISPATCH_INFO_ID = #{tAuditInfo.dispatchInfoId}
</if>
</if>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4029aa2b
...
@@ -85,6 +85,8 @@
...
@@ -85,6 +85,8 @@
<result
property=
"belongUnitName"
column=
"BELONG_UNIT_NAME"
/>
<result
property=
"belongUnitName"
column=
"BELONG_UNIT_NAME"
/>
<result
property=
"dispatchCode"
column=
"DISPATCH_CODE"
/>
<result
property=
"dispatchCode"
column=
"DISPATCH_CODE"
/>
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"contractId"
column=
"CONTRACT_ID"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -149,7 +151,8 @@
...
@@ -149,7 +151,8 @@
a.BELONG_UNIT_NAME,
a.BELONG_UNIT_NAME,
a.DISPATCH_CODE,
a.DISPATCH_CODE,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_CODE,
a.CONTRACT_SUB_NAME
a.CONTRACT_SUB_NAME,
a.CONTRACT_ID
</sql>
</sql>
<sql
id=
"tDispatchInfo_where"
>
<sql
id=
"tDispatchInfo_where"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
...
...
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