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-04-24 08:32:59 +08:00
parent 89f2b34d56
commit 83dfd6c593
8 changed files with 87 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java
View File

@ -3,6 +3,7 @@ package com.yfd.platform.data.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -50,6 +51,12 @@ public class FishDraftDataVO implements Serializable {
*/
private String fwet;
/**
* 水温
*/
private BigDecimal wt;
/**
* 开始日期
*/
@ -180,6 +187,11 @@ public class FishDraftDataVO implements Serializable {
*/
private String baseId;
/**
* 所属基地名称（电站表）
*/
private String baseName;
/**
* 流域编码（电站表）
*/

9
backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java
View File

@ -25,7 +25,9 @@ public interface FishDraftDataMapper extends BaseMapper<FishDraftData> {
@Param("baseId") String baseId,
@Param("direction") String direction,
@Param("status") String status,
@Param("ftp") String ftp);
@Param("ftp") String ftp,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
/**
* 关联查询过鱼数据（不分页）
@ -34,7 +36,10 @@ public interface FishDraftDataMapper extends BaseMapper<FishDraftData> {
@Param("rstcd") String rstcd,
@Param("baseId") String baseId,
@Param("direction") String direction,
@Param("status") String status);
@Param("status") String status,
@Param("ftp") String ftp,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
/**
* 根据审批批次ID查询草稿数据

17
backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.yfd.platform.data.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.common.DataSourceLoadOptionsBase;
@ -47,9 +48,16 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
String ftp = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "ftp");
String direction = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "direction");
String status = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "status");
String TM = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "TM");
String startTime=null;
String endTime=null;
// 如果 startTime 和 endTime 为空，尝试从 TM 字段解析
if (StrUtil.isNotBlank(TM)&& TM.split( ",").length==2) {
startTime=TM.split(",")[0];
endTime=TM.split(",")[1];
}
Page<FishDraftDataVO> resultPage = fishDraftDataMapper.selectJoinPage(
page, stcd, rstcd, baseId, direction, status,ftp);
page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime);
return resultPage;
}
@ -61,8 +69,11 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
String baseId = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "baseId");
String direction = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "direction");
String status = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "status");
String ftp = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "ftp");
String startTime = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "startTime");
String endTime = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "endTime");
return fishDraftDataMapper.selectJoinList(stcd, rstcd, baseId, direction, status);
return fishDraftDataMapper.selectJoinList(stcd, rstcd, baseId, direction, status, ftp, startTime, endTime);
}
@Override

7
backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java vendored
View File

@ -58,10 +58,11 @@ public class SdFpssBHController {
}
@GetMapping("/dropdown")
@Operation(summary = "设施下拉列表（根据电站编码筛选 + 支持编码模糊搜索）")
@Operation(summary = "设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索 + 支持基地编码筛选）")
public ResponseResult dropdown(@RequestParam(required = false) String rstcd,
@RequestParam(required = false) String stnm) {
return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm));
@RequestParam(required = false) String stnm,
@RequestParam(required = false) String baseId) {
return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm, baseId));
}
@Log(module = "过鱼设施管理", value = "新增过鱼设施")

17
backend/src/main/java/com/yfd/platform/env/mapper/SdFpssBHMapper.java vendored
View File

@ -3,7 +3,24 @@ package com.yfd.platform.env.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.env.domain.SdFpssBH;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface SdFpssBHMapper extends BaseMapper<SdFpssBH> {
@Select("<script>" +
"SELECT F.* FROM SD_FPSS_B_H F " +
"LEFT JOIN SD_ENGINFO_B_H E ON F.RSTCD = E.STCD " +
"WHERE 1=1 " +
"<if test='baseId != null and baseId != \"\"'> AND E.BASE_ID = #{baseId} </if>" +
"<if test='rstcd != null and rstcd != \"\"'> AND F.RSTCD = #{rstcd} </if>" +
"<if test='stnm != null and stnm != \"\"'> AND F.STNM LIKE '%' || #{stnm} || '%' </if>" +
"ORDER BY F.ORDER_INDEX DESC" +
"</script>")
List<SdFpssBH> selectForDropdownWithBaseId(@Param("rstcd") String rstcd,
@Param("stnm") String stnm,
@Param("baseId") String baseId);
}

4
backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java vendored
View File

@ -13,9 +13,9 @@ public interface ISdFpssBHService extends IService<SdFpssBH> {
List<SdFpssBH> getByRstcd(String rstcd);
/**
* 设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索）
* 设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索 + 支持基地编码筛选）
*/
List<SdFpssBH> selectForDropdown(String rstcd, String stnm);
List<SdFpssBH> selectForDropdown(String rstcd, String stnm, String baseId);
boolean add(SdFpssBH sdFpssBH);

17
backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java vendored
View File

@ -43,13 +43,16 @@ public class SdFpssBHServiceImpl extends ServiceImpl<SdFpssBHMapper, SdFpssBH> i
}
@Override
public List<SdFpssBH> selectForDropdown(String rstcd, String stnm) {
LambdaQueryWrapper<SdFpssBH> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.hasText(rstcd), SdFpssBH::getRstcd, rstcd)
.like(StringUtils.hasText(stnm), SdFpssBH::getStnm, stnm)
.select(SdFpssBH::getStcd, SdFpssBH::getStnm, SdFpssBH::getSttp,SdFpssBH::getRstcd)
.orderByDesc(SdFpssBH::getOrderIndex);
return list(wrapper);
public List<SdFpssBH> selectForDropdown(String rstcd, String stnm, String baseId) {
if (StringUtils.hasText(baseId)) {
return baseMapper.selectForDropdownWithBaseId(rstcd, stnm, baseId);
} else {
LambdaQueryWrapper<SdFpssBH> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.hasText(rstcd), SdFpssBH::getRstcd, rstcd)
.like(StringUtils.hasText(stnm), SdFpssBH::getStnm, stnm)
.orderByDesc(SdFpssBH::getOrderIndex);
return list(wrapper);
}
}
@Override

