diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java index c01fd42e..c234fe73 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java @@ -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; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index 5b90ab7f..848a7c49 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -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().eq(SdEngInfoBH::getStcd, stcd).set(SdEngInfoBH::getIsDeleted, 1)); +// return this.removeById(stcd); } @Override @@ -489,6 +491,11 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl