[FIX]修改机组管理

src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java

@@ -18,17 +18,11 @@ public class FangpaishuiUnitController {
     @Autowired
     private FangpaishuiUnitService fangpaishuiUnitService;
 
-    @Operation(summary = "查询所有机组")
+    @Operation(summary = "根据条件查询机组信息")
-    @GetMapping("findAllUnit")
+    @PostMapping("findUnitByDetail")
-    public Result findAllUnit() {
+    public Result findUnitByDetail(@RequestBody FangpaishuiUnitVo fangpaishuiUnitVo) {
-        List<FangpaishuiUnitVo> vos = fangpaishuiUnitService.findAllUnit();
+        List<FangpaishuiUnitVo> vos = fangpaishuiUnitService.findUnitByDetail(fangpaishuiUnitVo);
-        return Result.successResult().data("unitVos", vos);
+        return Result.successResult().data("vos", 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("updateUnit")

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);
 
 }
 

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="findUnitByDetail" parameterType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo" resultType="com.jdc.jdcproject.entity.VO.FangpaishuiUnitVo">
-    <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 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>

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);
 }

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) {
+    public List<FangpaishuiUnitVo> findUnitByDetail(FangpaishuiUnitVo vo) {
-        return baseMapper.findUnitById(id);
+        return baseMapper.findUnitByDetail(vo);
     }
 }