代码优化

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/equip/api/entity/box/EquipBoxCard.java

@@ -28,7 +28,8 @@ public class EquipBoxCard extends CommonEntity implements Serializable {
 
     /**0:启用，1：禁用*/
     private String status;
-
+    /**网卡卡商 */
+    private String company;
     /**卡是否已使用在标本箱上（0.否 1.是）*/
     private Integer isUsed;
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/equip/EquipBoxCardController.java

@@ -5,6 +5,7 @@ package com.cloud.kicc.commonbiz.controller.equip;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.commonbiz.service.box.EquipBoxCardService;
@@ -14,6 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 物联网卡管理(EquipBoxCard)表控制层
@@ -101,5 +103,17 @@ public class EquipBoxCardController {
         this.equipBoxCardService.removeByIds(Arrays.asList(id));
         return R.ok();
     }
-
+    private LambdaQueryWrapper<EquipBoxCard> getQueryWrapper(EquipBoxCard equipBoxCard){
+        return Wrappers.<EquipBoxCard>lambdaQuery()
+                .like(StrUtil.isNotBlank(equipBoxCard.getIccid()),EquipBoxCard::getIccid,equipBoxCard.getIccid())
+                .like(StrUtil.isNotBlank(equipBoxCard.getCard()),EquipBoxCard::getCard,equipBoxCard.getCard())
+                .like(StrUtil.isNotBlank(equipBoxCard.getCompany()),EquipBoxCard::getCompany,equipBoxCard.getCompany())
+                .between(StrUtil.isNotBlank(equipBoxCard.getBeginTime()) && StrUtil.isNotBlank(equipBoxCard.getEndTime()),EquipBoxCard::getCreateTime,equipBoxCard.getBeginTime(),equipBoxCard.getEndTime())
+                .orderByAsc(EquipBoxCard::getIccid);
+    }
+    @GetMapping("/list")
+    public R list(EquipBoxCard equipBoxCard){
+        List<EquipBoxCard> boxCardList = equipBoxCardService.list(getQueryWrapper(equipBoxCard));
+        return R.ok(boxCardList,boxCardList.size());
+    }
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java

@@ -146,13 +146,16 @@ public class AddressController {
 
 
     private LambdaQueryWrapper<Address> getQueryWrapper(Address address) {
+
         return  Wrappers.<Address>lambdaQuery()
                 .like(StrUtil.isNotBlank(address.getName()), Address::getName,address.getName())
                 .eq(StrUtil.isNotBlank(address.getParentId()), Address::getParentId, address.getParentId())
                 .between(StrUtil.isNotBlank(address.getBeginTime()) && StrUtil.isNotBlank(address.getEndTime()), Address::getCreateTime, address.getBeginTime(), address.getEndTime())
                 .like(StrUtil.isNotBlank(address.getCode()),Address::getCode, address.getCode())
                 .orderByAsc(Address::getSort);
+
     }
+
 //    /**
 //     * 根据parentIds列表查询list
 //     * @return