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-06-22 15:45:55 +08:00
parent c07a73e201
commit 719a18934e
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java
View File

@ -34,6 +34,7 @@ public class EngVmsstbprptVo implements Serializable {
private Date aiodt;
private String bldstt;
private Integer bldsttCcode;
private String bldsttCcodeName;
private Double nrupar;
private Double dstcrvr;
private Double avyrp;
@ -80,6 +81,7 @@ public class EngVmsstbprptVo implements Serializable {
private Double ddcp;
private Double cpsc;
private String rgcp;
private String rgcpName;
private Double dsflzmxq;
private Double dsflzxyz;
private Double ckflzmxq;
@ -103,7 +105,9 @@ public class EngVmsstbprptVo implements Serializable {
private Double unyge;
private Double gap;
private String dvtp;
private String dvtpName;
private Integer dtin;
private String dtinName;
private Integer baseStepSort;
private Integer rvcdStepSort;
private Integer rstcdStepSort;

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

@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.common.DataSourceLoadOptionsBase;
@ -199,7 +200,8 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
@Override
public boolean deleteEngInfo(String stcd) {
return this.removeById(stcd);
return this.update( new LambdaUpdateWrapper<SdEngInfoBH>().eq(SdEngInfoBH::getStcd, stcd).set(SdEngInfoBH::getIsDeleted, 1));
// return this.removeById(stcd);
}
@Override
@ -489,6 +491,11 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"eng.AIODT AS aiodt, " +
"eng.BLDSTT AS bldstt, " +
"eng.BLDSTT_CODE AS bldsttCcode, " +
"CASE " +
" WHEN eng.BLDSTT_CODE = 0 OR eng.BLDSTT_CODE IS NULL THEN '未建/规划' " +
" WHEN eng.BLDSTT_CODE = 1 THEN '在建' " +
" WHEN eng.BLDSTT_CODE = 2 THEN '已建' " +
" ELSE NULL END AS bldsttCcodeName, " +
"eng.NRUPAR AS nrupar, " +
"eng.DSTCRVR AS dstcrvr, " +
"eng.AVYRP AS avyrp, " +
@ -535,6 +542,17 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"CAST(NULL AS NUMBER) AS ddcp, " +
"eng.CPSC AS cpsc, " +
"eng.RGCP AS rgcp, " +
"CASE eng.RGCP " +
" WHEN '1' THEN '多年调节' " +
" WHEN '2' THEN '年调节' " +
" WHEN '3' THEN '不完全年调节' " +
" WHEN '4' THEN '径流式（无调节）' " +
" WHEN '5' THEN '季调节' " +
" WHEN '6' THEN '月调节' " +
" WHEN '7' THEN '周调节' " +
" WHEN '8' THEN '日调节' " +
" WHEN '9' THEN '其他' " +
" ELSE NULL END AS rgcpName, " +
"eng.DSMXQ AS dsflzmxq, " +
"CAST(NULL AS NUMBER) AS dsflzxyz, " +
"eng.CHMXQ AS ckflzmxq, " +
@ -558,7 +576,16 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"CAST(NULL AS NUMBER) AS unyge, " +
"eng.GAP AS gap, " +
"eng.DVTP AS dvtp, " +
"CASE eng.DVTP " +
" WHEN '1' THEN '堤坝式' " +
" WHEN '2' THEN '引水式' " +
" WHEN '3' THEN '混合式' " +
" ELSE NULL END AS dvtpName, " +
"eng.DTIN AS dtin, " +
"CASE NVL(eng.DTIN, 0) " +
" WHEN 0 THEN '否' " +
" WHEN 1 THEN '是' " +
" ELSE NULL END AS dtinName, " +
"NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " +
"NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " +
"NVL(rstSort.SORT, 999999) AS rstcdStepSort, " +
@ -630,6 +657,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
columns.put("aiodt", "t.aiodt AS aiodt");
columns.put("bldstt", "t.bldstt AS bldstt");
columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode");
columns.put("bldsttCcodeName", "t.bldsttCcodeName AS bldsttCcodeName");
columns.put("nrupar", "t.nrupar AS nrupar");
columns.put("dstcrvr", "t.dstcrvr AS dstcrvr");
columns.put("avyrp", "t.avyrp AS avyrp");
@ -676,6 +704,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
columns.put("ddcp", "t.ddcp AS ddcp");
columns.put("cpsc", "t.cpsc AS cpsc");
columns.put("rgcp", "t.rgcp AS rgcp");
columns.put("rgcpName", "t.rgcpName AS rgcpName");
columns.put("dsflzmxq", "t.dsflzmxq AS dsflzmxq");
columns.put("dsflzxyz", "t.dsflzxyz AS dsflzxyz");
columns.put("ckflzmxq", "t.ckflzmxq AS ckflzmxq");
@ -699,7 +728,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
columns.put("unyge", "t.unyge AS unyge");
columns.put("gap", "t.gap AS gap");
columns.put("dvtp", "t.dvtp AS dvtp");
columns.put("dvtpName", "t.dvtpName AS dvtpName");
columns.put("dtin", "t.dtin AS dtin");
columns.put("dtinName", "t.dtinName AS dtinName");
columns.put("baseStepSort", "t.baseStepSort AS baseStepSort");
columns.put("rvcdStepSort", "t.rvcdStepSort AS rvcdStepSort");
columns.put("rstcdStepSort", "t.rstcdStepSort AS rstcdStepSort");