Commit abf6d7ef authored by 韩桐桐's avatar 韩桐桐

fix(jg):idx_biz_jg_other_info字段调整

parent f92324dc
...@@ -2683,14 +2683,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2683,14 +2683,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
records.add(record); records.add(record);
}); });
LambdaQueryWrapper<IdxBizJgOtherInfo> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizJgOtherInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.select(IdxBizJgOtherInfo::getRecord, IdxBizJgOtherInfo::getInformationSituation, IdxBizJgOtherInfo::getInformationSituationRemark); wrapper.select(IdxBizJgOtherInfo::getRecord, IdxBizJgOtherInfo::getInformationSituation, IdxBizJgOtherInfo::getInformationManageCode);
wrapper.in(IdxBizJgOtherInfo::getRecord, records); wrapper.in(IdxBizJgOtherInfo::getRecord, records);
List<IdxBizJgOtherInfo> jgOtherInfos = otherInfoMapper.selectList(wrapper); List<IdxBizJgOtherInfo> jgOtherInfos = otherInfoMapper.selectList(wrapper);
return jgOtherInfos.stream() return jgOtherInfos.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
IdxBizJgOtherInfo::getRecord, IdxBizJgOtherInfo::getRecord,
other -> "3".equals(other.getInformationSituation()) other -> "3".equals(other.getInformationSituation())
? other.getInformationSituationRemark() ? other.getInformationManageCode()
: InformationManageTypeEnum.getName(other.getInformationSituation()), : InformationManageTypeEnum.getName(other.getInformationSituation()),
(oldVal, newVal) -> newVal (oldVal, newVal) -> newVal
)); ));
......
...@@ -118,14 +118,7 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity { ...@@ -118,14 +118,7 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity {
private String informationSituation; private String informationSituation;
/** /**
* 信息化管理情况为3(其他)时填写的说明 * 信息化管理二维码或者电子标签编号或者信息化管理情况为【其他】时候的具体说明
*/
@TableField(value = "\"INFORMATION_SITUATION_REMARK\"")
private String informationSituationRemark;
/**
* 信息化管理二维码或者电子标签编号
*/ */
@TableField(value = "\"INFORMATION_MANAGE_CODE\"") @TableField(value = "\"INFORMATION_MANAGE_CODE\"")
private String informationManageCode; private String informationManageCode;
......
...@@ -70,15 +70,9 @@ public class OtherInfo extends AbstractEquipBaseEntity { ...@@ -70,15 +70,9 @@ public class OtherInfo extends AbstractEquipBaseEntity {
@TableField(value = "\"INFORMATION_SITUATION\"") @TableField(value = "\"INFORMATION_SITUATION\"")
private String informationSituation; private String informationSituation;
/**
* 信息化管理情况为3(其他)时填写的说明
*/
@TableField(value = "\"INFORMATION_SITUATION_REMARK\"")
private String informationSituationRemark;
/** /**
* 信息化管理二维码或者电子标签编号 * 信息化管理二维码或者电子标签编号或者信息化管理情况为【其他】时候的具体说明
*/ */
@TableField(value = "\"INFORMATION_MANAGE_CODE\"") @TableField(value = "\"INFORMATION_MANAGE_CODE\"")
private String informationManageCode; private String informationManageCode;
......
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