From 8ff089bfadb6f261d14a4e2f406872289100164c Mon Sep 17 00:00:00 2001
From: chengjunwang <952621270@qq.com>
Date: Wed, 7 May 2025 13:37:12 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E4=BF=AE=E6=94=B9=E6=9C=BA=E7=BB=84?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/FangpaishuiUnitController.java | 16 ++++---------
.../mapper/FangpaishuiUnitMapper.java | 3 +--
.../mapper/xml/FangpaishuiUnitMapper.xml | 23 ++++++++++---------
.../service/FangpaishuiUnitService.java | 3 +--
.../impl/FangpaishuiUnitServiceImpl.java | 8 ++-----
5 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java b/src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java
index c40fc93..75e3e0f 100644
--- a/src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java
+++ b/src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java
@@ -18,17 +18,11 @@ public class FangpaishuiUnitController {
@Autowired
private FangpaishuiUnitService fangpaishuiUnitService;
- @Operation(summary = "查询所有机组")
- @GetMapping("findAllUnit")
- public Result findAllUnit() {
- List<FangpaishuiUnitVo> vos = fangpaishuiUnitService.findAllUnit();
- return Result.successResult().data("unitVos", vos);
- }
- @Operation(summary = "根据id查询机组信息")
- @GetMapping("findUnitById/{id}")
- public Result findEquipmentById(@PathVariable int id) {
- FangpaishuiUnitVo vo = fangpaishuiUnitService.findUnitById(id);
- return Result.successResult().data("vo", vo);
+ @Operation(summary = "根据条件查询机组信息")
+ @PostMapping("findUnitByDetail")
+ public Result findUnitByDetail(@RequestBody FangpaishuiUnitVo fangpaishuiUnitVo) {
+ List<FangpaishuiUnitVo> vos = fangpaishuiUnitService.findUnitByDetail(fangpaishuiUnitVo);
+ return Result.successResult().data("vos", vos);
}
@Operation(summary = "修改机组信息")
@PostMapping("updateUnit")
diff --git a/src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java b/src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java
index 86774ee..019881e 100644
--- a/src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java
+++ b/src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java
@@ -15,9 +15,8 @@ import java.util.List;
*/
public interface FangpaishuiUnitMapper extends BaseMapper<FangpaishuiUnit> {
- List<FangpaishuiUnitVo> findAllUnit();
- FangpaishuiUnitVo findUnitById(int id);
+ List<FangpaishuiUnitVo> findUnitByDetail(FangpaishuiUnitVo vo);
}
diff --git a/src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml b/src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml
index 1b3af31..23f7832 100644
--- a/src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml
+++ b/src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml
@@ -4,20 +4,21 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jdc.jdcproject.mapper.FangpaishuiUnitMapper">
- <!-- 关联设备表获取设备名称 -->
- <select id="findAllUnit" resultType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo">
- select fn.*,
- e.equipmentName
- FROM fangpaishui_unit fn
- LEFT JOIN equipment e ON e.EquipmentId = fn.EquipmentId
-
- </select>
-
- <select id="findUnitById" resultType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo">
+ <select id="findUnitByDetail" parameterType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo" resultType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo">
select fn.*,
e.equipmentName
FROM fangpaishui_unit fn
LEFT JOIN equipment e ON e.EquipmentId = fn.EquipmentId
- where fn.UnitID = #{id}
+ <where>
+ <if test="UnitID !=0">
+ and fn.UnitID = #{UnitID}
+ </if>
+ <if test="equipmentName !=null">
+ and e.equipmentName like concat(concat('%',#{equipmentName}),'%')
+ </if>
+ <if test="UnitCode !=null">
+ and fn.UnitCode like concat(concat('%',#{UnitCode}),'%')
+ </if>
+ </where>
</select>
</mapper>
diff --git a/src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java b/src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java
index a01667e..deac6dc 100644
--- a/src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java
+++ b/src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java
@@ -14,7 +14,6 @@ import java.util.List;
*/
public interface FangpaishuiUnitService extends IService<FangpaishuiUnit> {
- List<FangpaishuiUnitVo> findAllUnit();
- FangpaishuiUnitVo findUnitById(int id);
+ List<FangpaishuiUnitVo> findUnitByDetail(FangpaishuiUnitVo vo);
}
diff --git a/src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java b/src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java
index 094d430..6d8d742 100644
--- a/src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java
+++ b/src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java
@@ -18,14 +18,10 @@ import java.util.List;
public class FangpaishuiUnitServiceImpl extends ServiceImpl<FangpaishuiUnitMapper, FangpaishuiUnit>
implements FangpaishuiUnitService{
- @Override
- public List<FangpaishuiUnitVo> findAllUnit() {
- return baseMapper.findAllUnit();
- }
@Override
- public FangpaishuiUnitVo findUnitById(int id) {
- return baseMapper.findUnitById(id);
+ public List<FangpaishuiUnitVo> findUnitByDetail(FangpaishuiUnitVo vo) {
+ return baseMapper.findUnitByDetail(vo);
}
}