22
backend/src/main/resources/mapper/data/FishDraftDataMapper.xml
View File

@ -46,6 +46,7 @@
<result column="ENDDT" property="enddt"/>
<result column="DIRECTION" property="direction"/>
<result column="YR" property="yr"/>
<result column="WT" property="wt"/>
<result column="MOUTH" property="mouth"/>
<result column="VDPTH" property="vdpth"/>
<result column="PICPTH" property="picpth"/>
@ -68,6 +69,7 @@
<result column="RSTCD" property="rstcd"/>
<result column="ENNM" property="ennm"/>
<result column="BASE_ID" property="baseId"/>
<result column="BASENAME" property="baseName"/>
<result column="RVCD" property="rvcd"/>
<result column="LGTD" property="lgtd"/>
<result column="LTTD" property="lttd"/>
@ -86,6 +88,7 @@
D.ENDDT,
D.DIRECTION,
D.YR,
D.WT,
D.MOUTH,
D.VDPTH,
D.PICPTH,
@ -108,6 +111,7 @@
F.RSTCD,
E.ENNM,
E.BASE_ID,
H.BASENAME,
E.RVCD,
E.LGTD,
E.LTTD,
@ -120,11 +124,12 @@
FROM FISH_DRAFT_DATA D
LEFT JOIN SD_FPSS_B_H F ON D.STCD = F.STCD
LEFT JOIN SD_ENGINFO_B_H E ON F.RSTCD = E.STCD
LEFT JOIN SD_HYDROBASE H ON E.BASE_ID = H.BASEID
WHERE D.DELETED_FLAG = 0
<if test="stcd != null and stcd != ''">
AND D.STCD = #{stcd}
</if>
<if test="stcd != null and stcd != ''">
<if test="ftp != null and ftp != ''">
AND D.FTP = #{ftp}
</if>
<if test="rstcd != null and rstcd != ''">
@ -139,6 +144,12 @@
<if test="status != null and status != ''">
AND D.STATUS = #{status}
</if>
<if test="startTime != null and startTime != ''">
AND D.TM &gt;= TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="endTime != null and endTime != ''">
AND D.TM &lt;= TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
ORDER BY D.CREATED_AT DESC
</select>
@ -152,6 +163,9 @@
<if test="stcd != null and stcd != ''">
AND D.STCD = #{stcd}
</if>
<if test="ftp != null and ftp != ''">
AND D.FTP = #{ftp}
</if>
<if test="rstcd != null and rstcd != ''">
AND F.RSTCD = #{rstcd}
</if>
@ -164,6 +178,12 @@
<if test="status != null and status != ''">
AND D.STATUS = #{status}
</if>
<if test="startTime != null and startTime != ''">
AND D.TM &gt;= TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="endTime != null and endTime != ''">
AND D.TM &lt;= TO_DATE(#{endTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
ORDER BY D.CREATED_AT DESC
</select>