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
c1de8685
You need to sign in or sign up before continuing.
Commit
c1de8685
authored
Mar 01, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1
parents
b04058e7
cc761b6b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
188 additions
and
101 deletions
+188
-101
TElecEmployeeInfoServiceImpl.java
...u/archives/service/impl/TElecEmployeeInfoServiceImpl.java
+15
-14
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+5
-5
DeptChangeCheckParam.java
...loud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
+12
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+16
-12
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+6
-0
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+1
-1
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+7
-7
SocialConstants.java
.../cloud/plus/v1/yifu/social/constants/SocialConstants.java
+5
-1
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+98
-54
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+1
-2
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+1
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+17
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TElecEmployeeInfoServiceImpl.java
View file @
c1de8685
...
...
@@ -156,7 +156,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
elecTypeMap
.
put
(
entry
.
getValue
(),
entry
.
getKey
());
}
}
if
(
!
elecTypeMap
.
isEmpty
())
{
if
(
elecTypeMap
.
isEmpty
())
{
return
R
.
failed
(
"获取字典失败!"
);
}
// 判断源文件是否存在
...
...
@@ -176,14 +176,19 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
TEmployeeInfo
tEmployeeInfo
;
ZipEntry
entry
;
String
idCard
;
String
empInfo
;
while
(
entriesCheck
.
hasMoreElements
())
{
entry
=
(
ZipEntry
)
entriesCheck
.
nextElement
();
//添加进filesName
String
empInfo
=
entry
.
getName
();
empInfo
=
entry
.
getName
();
infoList
.
add
(
empInfo
);
String
dataType
=
""
;
if
(
empInfo
.
length
()
==
empInfo
.
lastIndexOf
(
"/"
)
+
1
)
{
String
idCard
=
empInfo
.
substring
(
0
,
empInfo
.
indexOf
(
"/"
));
if
(!
empInfo
.
contains
(
"-"
))
{
return
R
.
failed
(
"请使用正确的文件夹命名格式:身份证-员工姓名"
);
}
idCard
=
empInfo
.
substring
(
0
,
empInfo
.
indexOf
(
"-"
));
tEmployeeInfo
=
tEmployeeInfoService
.
getOne
((
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
idCard
)).
eq
(
TEmployeeInfo:
:
getFileStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
...
...
@@ -197,7 +202,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
if
(!
Common
.
isNotNull
(
elecTypeMap
.
get
(
dataType
)))
{
return
R
.
failed
(
"资料类型错误:"
+
dataType
);
}
cardType
.
add
(
idCard
+
"
/
"
+
dataType
);
cardType
.
add
(
idCard
+
"
_
"
+
dataType
);
}
}
}
...
...
@@ -219,7 +224,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
while
(
entries
.
hasMoreElements
())
{
entry
=
(
ZipEntry
)
entries
.
nextElement
();
//添加进filesName
String
empInfo
=
entry
.
getName
();
empInfo
=
entry
.
getName
();
// 如果是文件夹,就创建个文件夹
if
(
entry
.
isDirectory
())
{
String
dirPath
=
destDirPath
+
"/"
+
entry
.
getName
();
...
...
@@ -245,7 +250,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
TElecEmployeeInfo
tElecEmployeeInfo
=
new
TElecEmployeeInfo
();
if
(
empInfo
.
length
()
>
empInfo
.
lastIndexOf
(
"/"
)
+
1
)
{
String
idCard
=
empInfo
.
substring
(
0
,
empInfo
.
indexOf
(
"/
"
));
idCard
=
empInfo
.
substring
(
0
,
empInfo
.
indexOf
(
"-
"
));
String
dataType
=
empInfo
.
substring
(
empInfo
.
indexOf
(
"/"
)
+
1
,
empInfo
.
lastIndexOf
(
"/"
));
String
empName
=
""
;
employeeInfo
=
tEmployeeInfoService
.
getOne
((
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
...
...
@@ -388,16 +393,12 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
}
public
boolean
containsCheckTwo
(
String
e
,
String
idCard
)
{
if
(
e
.
contains
(
idCard
)
&&
e
.
length
()
>
20
)
{
return
true
;
}
return
false
;
return
e
.
contains
(
idCard
)
&&
e
.
length
()
>
20
;
}
public
boolean
containsCheckOne
(
String
e
,
String
cardType
)
{
if
(
e
.
contains
(
cardType
)
&&
e
.
contains
(
CommonConstants
.
SPOT
))
{
return
true
;
}
return
false
;
String
empIdcard
=
cardType
.
substring
(
0
,
cardType
.
indexOf
(
"_"
));
String
fileName
=
cardType
.
substring
(
cardType
.
indexOf
(
"_"
)
+
1
);
return
e
.
contains
(
empIdcard
)
&&
e
.
contains
(
fileName
)
&&
e
.
contains
(
CommonConstants
.
SPOT
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
c1de8685
...
...
@@ -114,11 +114,11 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeeProject
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
updateTEmployeeProject
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
updateTEmployeeProject
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeeProject
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeeProject
);
updateTEmployeeProject
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
tEmployeeProjectService
.
updateById
(
updateTEmployeeProject
);
tEmpChangeInfo
.
setProId
(
updateTEmployeeProject
.
getId
());
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeeProject
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeeProject
);
UpdateSocialFoundVo
updateSocialFoundVo
=
new
UpdateSocialFoundVo
();
updateSocialFoundVo
.
setOldDeptId
(
updateTEmployeeProject
.
getOdlDeptId
());
...
...
@@ -232,10 +232,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setUnitName
(
tSettleDomain
.
getCustomerName
());
updateTEmployeePro
.
setChangeStartMonth
(
excel
.
getChangeStartMonth
());
updateTEmployeePro
.
setUnsettleDeal
(
CommonConstants
.
IS_NO_CHANGE
);
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeePro
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeePro
);
updateTEmployeePro
.
setOdlDeptId
(
tEmployeeProjectOld
.
getDeptId
());
updateList
.
add
(
updateTEmployeePro
);
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
tEmployeeProjectOld
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeePro
);
}
}
else
{
errorMsg
.
add
(
MsgUtils
.
getMessage
(
ErrorCodes
.
PROJECT_PERSON_SEARCH_EXIT
,
excel
.
getOldSettleCode
()));
...
...
@@ -286,7 +286,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
*/
@Override
public
R
<
List
<
TSettleDomain
>>
getAllDept
(
String
customerName
)
{
List
<
TSettleDomain
>
list
=
null
;
List
<
TSettleDomain
>
list
;
if
(
Common
.
isNotNull
(
customerName
)){
list
=
tSettleDomainMapper
.
selectList
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
().
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
STATUS_NORMAL
).
eq
(
TSettleDomain:
:
getCustomerName
,
customerName
));
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @
c1de8685
...
...
@@ -56,6 +56,12 @@ public class DeptChangeCheckParam implements Serializable {
@Schema
(
description
=
"新项目编码"
)
private
String
newDeptNo
;
/**
* 新项目id
*/
@Schema
(
description
=
"新项目id"
)
private
String
newDeptId
;
/**
* 保险公司名称
*/
...
...
@@ -134,6 +140,12 @@ public class DeptChangeCheckParam implements Serializable {
@Schema
(
description
=
"客户编码"
)
private
String
newCustomerCode
;
/**
* 客户id
*/
@Schema
(
description
=
"客户id"
)
private
String
newCustomerId
;
/**
* 客户名称
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c1de8685
...
...
@@ -4791,6 +4791,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
set
(
TInsuranceDetail
::
getDeptName
,
success
.
getNewDeptName
())
.
set
(
TInsuranceDetail
::
getUnitNo
,
success
.
getNewCustomerCode
())
.
set
(
TInsuranceDetail
::
getUnitName
,
success
.
getNewCustomerName
())
.
set
(
TInsuranceDetail
::
getDeptId
,
success
.
getNewDeptId
())
.
set
(
TInsuranceDetail
::
getUnitId
,
success
.
getNewCustomerId
())
.
set
(
TInsuranceDetail
::
getSettleType
,
newSettleType
)
.
set
(
TInsuranceDetail
::
getActualPremium
,
actualPremium
)
.
set
(
TInsuranceDetail
::
getEstimatePremium
,
estimatePremium
)
...
...
@@ -6496,6 +6498,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setNewDeptName
(
jsonObject
.
getDepartName
());
param
.
setNewCustomerName
(
jsonObject
.
getCustomerName
());
param
.
setNewCustomerCode
(
jsonObject
.
getCustomerCode
());
param
.
setNewDeptId
(
jsonObject
.
getId
());
param
.
setNewCustomerId
(
jsonObject
.
getCustomerId
());
String
settleType
=
jsonObject
.
getInsuranceSettleType
();
if
(
StringUtils
.
isEmpty
(
settleType
)){
param
.
setErrorMessage
(
InsurancesConstants
.
PROJECT_NOT_FIND_SETTLE_TYPE
);
...
...
@@ -6546,18 +6550,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
errorList
.
add
(
param
);
continue
;
}
//旧项目ID不在当前权限范围内
if
(
deptNoList
.
stream
().
noneMatch
(
u
->
u
.
equals
(
oldDeptNo
))){
param
.
setErrorMessage
(
InsurancesConstants
.
OLD_DEPT_NO_NOT_IN_DEPT_LIST
);
errorList
.
add
(
param
);
continue
;
}
//新项目ID不在当前权限范围内
if
(
deptNoList
.
stream
().
noneMatch
(
u
->
u
.
equals
(
newDeptNo
))){
param
.
setErrorMessage
(
InsurancesConstants
.
NEW_DEPT_NO_NOT_IN_DEPT_LIST
);
errorList
.
add
(
param
);
continue
;
}
//
//旧项目ID不在当前权限范围内
//
if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){
//
param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
//
errorList.add(param);
//
continue;
//
}
//
//新项目ID不在当前权限范围内
//
if(deptNoList.stream().noneMatch(u ->u.equals(newDeptNo))){
//
param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
//
errorList.add(param);
//
continue;
//
}
//替换类型的保单不能变更所属项目
Integer
buyType
=
insuranceDetail
.
getBuyType
();
if
(
CommonConstants
.
FOUR_INT
==
buyType
){
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
c1de8685
...
...
@@ -611,6 +611,9 @@
a.DELETE_FLAG = 0
and
a.BUY_HANDLE_STATUS = 3
<if
test=
"param.isEffect != null"
>
and a.IS_EFFECT = #{param.isEffect}
</if>
<if
test=
"param.unitName != null and param.unitName.trim() != ''"
>
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if>
...
...
@@ -688,6 +691,9 @@
a.DELETE_FLAG = 0
and
a.BUY_HANDLE_STATUS = 3
<if
test=
"param.isEffect != null"
>
and a.IS_EFFECT = #{param.isEffect}
</if>
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
c1de8685
...
...
@@ -584,7 +584,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
public
R
invalidOrder
(
String
id
)
{
TOrder
one
=
baseMapper
.
selectById
(
id
);
if
(
Common
.
isNotNull
(
one
)
&&
CommonConstants
.
ZERO_INT
=
=
one
.
getOrderStatus
())
{
if
(
Common
.
isNotNull
(
one
)
&&
CommonConstants
.
ZERO_INT
!
=
one
.
getOrderStatus
())
{
return
R
.
failed
(
OrderConstants
.
ORDER_INVALID_FAILED
);
}
one
.
setDeleteFlag
(
CommonConstants
.
ONE_INT
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
c1de8685
...
...
@@ -231,14 +231,14 @@ public class TSalaryAccountController {
@Operation
(
description
=
"获取工资条"
)
@GetMapping
(
"/getEmpAccount"
)
public
R
<
TSalaryDetailVo
>
getEmpAccount
(
String
empIdcard
,
String
settleDepartId
,
String
settlementMonth
,
String
settleDepartNo
,
String
settleDepar
tName
,
String
empName
)
{
,
String
deptNo
,
String
dep
tName
,
String
empName
)
{
TSalaryDetailVo
salaryDetailVo
=
new
TSalaryDetailVo
();
if
(
Common
.
isEmpty
(
empIdcard
)
&&
Common
.
isEmpty
(
settleDepartId
)
&&
Common
.
isEmpty
(
settlementMonth
)
&&
Common
.
isEmpty
(
settleDepartNo
)
&&
Common
.
isEmpty
(
settleDepar
tName
)
&&
Common
.
isEmpty
(
empName
))
{
&&
Common
.
isEmpty
(
deptNo
)
&&
Common
.
isEmpty
(
dep
tName
)
&&
Common
.
isEmpty
(
empName
))
{
return
R
.
failed
(
"请输入查询条件"
);
}
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
Common
.
isEmpty
(
empIdcard
)
&&
Common
.
isEmpty
(
settleDepartId
)
&&
Common
.
isEmpty
(
settleDepartNo
)
&&
Common
.
isEmpty
(
settleDepar
tName
)
&&
Common
.
isEmpty
(
empName
))
{
&&
Common
.
isEmpty
(
deptNo
)
&&
Common
.
isEmpty
(
dep
tName
)
&&
Common
.
isEmpty
(
empName
))
{
return
R
.
failed
(
"结算月需配合其他查询条件一起使用,请输入其他查询条件!"
);
}
//报账表
...
...
@@ -258,11 +258,11 @@ public class TSalaryAccountController {
if
(
Common
.
isNotNull
(
empName
))
{
queryWrapperSa
.
eq
(
"EMP_NAME"
,
empName
);
}
if
(
Common
.
isNotNull
(
settleDepar
tNo
))
{
queryWrapperSa
.
eq
(
"DEPT_NO"
,
settleDepar
tNo
);
if
(
Common
.
isNotNull
(
dep
tNo
))
{
queryWrapperSa
.
eq
(
"DEPT_NO"
,
dep
tNo
);
}
if
(
Common
.
isNotNull
(
settleDepar
tName
))
{
queryWrapperSa
.
like
(
"DEPT_NAME"
,
settleDepar
tName
);
if
(
Common
.
isNotNull
(
dep
tName
))
{
queryWrapperSa
.
like
(
"DEPT_NAME"
,
dep
tName
);
}
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
settlementMonth
.
length
()
<
6
)
{
queryWrapperSa
.
like
(
"SETTLEMENT_MONTH"
,
settlementMonth
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @
c1de8685
...
...
@@ -13,7 +13,6 @@ public class SocialConstants {
public
static
final
String
DIFF_TYPE_THR
=
"实缴"
;
public
static
final
String
DIFF_TYPE_TWO
=
"差额"
;
public
static
final
String
ERROR_TEMPLATE
=
"模板中已存在对应员工"
;
public
static
final
String
EXIT_TEMPLATE
=
"已存在对应员工身份证"
;
public
static
final
String
YL
=
"养老"
;
public
static
final
String
DB
=
"大病"
;
...
...
@@ -24,4 +23,9 @@ public class SocialConstants {
public
static
final
String
BJ
=
"补缴"
;
public
static
final
String
YEAR_1970
=
"1970-02"
;
public
static
final
String
NOT_EXIT_SETTLEiNFO
=
"未找到该人员对应的项目信息,请核实"
;
public
static
final
String
ERROR_PRI
=
"该人员归属的"
;
public
static
final
String
ERROR_END
=
"信息缺失,将导致后续无法结算,请联系卢名旭处理"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
c1de8685
...
...
@@ -63,6 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
List
<
TSocialFundInfoExportVo
>
exportList
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfoSearchVo
tSocialFundInfo
);
Integer
exportListCount
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfoSearchVo
tSocialFundInfo
);
void
updateSocialAndFoundInfo
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
void
updateSocialAndFoundInfoF
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c1de8685
...
...
@@ -3771,7 +3771,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 2.派减办理成功 处理预估 (不管社保还是公积金办理失败)
if
(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ZERO_INT
==
flag
&&
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())){
&&
(
CommonConstants
.
EIGHT_STRING
.
equals
(
sf
.
getSocialStatus
())
||
CommonConstants
.
SEVEN_STRING
.
equals
(
sf
.
getFundStatus
()))){
// 同步预估库数据
socialTask
.
asynchronousDisPatchHandle
(
sf
,
forecastFlag
,
null
,
null
,
CommonConstants
.
ZERO_INT
);
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
c1de8685
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/TSocialFundInfoServiceImpl.java
View file @
c1de8685
...
...
@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO
;
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.util.*
;
...
...
@@ -103,7 +102,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
String
fileName
=
"社保公积金批量导出"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
List
<
TSocialFundInfoExportVo
>
list
=
new
ArrayList
<>();
long
count
=
noPageCountDiy
(
searchVo
);
long
count
=
baseMapper
.
exportListCount
(
searchVo
);
ServletOutputStream
out
=
null
;
try
{
out
=
response
.
getOutputStream
();
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
c1de8685
...
...
@@ -785,7 +785,7 @@
s.SOCIAL_START_DATE,
a.SOCIAL_REDUCE_DATE,
s.RECORD_BASE,
s.HANDLE_USER_NAME,
s.HANDLE_USER_NAME
as HANDLE_USER
,
s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL,
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
c1de8685
...
...
@@ -941,6 +941,17 @@
</where>
</select>
<!--导出-->
<select
id=
"exportListCount"
resultType=
"java.lang.Integer"
>
select
count(1)
from t_social_fund_info a
<where>
1=1
<include
refid=
"tSocialFundInfo_where"
/>
</where>
</select>
<!--导出-->
<select
id=
"exportList"
resultMap=
"exportMap"
>
select
...
...
@@ -978,6 +989,7 @@
d.CONTRACT_TERM,
d.EDUCATION_NAME,
a.RECORD_BASE,
<!--"社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11 派减办理中 12 派减部分办理失败)" ) -->
case when a.SOCIAL_STATUS = 0 then "派增待审核"
when a.SOCIAL_STATUS = 1 then "派增待办理"
when a.SOCIAL_STATUS = 2 then "派增办理中"
...
...
@@ -989,6 +1001,8 @@
when a.SOCIAL_STATUS = 8 then "派减办理成功"
when a.SOCIAL_STATUS = 9 then "派减办理失败"
when a.SOCIAL_STATUS = 10 then "派增审核不通过"
WHEN a.SOCIAL_STATUS = 11 THEN "派减办理中"
WHEN a.SOCIAL_STATUS = 12 THEN "派减部分办理失败"
else null end as "SOCIAL_STATUS" ,
case when a.FUND_STATUS = 0 then "派增待审核"
when a.FUND_STATUS = 1 then "派增待办理"
...
...
@@ -1111,9 +1125,9 @@
LEFT JOIN sys_area s1 on a.SOCIAL_PROVINCE=s1.id
LEFT JOIN sys_area s2 on a.SOCIAL_CITY=s2.id
LEFT JOIN sys_area s3 on a.SOCIAL_TOWN=s3.id
LEFT JOIN sys_area f1 on
d
.FUND_PROVINCE=f1.id
LEFT JOIN sys_area f2 on
d
.FUND_CITY=f2.id
LEFT JOIN sys_area f3 on
d
.FUND_TOWN=f3.id
LEFT JOIN sys_area f1 on
a
.FUND_PROVINCE=f1.id
LEFT JOIN sys_area f2 on
a
.FUND_CITY=f2.id
LEFT JOIN sys_area f3 on
a
.FUND_TOWN=f3.id
LEFT JOIN sys_area d1 on d.FILE_PROVINCE=d1.id
LEFT JOIN sys_area d2 on d.FILE_CITY=d2.id
LEFT JOIN sys_area d3 on d.FILE_TOWN=d3.id
...
...
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