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
bbb1f23e
Commit
bbb1f23e
authored
Sep 11, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15
parents
16f90391
413e7114
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
7 deletions
+44
-7
SysHouseHoldInfo.java
...fu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
+6
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+15
-6
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+23
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
View file @
bbb1f23e
...
@@ -416,4 +416,10 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -416,4 +416,10 @@ public class SysHouseHoldInfo extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
SysHouseHoldInfoFailRes
>
resList
;
private
List
<
SysHouseHoldInfoFailRes
>
resList
;
/**
* 模板附件
*/
@TableField
(
exist
=
false
)
private
List
<
TAttaInfo
>
tempAttas
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
bbb1f23e
...
@@ -386,14 +386,23 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -386,14 +386,23 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
@Override
@Override
public
R
<
SysHouseHoldInfo
>
getByIdAtta
(
String
id
)
{
public
R
<
SysHouseHoldInfo
>
getByIdAtta
(
String
id
)
{
SysHouseHoldInfo
sysHouseHoldInfo
=
baseMapper
.
selectById
(
id
);
SysHouseHoldInfo
sysHouseHoldInfo
=
baseMapper
.
selectById
(
id
);
TAttaInfo
attaInfo
=
attaInfoService
.
getOne
(
Wrappers
.<
TAttaInfo
>
query
().
lambda
().
eq
(
TAttaInfo:
:
getDomainId
,
id
)
List
<
TAttaInfo
>
attaInfos
=
attaInfoService
.
list
(
Wrappers
.<
TAttaInfo
>
query
().
lambda
().
eq
(
TAttaInfo:
:
getDomainId
,
id
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
attaInfo
))
{
if
(
Common
.
isNotNull
(
attaInfos
))
{
URL
url
=
ossUtil
.
getObjectUrl
(
null
,
attaInfo
.
getAttaSrc
());
URL
url
;
if
(
Common
.
isNotNull
(
url
))
{
List
<
TAttaInfo
>
attaList
=
new
ArrayList
<>();
attaInfo
.
setAttaUrl
(
url
.
toString
());
for
(
TAttaInfo
attaInfo:
attaInfos
){
url
=
ossUtil
.
getObjectUrl
(
null
,
attaInfo
.
getAttaSrc
());
if
(
Common
.
isNotNull
(
url
))
{
attaInfo
.
setAttaUrl
(
url
.
toString
());
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
attaInfo
.
getRelationType
())){
sysHouseHoldInfo
.
setAtta
(
attaInfo
);
}
else
{
attaList
.
add
(
attaInfo
);
}
}
}
sysHouseHoldInfo
.
set
Atta
(
attaInfo
);
sysHouseHoldInfo
.
set
TempAttas
(
attaList
);
}
}
return
R
.
ok
(
sysHouseHoldInfo
);
return
R
.
ok
(
sysHouseHoldInfo
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
bbb1f23e
...
@@ -58,6 +58,18 @@
...
@@ -58,6 +58,18 @@
<result
property=
"customerNoYsd"
column=
"CUSTOMER_NO_YSD"
/>
<result
property=
"customerNoYsd"
column=
"CUSTOMER_NO_YSD"
/>
<result
property=
"isSingle"
column=
"IS_SINGLE"
/>
<result
property=
"isSingle"
column=
"IS_SINGLE"
/>
<result
property=
"isAutoLeaveDoc"
column=
"IS_AUTO_LEAVE_DOC"
/>
<result
property=
"isAutoLeaveDoc"
column=
"IS_AUTO_LEAVE_DOC"
/>
<!-- MVPV1.7.15 户拆分 fxj 2025-09-11 -->
<result
property=
"autoStatusYsd"
column=
"AUTO_STATUS_YSD"
/>
<result
property=
"isSingleYsd"
column=
"IS_SINGLE_YSD"
/>
<result
property=
"rosterAutoFlagYgs"
column=
"ROSTER_AUTO_FLAG_YGS"
/>
<result
property=
"rosterAutoFlagYsd"
column=
"ROSTER_AUTO_FLAG_YSD"
/>
<result
property=
"dataFlagYgs"
column=
"DATA_FLAG_YGS"
/>
<result
property=
"dataFlagYsd"
column=
"DATA_FLAG_YSD"
/>
<result
property=
"addRosterTempYgs"
column=
"ADD_ROSTER_TEMP_YGS"
/>
<result
property=
"reduceRosterTempYgs"
column=
"REDUCE_ROSTER_TEMP_YGS"
/>
<result
property=
"addRosterTempYsd"
column=
"ADD_ROSTER_TEMP_YSD"
/>
<result
property=
"reduceRosterTempYsd"
column=
"REDUCE_ROSTER_TEMP_YSD"
/>
</resultMap>
</resultMap>
<resultMap
id=
"sysHouseHoldSingleInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo"
>
<resultMap
id=
"sysHouseHoldSingleInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo"
>
...
@@ -101,7 +113,17 @@
...
@@ -101,7 +113,17 @@
a.IS_SIGN,
a.IS_SIGN,
a.CUSTOMER_NO_YSD,
a.CUSTOMER_NO_YSD,
a.IS_SINGLE,
a.IS_SINGLE,
a.IS_AUTO_LEAVE_DOC
a.IS_AUTO_LEAVE_DOC,
a.AUTO_STATUS_YSD,
a.IS_SINGLE_YSD,
a.ROSTER_AUTO_FLAG_YGS,
a.ROSTER_AUTO_FLAG_YSD,
a.DATA_FLAG_YGS,
a.DATA_FLAG_YSD,
a.ADD_ROSTER_TEMP_YGS,
a.REDUCE_ROSTER_TEMP_YGS,
a.ADD_ROSTER_TEMP_YSD,
a.REDUCE_ROSTER_TEMP_YSD
</sql>
</sql>
<sql
id=
"sysHouseHoldInfo_where"
>
<sql
id=
"sysHouseHoldInfo_where"
>
<if
test=
"sysHouseHoldInfo != null"
>
<if
test=
"sysHouseHoldInfo != 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