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
b26ac841
Commit
b26ac841
authored
Dec 15, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-1.7.18 huych 更新历史逻辑,null更新成空串,为了操作记录的准确定
parent
51c0edf8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
21 deletions
+50
-21
TSocialLog.java
...com/yifu/cloud/plus/v1/yifu/social/entity/TSocialLog.java
+4
-4
SysHouseHoldInfoController.java
...v1/yifu/social/controller/SysHouseHoldInfoController.java
+1
-2
SysHouseHoldInfoService.java
.../plus/v1/yifu/social/service/SysHouseHoldInfoService.java
+2
-0
TSocialLogService.java
.../cloud/plus/v1/yifu/social/service/TSocialLogService.java
+1
-1
SysBaseSetInfoServiceImpl.java
...1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java
+2
-2
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+40
-12
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialLog.java
View file @
b26ac841
...
@@ -50,12 +50,12 @@ public class TSocialLog extends BaseEntity {
...
@@ -50,12 +50,12 @@ public class TSocialLog extends BaseEntity {
private
String
id
;
private
String
id
;
/**
/**
* 类型:1社保基数配置;2公积金基数配置;3:调基
* 类型:1社保基数配置;2公积金基数配置;3:调基
;4户配置
*/
*/
@ExcelAttribute
(
name
=
"类型:1社保基数配置;2公积金基数配置;3:调基"
)
@ExcelAttribute
(
name
=
"类型:1社保基数配置;2公积金基数配置;3:调基
;4户配置
"
)
@Schema
(
description
=
"类型:1社保基数配置;2公积金基数配置;3:调基"
)
@Schema
(
description
=
"类型:1社保基数配置;2公积金基数配置;3:调基
;4户配置
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"类型:1社保基数配置;2公积金基数配置;3:调基"
)
@ExcelProperty
(
"类型:1社保基数配置;2公积金基数配置;3:调基
;4户配置
"
)
private
Integer
type
;
private
Integer
type
;
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java
View file @
b26ac841
...
@@ -147,8 +147,7 @@ public class SysHouseHoldInfoController {
...
@@ -147,8 +147,7 @@ public class SysHouseHoldInfoController {
if
(
Common
.
isNotNull
(
autoStatus
)){
if
(
Common
.
isNotNull
(
autoStatus
)){
sysHouseHoldInfo
.
setAutoStatus
(
autoStatus
);
sysHouseHoldInfo
.
setAutoStatus
(
autoStatus
);
}
}
sysHouseHoldInfoService
.
updateById
(
sysHouseHoldInfo
);
return
sysHouseHoldInfoService
.
updateStatusById
(
sysHouseHoldInfo
);
return
R
.
ok
();
}
}
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/SysHouseHoldInfoService.java
View file @
b26ac841
...
@@ -59,6 +59,8 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> {
...
@@ -59,6 +59,8 @@ public interface SysHouseHoldInfoService extends IService<SysHouseHoldInfo> {
R
<
Boolean
>
updateByIdAsso
(
SysHouseHoldInfo
sysHouseHoldInfo
);
R
<
Boolean
>
updateByIdAsso
(
SysHouseHoldInfo
sysHouseHoldInfo
);
R
<
Boolean
>
updateStatusById
(
SysHouseHoldInfo
sysHouseHoldInfo
);
IPage
<
SysHouseHoldInfo
>
getAllSingleSocailPage
(
Page
<
SysHouseHoldInfo
>
page
);
IPage
<
SysHouseHoldInfo
>
getAllSingleSocailPage
(
Page
<
SysHouseHoldInfo
>
page
);
R
<
List
<
ErrorMessage
>>
importListAdd
(
InputStream
inputStream
);
R
<
List
<
ErrorMessage
>>
importListAdd
(
InputStream
inputStream
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialLogService.java
View file @
b26ac841
...
@@ -39,7 +39,7 @@ public interface TSocialLogService extends IService<TSocialLog> {
...
@@ -39,7 +39,7 @@ public interface TSocialLogService extends IService<TSocialLog> {
/**
/**
* 生成修改记录
* 生成修改记录
*
*
* @param type 类型:1社保基数配置;2公积金基数配置
* @param type 类型:1社保基数配置;2公积金基数配置
4 户配置
* @param mainId 关联表id
* @param mainId 关联表id
* @param oldInfo
* @param oldInfo
* @param newInfo
* @param newInfo
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java
View file @
b26ac841
...
@@ -193,7 +193,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
...
@@ -193,7 +193,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sysBaseSetInfo
.
getBaseType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sysBaseSetInfo
.
getBaseType
()))
{
type
=
CommonConstants
.
TWO_INT
;
type
=
CommonConstants
.
TWO_INT
;
}
}
//设置不
更新
字段
//设置不
记录更新日志
字段
sysBaseSetInfo
.
setDepartId
(
old
.
getDepartId
());
sysBaseSetInfo
.
setDepartId
(
old
.
getDepartId
());
sysBaseSetInfo
.
setFundProList
(
old
.
getFundProList
());
sysBaseSetInfo
.
setFundProList
(
old
.
getFundProList
());
sysBaseSetInfo
.
setApplyDate
(
old
.
getApplyDate
());
sysBaseSetInfo
.
setApplyDate
(
old
.
getApplyDate
());
...
@@ -317,7 +317,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
...
@@ -317,7 +317,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
@Override
@Override
public
R
<
Boolean
>
updateByIdAsso
(
String
id
,
int
status
)
{
public
R
<
Boolean
>
updateByIdAsso
(
String
id
,
int
status
)
{
SysBaseSetInfo
baseSetInfo
=
baseMapper
.
selectById
(
id
);
SysBaseSetInfo
baseSetInfo
=
baseMapper
.
selectById
(
id
);
//老的配置
SysBaseSetInfo
oldSetInfo
=
baseMapper
.
selectById
(
id
);
SysBaseSetInfo
oldSetInfo
=
baseMapper
.
selectById
(
id
);
if
(
null
==
baseSetInfo
){
if
(
null
==
baseSetInfo
){
return
R
.
failed
(
"无对应ID的数据!"
);
return
R
.
failed
(
"无对应ID的数据!"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
b26ac841
...
@@ -77,6 +77,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -77,6 +77,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
private
final
SysBaseSetInfoMapper
baseSetInfoMapper
;
private
final
SysBaseSetInfoMapper
baseSetInfoMapper
;
private
final
TSocialLogService
tSocialLogService
;
@Autowired
@Autowired
private
TSocialfundHouseResService
tSocialfundHouseResService
;
private
TSocialfundHouseResService
tSocialfundHouseResService
;
...
@@ -504,6 +506,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -504,6 +506,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
int
res
=
baseMapper
.
updateById
(
hold
);
int
res
=
baseMapper
.
updateById
(
hold
);
if
(
res
>=
0
){
if
(
res
>=
0
){
//设置不记录更新日志字段
holdInfo
.
setOrganId
(
hold
.
getOrganId
());
holdInfo
.
setUpdateBy
(
hold
.
getUpdateBy
());
holdInfo
.
setUpdateTime
(
hold
.
getUpdateTime
());
holdInfo
.
setAuditUserDeptName
(
hold
.
getAuditUserDeptName
());
holdInfo
.
setAttaId
(
hold
.
getAttaId
());
holdInfo
.
setAtta
(
hold
.
getAtta
());
holdInfo
.
setHandleUserDeptName
(
hold
.
getHandleUserDeptName
());
holdInfo
.
setTempAttas
(
hold
.
getTempAttas
());
holdInfo
.
setResList
(
hold
.
getResList
());
// 记录变更日志
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
FOUR_INT
,
holdInfo
.
getId
(),
holdInfo
,
hold
);
if
(
isEdit
)
{
if
(
isEdit
)
{
// 新老数据审核人办理人不同,先删除,再添加
// 新老数据审核人办理人不同,先删除,再添加
if
(
Common
.
isNotNull
(
holdInfo
.
getAuditUser
())
&&
!
holdInfo
.
getAuditUser
().
equals
(
hold
.
getAuditUser
()))
{
if
(
Common
.
isNotNull
(
holdInfo
.
getAuditUser
())
&&
!
holdInfo
.
getAuditUser
().
equals
(
hold
.
getAuditUser
()))
{
...
@@ -522,6 +536,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -522,6 +536,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
}
}
@Override
public
R
<
Boolean
>
updateStatusById
(
SysHouseHoldInfo
sysHouseHoldInfo
)
{
//查询老的户配置数据
SysHouseHoldInfo
holdInfo
=
baseMapper
.
selectById
(
sysHouseHoldInfo
.
getId
());
this
.
updateById
(
sysHouseHoldInfo
);
// 记录变更日志
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
FOUR_INT
,
sysHouseHoldInfo
.
getId
(),
holdInfo
,
sysHouseHoldInfo
);
return
R
.
ok
();
}
private
R
<
Boolean
>
judgeHuAndResStatus
(
SysHouseHoldInfo
hold
,
List
<
SysHouseHoldInfoFailRes
>
resList
)
{
private
R
<
Boolean
>
judgeHuAndResStatus
(
SysHouseHoldInfo
hold
,
List
<
SysHouseHoldInfoFailRes
>
resList
)
{
FailReasonConfig
s
;
FailReasonConfig
s
;
String
failKey
=
""
;
String
failKey
=
""
;
...
@@ -1049,6 +1073,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1049,6 +1073,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
SysHouseHoldInfo
info
;
SysHouseHoldInfo
info
;
SysHouseHoldInfo
oldInfo
;
String
errorMsg
;
String
errorMsg
;
// 个性化校验逻辑
// 个性化校验逻辑
// 执行数据插入操作 组装
// 执行数据插入操作 组装
...
@@ -1071,6 +1096,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1071,6 +1096,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
continue
;
continue
;
}
}
oldInfo
=
this
.
getById
(
info
.
getId
());
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isNotNull
(
excel
.
getCity
()))
{
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isNotNull
(
excel
.
getCity
()))
{
info
.
setProvince
(
excel
.
getProvince
());
info
.
setProvince
(
excel
.
getProvince
());
info
.
setCity
(
excel
.
getCity
());
info
.
setCity
(
excel
.
getCity
());
...
@@ -1285,8 +1311,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1285,8 +1311,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
this
.
saveAuditUserOrHandleUser
(
info
,
CommonConstants
.
ZERO_STRING
);
this
.
saveAuditUserOrHandleUser
(
info
,
CommonConstants
.
ZERO_STRING
);
}
}
//更新数据
//更新数据
updateHouseInfo
(
excel
,
info
,
userMap
,
oldInfo
);
updateHouseInfo
(
excel
,
info
,
userMap
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
,
excel
));
}
}
// 把errorMessageList 按 rowIndex 升序
// 把errorMessageList 按 rowIndex 升序
...
@@ -1318,7 +1343,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1318,7 +1343,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
private
void
updateHouseInfo
(
TSocialHouseholdUpdateVo
excel
,
SysHouseHoldInfo
info
,
private
void
updateHouseInfo
(
TSocialHouseholdUpdateVo
excel
,
SysHouseHoldInfo
info
,
Map
<
String
,
SysUser
>
userMap
)
{
Map
<
String
,
SysUser
>
userMap
,
SysHouseHoldInfo
oldInfo
)
{
if
(
Common
.
isNotNull
(
excel
.
getHouseType
()))
{
if
(
Common
.
isNotNull
(
excel
.
getHouseType
()))
{
info
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"1"
:
"0"
);
info
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"1"
:
"0"
);
}
}
...
@@ -1355,18 +1380,19 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1355,18 +1380,19 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
}
else
{
}
else
{
info
.
setDataFlagYgs
(
null
);
//1.7.18 huych 更新历史逻辑,null更新成空串,为了操作记录的准确定
info
.
setDataFlagYgs
(
""
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
}
else
{
}
else
{
info
.
setIsSingle
(
null
);
info
.
setIsSingle
(
""
);
info
.
setDataFlagYgs
(
null
);
info
.
setDataFlagYgs
(
""
);
info
.
setRosterAutoFlagYgs
(
null
);
info
.
setRosterAutoFlagYgs
(
""
);
}
}
info
.
setIsSingleYsdPush
(
null
);
info
.
setIsSingleYsdPush
(
""
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatusYsd
())){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatusYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
...
@@ -1394,13 +1420,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1394,13 +1420,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
}
else
{
}
else
{
info
.
setDataFlagYsd
(
null
);
info
.
setDataFlagYsd
(
""
);
}
}
}
else
{
}
else
{
info
.
setRosterAutoFlagYsd
(
null
);
info
.
setRosterAutoFlagYsd
(
""
);
info
.
setIsSingleYsd
(
null
);
info
.
setIsSingleYsd
(
""
);
info
.
setDataFlagYsd
(
null
);
info
.
setDataFlagYsd
(
""
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
...
@@ -1443,6 +1469,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -1443,6 +1469,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info
.
setHandleUser
(
handlerUser
.
getUserId
());
info
.
setHandleUser
(
handlerUser
.
getUserId
());
info
.
setHandleUserName
(
excel
.
getHandleUserName
());
info
.
setHandleUserName
(
excel
.
getHandleUserName
());
}
}
// 记录变更日志
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
FOUR_INT
,
oldInfo
.
getId
(),
oldInfo
,
info
);
baseMapper
.
updateById
(
info
);
baseMapper
.
updateById
(
info
);
}
}
...
...
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