Commit 6830228d authored by 刘林's avatar 刘林

fix(jg):管道列表去掉使用地点字段

parent f4ddd84b
package com.yeejoin.amos.boot.module.jg.biz.service.impl; package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.alibaba.fastjson.JSONObject; import java.util.stream.Stream;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
...@@ -19,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -19,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 管道工程装置表服务实现类 * 管道工程装置表服务实现类
...@@ -120,9 +119,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP ...@@ -120,9 +119,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
.page(page); .page(page);
pageList.getRecords().forEach(record -> { pageList.getRecords().forEach(record -> {
record.setDataSourceName(EquipSourceEnum.getDataSourceName(record.getDataSource())); record.setDataSourceName(EquipSourceEnum.getDataSourceName(record.getDataSource()));
record.setFullAddress(record.getProvinceName()+record.getCityName()+record.getCountyName()+record.getStreetName()+record.getAddress()); record.setFullAddress(
record.setCan_edit(this.checkContraptionIsCanEdit(record.getSequenceNbr())); Stream.of(record.getProvinceName(), record.getCityName(), record.getCountyName(), record.getStreetName(), record.getAddress())
record.setCan_delete(this.checkContraptionIsCanDelete(record.getSequenceNbr())); .map(value -> value == null ? "" : value)
.collect(Collectors.joining())
);
record.setCanEdit(this.checkContraptionIsCanEdit(record.getSequenceNbr()));
record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr()));
}); });
return pageList; return pageList;
} }
......
...@@ -237,13 +237,13 @@ public class IdxBizJgProjectContraption extends BaseEntity { ...@@ -237,13 +237,13 @@ public class IdxBizJgProjectContraption extends BaseEntity {
* 是否可编辑 * 是否可编辑
*/ */
@TableField(exist = false) @TableField(exist = false)
private Boolean can_edit; private Boolean canEdit;
/** /**
* 是否可删除 * 是否可删除
*/ */
@TableField(exist = false) @TableField(exist = false)
private Boolean can_delete; private Boolean canDelete;
/** /**
* 使用地址 * 使用地址
......
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