单警柜map修改

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

@@ -178,9 +178,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
      */
     @Override
     public List<CabinetDto> getAllCabinetList(CabinetReq req) {
-        // 判断组织机构是否存在
-        PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
-
         List<CabinetDto> cabinetList = new ArrayList<>();
         List<Cabinet> list = cabinetMapper.getAllCabinetsWithSingleCabinet(String.valueOf(req.getOrgId()), req.getContainType());
 
@@ -192,25 +189,19 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
             CabinetDto cabinetDto = new CabinetDto();
             BeanPlusUtil.copyProperties(cabinet, cabinetDto);
             List<CabinetBox> list1;
-            if (StringUtils.isNotBlank(req.getContainType())) {
-                list1 = cabinetBoxService.list(
-                        new LambdaQueryWrapper<CabinetBox>()
-                                .eq(CabinetBox::getCabinetId, cabinet.getId())
-                                .eq(CabinetBox::getContainType, req.getContainType())
-                );
-            } else {
+
                 list1 = cabinetBoxService.list(
                         new LambdaQueryWrapper<CabinetBox>()
                                 .eq(CabinetBox::getCabinetId, cabinet.getId())
+
+                                .orderByAsc(CabinetBox::getNum)  // 根据 Num 字段升序排序
                 );
-            }
+
             List<CabinetBoxDto> cabinetBoxList = new ArrayList<>();
             for (CabinetBox cabinetBox : list1) {
                 CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
                 BeanPlusUtil.copyProperties(cabinetBox, cabinetBoxDto);
                 // 查询箱门绑定的警员id和姓名
-//                List<Policeman> policeList = policemanService.list(new LambdaQueryWrapper<Policeman>()
-//                        .eq(Policeman::getCabinetBoxId, cabinetBox.getId()));
                 List<Policeman> policeList=cabinetBoxPoliceMapper.selectByBoxId(cabinetBox.getId());
                 if (policeList.size() != 0) {
                     Policeman policeman = policeList.get(0);

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

@@ -16,8 +16,10 @@
         <result property="createTime" column="create_time" />
         <result property="updateTime" column="update_time" />
         <result property="createUser" column="create_user" />
+        <result property="policeName" column="police_name" />
+        <result property="policeId" column="police_id" />
+        <result property="number" column="number" />
         <result property="updateUser" column="update_user" />
-        
 <!--        <collection property="list"  ofType="com.junmp.jyzb.entity.CabinetBox" column="cabinet_id"-->
 <!--        select="com.junmp.jyzb.mapper.CabinetBoxMapper.selectById">-->
 
@@ -73,16 +75,15 @@
     </foreach>
 </select>
     <select id="getAllCabinetsWithSingleCabinet" resultType="com.junmp.jyzb.entity.Cabinet">
-        SELECT c.*
+        SELECT c.*, cb.num as number,bp.`name` as police_name,bp.id as police_id
         FROM base_cabinet c
                  JOIN pub_org o ON c.org_id_int = o.org_id
-        WHERE c.org_id_int = #{orgId}
-          AND (#{containType} IS NULL OR #{containType} = '' OR EXISTS (
-            SELECT 1
-            FROM base_cabinet_box cb
-            WHERE cb.cabinet_id = c.id
-              AND cb.contain_type = #{containType}
-        ))
+                 LEFT JOIN base_cabinet_box cb ON cb.cabinet_id = c.id
+                 LEFT JOIN base_cabinet_box_police ccp ON ccp.cabinet_box_id = cb.id
+                 LEFT JOIN base_policeman bp ON bp.id = ccp.police_id
+        WHERE c.org_id_int = #{orgId} and cb.num is not null;
+
+
     </select>