fix:修复模具组设备查询

yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java

@@ -50,6 +50,9 @@ public class MoldBrandPageReqVO extends PageParam {
     @Schema(description = "设备名称", example = "注塑机")
     private String deviceName;
 
+    @Schema(description = "当前设备，模糊匹配设备名称", example = "注塑机")
+    private String currentDevice;
+
     @Schema(description = "预期寿命(小时)")
     private BigDecimal useTime;
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java

@@ -215,6 +215,7 @@ public class MoldBrandServiceImpl implements MoldBrandService {
 
     @Override
     public PageResult<MoldBrandRespVO> getMoldBrandPage(MoldBrandPageReqVO pageReqVO) {
+        applyCurrentDeviceFilter(pageReqVO);
         if (StrUtil.isNotBlank(pageReqVO.getDeviceName())) {
             List<MoldBrandDO> filteredList = selectByDeviceName(pageReqVO);
             List<MoldBrandDO> pageList = paginateList(filteredList, pageReqVO);
@@ -241,6 +242,7 @@ public class MoldBrandServiceImpl implements MoldBrandService {
     @Override
     public MoldBrandStatusStatisticsRespVO getMoldBrandStatusStatistics(MoldBrandPageReqVO pageReqVO) {
         MoldBrandPageReqVO statisticsReqVO = BeanUtils.toBean(pageReqVO, MoldBrandPageReqVO.class);
+        applyCurrentDeviceFilter(statisticsReqVO);
         statisticsReqVO.setStatus(null);
         List<MoldBrandDO> list = StrUtil.isNotBlank(statisticsReqVO.getDeviceName())
                 ? selectByDeviceName(statisticsReqVO)
@@ -363,6 +365,12 @@ public class MoldBrandServiceImpl implements MoldBrandService {
         return latestOperateMap;
     }
 
+    private void applyCurrentDeviceFilter(MoldBrandPageReqVO reqVO) {
+        if (reqVO != null && StrUtil.isBlank(reqVO.getDeviceName()) && StrUtil.isNotBlank(reqVO.getCurrentDevice())) {
+            reqVO.setDeviceName(reqVO.getCurrentDevice());
+        }
+    }
+
     private void fillCurrentDeviceNameByLatestOperate(MoldBrandRespVO item, MoldOperateSimpleDO latestOperate) {
         if (latestOperate == null) {
             item.setDeviceName(null);