zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化代码

Browse Source
This commit is contained in:
tangwei 2026-07-17 10:26:50 +08:00
parent 1866e3b274
commit 4a2ba4863d
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/yfd/platform/common/GroupHelper.java
View File

@ -92,7 +92,10 @@ public class GroupHelper {
for(Map<String, Object> item : data) {
Object groupKey = this.getKey(item, groupInfo);
Object groupIndexKey = groupKey != null ? groupKey : null;
if (groupKey == null) {
continue;
}
Object groupIndexKey = groupKey;
Object tempCount = item.get("count_" + groupInfo.getSelector());
if (tempCount == null) {
tempCount = item.get("COUNT_" + groupInfo.getSelector().toUpperCase());

2
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
View File

@ -170,7 +170,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId)
.eq(StringUtils.hasText(hbrvcd), SdEngInfoBH::getHbrvcd, hbrvcd)
.eq(StrUtil.isNotBlank(reachcd), SdEngInfoBH::getReachcd, reachcd)
.eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getRvcd, rvcd)
.eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getReachcd, rvcd)
.in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getReachcd, rvcds)
.in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds)
.like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm)

5
backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewVmsstbprptVo.java
View File

@ -44,6 +44,11 @@ public class OverviewVmsstbprptVo implements Serializable {
private String introduce;
private String logo;
private String inffile;
private String boundary;
private String location;
private BigDecimal height;
private String url;
private String accuracy;
private BigDecimal inv;
private Integer invinmn;
private Date stdsdt;

5
backend/src/main/java/com/yfd/platform/qgc_env/overview/service/impl/OverviewServiceImpl.java
View File

@ -1459,6 +1459,11 @@ public class OverviewServiceImpl implements OverviewService {
columnMap.put("introduce", "t.INTRODUCE AS \"introduce\"");
columnMap.put("logo", "t.LOGO AS \"logo\"");
columnMap.put("inffile", "t.INFFILE AS \"inffile\"");
columnMap.put("url", "t.URL AS \"url\"");
columnMap.put("boundary", "t.BOUNDARY AS \"boundary\"");
columnMap.put("height", "t.HEIGHT AS \"height\"");
columnMap.put("location", "t.LOCATION AS \"location\"");
columnMap.put("accuracy", "t.ACCURACY AS \"accuracy\"");
columnMap.put("inv", "t.INV AS \"inv\"");
columnMap.put("invinmn", "t.INVINMN AS \"invinmn\"");
columnMap.put("stdsdt", "t.STDSDT AS \"stdsdt\"");

6
backend/src/main/java/com/yfd/platform/qgc_lygk/along/domain/MsAlongDetB.java
View File

@ -41,7 +41,11 @@ public class MsAlongDetB implements Serializable {
/** 排序序号 */
@TableField("SORT")
private String sort;
private Integer sort;
// /** 排序序号 */
// @TableField("SORT")
// private String sort;
/** 沿程配置表ID */
@TableField("ALONG_ID")

4
backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongDetBServiceImpl.java
View File

@ -81,7 +81,7 @@ public class MsAlongDetBServiceImpl extends ServiceImpl<MsAlongDetBMapper, MsAlo
List<PowerDto> powerDtos = msAlongDetBMapper.getWbsbList(stcd);
if (CollUtil.isNotEmpty(powerDtos)) {
// 取第一个结果（通常一个 STCD 只对应一条记录）
String stnm = powerDtos.get(0).getStnm();
String stnm = powerDtos.getFirst().getStnm();
record.setStnm(stnm);
}
}
@ -154,7 +154,7 @@ public class MsAlongDetBServiceImpl extends ServiceImpl<MsAlongDetBMapper, MsAlo
entity.setRecordUser(SecurityUtils.getUserId()); // 创建人
//entity.setRecordUser(SecurityUtils.getCurrentUsername()); // 创建人
if (node.getSort() != null){
entity.setSort(String.valueOf(node.getSort())); // 若传了排序
entity.setSort(node.getSort()); // 若传了排序
}
if (StrUtil.isBlank(entity.getId())) {
entity.setId(null);