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
64b7c6c5
You need to sign in or sign up before continuing.
Commit
64b7c6c5
authored
May 29, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
7b59b383
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
15 deletions
+27
-15
ExcelAttributeConstants.java
...v1/yifu/common/core/constant/ExcelAttributeConstants.java
+4
-0
FundImportHandleVo.java
...yifu/cloud/plus/v1/yifu/social/vo/FundImportHandleVo.java
+1
-8
SocialImportHandleVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialImportHandleVo.java
+2
-1
TForecastLibraryMapper.java
...ud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
+2
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+11
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+5
-4
TForecastLibraryMapper.xml
...-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
+2
-1
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @
64b7c6c5
...
...
@@ -155,4 +155,8 @@ public class ExcelAttributeConstants {
public
static
final
String
HOUSEHOLD
=
"household"
;
// 派单办理失败类型
public
static
final
String
DISPATCH_HANDLE_REASON
=
"dispatch-audit-add-reason"
;
// 社保办理失败类型
public
static
final
String
SOCIAL_DISPATCH_HANDLE_REASON
=
"social-conduct-add-reason"
;
// 公积金办理失败类型
public
static
final
String
FUND_DISPATCH_HANDLE_REASON
=
"fund-conduct-add-reason"
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundImportHandleVo.java
View file @
64b7c6c5
...
...
@@ -16,21 +16,14 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* 派单信息记录表
...
...
@@ -72,7 +65,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
/**
* 失败类型
*/
@ExcelAttribute
(
name
=
"失败类型"
,
isDataId
=
true
,
isConvert
=
false
,
dataType
=
ExcelAttributeConstants
.
DISPATCH_HANDLE_REASON
)
@ExcelAttribute
(
name
=
"失败类型"
,
isDataId
=
true
,
isConvert
=
false
,
dataType
=
ExcelAttributeConstants
.
FUND_
DISPATCH_HANDLE_REASON
)
@Schema
(
description
=
"失败类型"
)
@ExcelProperty
(
"失败类型"
)
private
String
reasonType
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialImportHandleVo.java
View file @
64b7c6c5
...
...
@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -108,7 +109,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
/**
* 失败类型
*/
@ExcelAttribute
(
name
=
"失败类型"
)
@ExcelAttribute
(
name
=
"失败类型"
,
isDataId
=
true
,
isConvert
=
false
,
dataType
=
ExcelAttributeConstants
.
SOCIAL_DISPATCH_HANDLE_REASON
)
@Schema
(
description
=
"失败类型"
)
@ExcelProperty
(
"失败类型"
)
private
String
reasonType
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @
64b7c6c5
...
...
@@ -69,7 +69,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
int
updateForecastFundStatusByIdList
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"status"
)
String
status
);
int
deleteForecastSocial
(
@Param
(
"idCard"
)
String
idCard
,
@Param
(
"socialPayMonth"
)
String
socialPayMonth
,
@Param
(
"socialCreateMonth"
)
String
socialCreateMonth
);
int
deleteForecastSocial
(
@Param
(
"idCard"
)
String
idCard
,
@Param
(
"socialPayMonth"
)
String
socialPayMonth
,
@Param
(
"socialCreateMonth"
)
String
socialCreateMonth
,
@Param
(
"fundPayMonth"
)
String
fundPayMonth
,
@Param
(
"fundCreateMonth"
)
String
fundCreateMonth
);
void
updateForSocialAndFound
(
@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 @
64b7c6c5
...
...
@@ -5273,10 +5273,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List
<
ErrorMessage
>
messageList
;
String
handlerRemaek
;
Map
<
String
,
String
>
map
=
new
HashMap
<>();
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
StringBuilder
socialSucessType
=
new
StringBuilder
();
StringBuilder
socialFailureType
=
new
StringBuilder
();
excel
=
excelVOList
.
get
(
i
);
//表内数据重复 员工身份证
if
(
null
==
map
.
get
(
excel
.
getEmpIdcard
()))
{
map
.
put
(
excel
.
getEmpIdcard
(),
excel
.
getRowIndex
().
toString
());
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"存在重复身份证行("
+
map
.
get
(
excel
.
getEmpIdcard
())+
")请先去重"
,
excel
));
continue
;
}
//身份证加任一险种必填
if
(
Common
.
isEmpty
(
excel
.
getDbHandleStatus
())
&&
Common
.
isEmpty
(
excel
.
getGsHandleStatus
())
&&
Common
.
isEmpty
(
excel
.
getSjHandleStatus
())
&&
Common
.
isEmpty
(
excel
.
getSyHandleStatus
())
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
64b7c6c5
...
...
@@ -1868,10 +1868,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
Common
.
isNotNull
(
librarySocialList
))
{
baseMapper
.
deleteBatchIds
(
librarySocialList
);
}
}
if
(
Common
.
isNotNull
(
libraryFundList
))
{
baseMapper
.
deleteBatchIds
(
libraryFundList
);
}
}
// 新基数,老比例,存放Map
HashMap
<
String
,
TForecastLibrary
>
socialHistoryMap
=
new
HashMap
<>();
HashMap
<
String
,
TForecastLibrary
>
fundHistoryMap
=
new
HashMap
<>();
...
...
@@ -1912,7 +1912,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
BigDecimal
.
ZERO
.
compareTo
(
BigDecimalUtils
.
isNullToZero
(
library
.
getUnitSocialSum
()))
!=
CommonConstants
.
ZERO_INT
||
BigDecimal
.
ZERO
.
compareTo
(
BigDecimalUtils
.
isNullToZero
(
library
.
getUnitFundSum
()))
!=
CommonConstants
.
ZERO_INT
)
{
//判断是否有重复数据有则删除
baseMapper
.
deleteForecastSocial
(
library
.
getEmpIdcard
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
());
baseMapper
.
deleteForecastSocial
(
library
.
getEmpIdcard
(),
library
.
getSocialPayMonth
(),
library
.
getSocialCreateMonth
()
,
library
.
getProvidentPayMonth
(),
library
.
getProvidentCreateMonth
());
library
.
setCreateBy
(
userId
);
library
.
setCreateName
(
userName
);
library
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @
64b7c6c5
...
...
@@ -679,7 +679,8 @@
</update>
<delete
id=
"deleteForecastSocial"
>
delete from t_forecast_library where SOCIAL_PAY_MONTH = #{socialPayMonth} and SOCIAL_CREATE_MONTH = #{socialCreateMonth}
delete from t_forecast_library where (SOCIAL_PAY_MONTH = #{socialPayMonth} and SOCIAL_CREATE_MONTH = #{socialCreateMonth})
or (PROVIDENT_PAY_MONTH = #{fundPayMonth} and PROVIDENT_CREATE_MONTH = #{fundCreateMonth})
and EMP_IDCARD = #{idCard} and DATA_PUSH = 0
</delete>
...
...
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