1

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

@@ -108,6 +108,8 @@ public class Cabinet implements Serializable {
     private Date updateTime;
 
 
+
+
     /**
      * 新增人员
      */
@@ -128,6 +130,13 @@ public class Cabinet implements Serializable {
     @ApiModelProperty(value = "箱数")
     private Integer num;
 
+    private String policeName;
+
+
+    private Long policeId;
+
+    private Integer number;
+
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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("containType") String containType);
+    List<Cabinet> getAllCabinetsWithSingleCabinet(@Param("orgId")String id);
 
     boolean SetInventoryInfo(String id);
 }
\ No newline at end of file

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

@@ -179,7 +179,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
     @Override
     public List<CabinetDto> getAllCabinetList(CabinetReq req) {
         List<CabinetDto> cabinetList = new ArrayList<>();
-        List<Cabinet> list = cabinetMapper.getAllCabinetsWithSingleCabinet(String.valueOf(req.getOrgId()), req.getContainType());
+        List<Cabinet> list = cabinetMapper.getAllCabinetsWithSingleCabinet(String.valueOf(req.getOrgId()));
 
         if (list.size() == 0) {
             return new ArrayList<>();
@@ -202,12 +202,12 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
                 CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
                 BeanPlusUtil.copyProperties(cabinetBox, cabinetBoxDto);
                 // 查询箱门绑定的警员id和姓名
-                List<Policeman> policeList=cabinetBoxPoliceMapper.selectByBoxId(cabinetBox.getId());
-                if (policeList.size() != 0) {
-                    Policeman policeman = policeList.get(0);
-                    cabinetBoxDto.setPoliceId(policeman.getId());
-                    cabinetBoxDto.setPoliceName(policeman.getName());
-                }
+//                List<Policeman> policeList=cabinetBoxPoliceMapper.selectByBoxId(cabinetBox.getId());
+//                if (policeList.size() != 0) {
+//                    Policeman policeman = policeList.get(0);
+//                    cabinetBoxDto.setPoliceId(policeman.getId());
+//                    cabinetBoxDto.setPoliceName(policeman.getName());
+//                }
                 cabinetBoxDto.setNum(cabinetBox.getNum());
                 cabinetBoxList.add(cabinetBoxDto);
             }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.CabinetMapper">
-    <resultMap id="BaseCabinetResultMap" type="com.junmp.jyzb.entity.Cabinet">
+    <resultMap id="cabinetResultMap" type="com.junmp.jyzb.entity.Cabinet">
         <id property="id" column="id" />
         <result property="cabinetNum" column="cabinet_num" />
         <result property="name" column="name" />