修改单警柜接口

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Cabinet.java

@@ -93,6 +93,7 @@ public class Cabinet implements Serializable {
      */
     @ApiModelProperty(value = "主柜配置信息")
     private String config;
+
     /**
      * 库存总价
      */

jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBox.java

@@ -79,7 +79,7 @@ public class CabinetBox implements Serializable {
      * 箱门类型：1单警柜，2公共柜
      */
     @ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
-    @TableField("box_type")
+    @TableField("contain_type")
     private Integer boxType;
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java

@@ -13,7 +13,7 @@ import java.util.Map;
 public interface CabinetMapper extends BaseMapper<Cabinet> {
 
     List<Cabinet> getAllCabinetByOrgList(@Param("list") List<Long> allOrgId);
-    List<Cabinet> getAllCabinetsWithSingleCabinet(@Param("orgId")String id, @Param("boxType") String boxType);
+    List<Cabinet> getAllCabinetsWithSingleCabinet(@Param("orgId")String id, @Param("containType") String containType);
 
     boolean SetInventoryInfo(String id);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.CabinetDto;
@@ -193,8 +194,19 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
         for (Cabinet cabinet : list) {
             CabinetDto cabinetDto = new CabinetDto();
             BeanPlusUtil.copyProperties(cabinet, cabinetDto);
-            List<CabinetBox> list1 = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
-                    .eq(CabinetBox::getCabinetId, cabinet.getId()));
+            List<CabinetBox> list1;
+            if (StringUtils.isNotBlank(req.getContainType())) {
+                list1 = cabinetBoxService.list(
+                        new LambdaQueryWrapper<CabinetBox>()
+                                .eq(CabinetBox::getCabinetId, cabinet.getId())
+                                .eq(CabinetBox::getBoxType, req.getContainType())
+                );
+            } else {
+                list1 = cabinetBoxService.list(
+                        new LambdaQueryWrapper<CabinetBox>()
+                                .eq(CabinetBox::getCabinetId, cabinet.getId())
+                );
+            }
             List<CabinetBoxDto> cabinetBoxList = new ArrayList<>();
             for (CabinetBox cabinetBox : list1) {
                 CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();

jyzb-biz/src/main/resources/mapper/CabinetMapper.xml

@@ -77,12 +77,14 @@
         FROM base_cabinet c
                  JOIN pub_org o ON c.org_id_int = o.org_id
         WHERE c.org_id_int = #{orgId}
-          AND (#{boxType} IS NULL OR #{boxType} = '' OR EXISTS (
+          AND (#{containType} IS NULL OR #{containType} = '' OR EXISTS (
             SELECT 1
             FROM base_cabinet_box cb
             WHERE cb.cabinet_id = c.id
-              AND cb.box_type = #{boxType}
-        ))
+              AND cb.contain_type = #{containType}
+        ));
+
+
     </select>