Commit 8d65a5cd authored by fangxinjiang's avatar fangxinjiang

户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj

parent e6421e75
...@@ -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;
} }
...@@ -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;
List<TAttaInfo> attaList = new ArrayList<>();
for (TAttaInfo attaInfo: attaInfos){
url = ossUtil.getObjectUrl(null, attaInfo.getAttaSrc());
if (Common.isNotNull(url)) { if (Common.isNotNull(url)) {
attaInfo.setAttaUrl(url.toString()); attaInfo.setAttaUrl(url.toString());
} }
if (CommonConstants.ONE_STRING.equals(attaInfo.getRelationType())){
sysHouseHoldInfo.setAtta(attaInfo); sysHouseHoldInfo.setAtta(attaInfo);
}else {
attaList.add(attaInfo);
}
}
sysHouseHoldInfo.setTempAttas(attaList);
} }
return R.ok(sysHouseHoldInfo); return R.ok(sysHouseHoldInfo);
} }
......
...@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment