feat: 设备管理优化-0510

src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java

@@ -0,0 +1,68 @@
+package com.glxp.api.controller.dev;
+
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailService;
+import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceMiniController extends BaseController {
+
+    private final DeviceRepairApplyDetailService deviceRepairApplyDetailService;
+    private final DeviceCheckDetailService deviceCheckDetailService;
+
+    /**
+     * 获取明细报修单列表分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/mini/page")
+    public BaseResponse miniPage(@RequestBody @Valid DeviceRepairApplyDetailMiniQuery query) {
+        List<DeviceRepairApplyDetailMiniResponse> list = deviceRepairApplyDetailService.miniPage(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 巡检任务单明细列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/mini/page")
+    public BaseResponse miniPage(@RequestBody @Valid DeviceCheckDetailMiniQuery query) {
+        List<DeviceCheckDetailEntity> list = deviceCheckDetailService.miniPage(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java

@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -57,9 +58,15 @@ public class DeviceRepairApplyController extends BaseController {
     @PostMapping("/udi/device/repair/apply/hall/page")
     public BaseResponse adminPage(@RequestBody DeviceRepairApplyHallQuery query) {
         DeviceRepairApplyQuery applyQuery = new DeviceRepairApplyQuery();
-        applyQuery.setStatus(DeviceRepairApplyStatusEnum.WAIT_PROCESS);
+        ArrayList<DeviceRepairApplyStatusEnum> statusEnums = new ArrayList<>();
-        applyQuery.setApplyId(query.getApplyId());
+        if (query.getIsFinish() == 1){
-        applyQuery.setApplyDeptCode(query.getApplyDeptCode());
+            statusEnums.add(DeviceRepairApplyStatusEnum.FINISH);
+        }else {
+            statusEnums.add(DeviceRepairApplyStatusEnum.WAIT_PROCESS);
+            statusEnums.add(DeviceRepairApplyStatusEnum.PROCESSING);
+        }
+        applyQuery.setStatuss(statusEnums);
+        BeanUtil.copyProperties(query,applyQuery);
         List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(applyQuery);
         PageInfo pageInfo = new PageInfo<>(list);
         PageSimpleResponse page = new PageSimpleResponse();

src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java

@@ -2,6 +2,11 @@ package com.glxp.api.dao.dev;
 
 import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author Administrator
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface DeviceRepairApplyDetailMapper extends BaseMapper<DeviceRepairApplyDetailEntity> {
 
+    List<DeviceRepairApplyDetailMiniResponse> miniPage(@Param("param") DeviceRepairApplyDetailMiniQuery query);
 }
 
 

src/main/java/com/glxp/api/enums/dev/DeviceRepairApplyDetailStatusEnum.java

@@ -11,10 +11,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DeviceRepairApplyDetailStatusEnum {
 
-    WAIT_DIAGNOSIS("wait_diagnosis", "待诊断"),
+    WAIT_DIAGNOSIS("wait_diagnosis", "待受理"),
 //    WAIT_REPAIR("wait_repair", "待维修"),
     REPAIRING("repairing", "维修中"),
-    FINISH("finish", "完成");
+    FINISH("finish", "已完成");
 
 
     @EnumValue

src/main/java/com/glxp/api/enums/dev/DeviceRepairApplyStatusEnum.java

@@ -11,10 +11,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DeviceRepairApplyStatusEnum {
 
-    WAIT_PROCESS("wait_process", "待受理"),
+    WAIT_PROCESS("wait_process", "未受理"),
-    PROCESSING("processing", "受理中"),
+    PROCESSING("processing", "部分受理"),
 //    REPAIRING("repairing", "维修中"),
-    FINISH("finish", "完成");
+    FINISH("finish", "已完成");
 
 
     @EnumValue

src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java

@@ -0,0 +1,29 @@
+package com.glxp.api.req.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceCheckDetailMiniQuery extends ListPageRequest {
+
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少部门编码")
+    private String deptCode;
+
+    /**
+     * 模糊设备码和UDI
+     */
+    private String deviceCodeAndUdi;
+
+    /**
+     * 是否完成
+     */
+    private Boolean finishFlag;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java

@@ -9,6 +9,13 @@ import javax.validation.constraints.NotNull;
 
 @Data
 public class DeviceInfoDetailByDeptCodeQuery  extends ListPageRequest {
+
+
+    /**
+     * 模糊设备码和UDI
+     */
+    private String deviceCodeAndUdi;
+
     /**
      * 部门编码
      */

src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java

@@ -68,4 +68,7 @@ public class DeviceInfoDetailQuery extends ListPageRequest {
     private String zczbhhzbapzbh;
 
 
+    private String deviceCodeAndUdi;
+
+
 }

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailMiniQuery.java

@@ -0,0 +1,28 @@
+package com.glxp.api.req.dev;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DeviceRepairApplyDetailMiniQuery extends ListPageRequest {
+
+    /**
+     * 部门编码
+     */
+    @NotBlank(message = "缺少部门编码")
+    private String deptCode;
+
+    /**
+     * 模糊设备码和UDI
+     */
+    private String deviceCodeAndUdi;
+
+    /**
+     * 状态  待诊断、待维修、维修中、完成',
+     */
+    private String status;
+
+
+}

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java

@@ -14,4 +14,6 @@ public class DeviceRepairApplyHallQuery extends ListPageRequest {
      */
     String applyDeptCode;
 
+    Integer isFinish;
+
 }

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyQuery.java

@@ -4,6 +4,8 @@ import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class DeviceRepairApplyQuery extends ListPageRequest {
 
@@ -33,4 +35,6 @@ public class DeviceRepairApplyQuery extends ListPageRequest {
      */
     String repairInfo;
 
+    List<DeviceRepairApplyStatusEnum> statuss;
+
 }

src/main/java/com/glxp/api/res/dev/DeviceRepairApplyDetailMiniResponse.java

@@ -0,0 +1,202 @@
+package com.glxp.api.res.dev;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class DeviceRepairApplyDetailMiniResponse {
+
+    /**
+     * 报修单id
+     */
+    @TableField(value = "applyId")
+    private Long applyId;
+
+    /**
+     * 设备编码
+     */
+    @TableField(value = "deviceCode")
+    private String deviceCode;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 部门名称
+     */
+    @TableField(value = "deptName")
+    private String deptName;
+
+    /**
+     * 问题描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 诊断信息
+     */
+    @TableField(value = "diagnosisInfo")
+    private String diagnosisInfo;
+
+    /**
+     * 状态  待诊断、待维修、维修中、完成
+     */
+    @TableField(value = "status")
+    private DeviceRepairApplyDetailStatusEnum status;
+
+    /**
+     * 是否需要维修 true/false
+     */
+    @TableField(value = "repairFlag")
+    private Boolean repairFlag;
+
+    /**
+     * 维修单id
+     */
+    @TableField(value = "repairId")
+    private Long repairId;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productId")
+    private Long productId;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udi")
+    private String udi;
+
+    /**
+     * DI码
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    private String productName;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+
+
+    /**
+     * 报修单id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+//    /**
+//     * 状态 待受理，受理中，维修中，完成
+//     */
+//    @TableField(value = "status")
+//    private DeviceRepairApplyStatusEnum status;
+
+    /**
+     * 报修部门编码
+     */
+    @TableField(value = "applyDeptCode")
+    private String applyDeptCode;
+
+    /**
+     * 报修部门
+     */
+    @TableField(value = "applyDeptName")
+    private String applyDeptName;
+
+    /**
+     * 报修人id
+     */
+    @TableField(value = "applyUserId")
+    private Long applyUserId;
+
+    /**
+     * 报修人姓名
+     */
+    @TableField(value = "applyUserName")
+    private String applyUserName;
+
+    /**
+     * 报修人联系方式
+     */
+    @TableField(value = "applyUserPhone")
+    private String applyUserPhone;
+
+    /**
+     * 报修时间
+     */
+    @TableField(value = "applyTime")
+    private LocalDateTime applyTime;
+
+    /**
+     * 设备数量
+     */
+    @TableField(value = "deviceCount")
+    private Integer deviceCount;
+
+    /**
+     * 完成数量
+     */
+    @TableField(value = "finishCount")
+    private Integer finishCount;
+
+    /**
+     * 确认部门
+     */
+    @TableField(value = "confirmDeptCode")
+    private String confirmDeptCode;
+
+    /**
+     * 确认部门名称
+     */
+    @TableField(value = "confirmDeptName")
+    private String confirmDeptName;
+
+    /**
+     * 确认人id
+     */
+    @TableField(value = "confirmUserId")
+    private Long confirmUserId;
+
+    /**
+     * 确认人姓名
+     */
+    @TableField(value = "confirmUserName")
+    private String confirmUserName;
+
+    /**
+     * 确认人联系方式
+     */
+    @TableField(value = "confirmPhone")
+    private String confirmPhone;
+
+    /**
+     * 确认时间
+     */
+    @TableField(value = "confirmTime")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "finishTime")
+    private LocalDateTime finishTime;
+
+}

src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.dev;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery;
 import com.glxp.api.req.dev.DeviceCheckDetailParam;
 import com.glxp.api.req.dev.DeviceCheckDetailQuery;
 import com.glxp.api.req.dev.DeviceCheckDetailRepairParam;
@@ -32,4 +33,5 @@ public interface DeviceCheckDetailService extends IService<DeviceCheckDetailEnti
 
     void finish(DeviceCheckDetailParam param, AuthAdmin user);
 
+    List<DeviceCheckDetailEntity> miniPage(DeviceCheckDetailMiniQuery query);
 }

src/main/java/com/glxp/api/service/dev/DeviceRepairApplyDetailService.java

@@ -5,8 +5,10 @@ import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
 import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam;
+import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
 import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery;
 import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
 
 import java.util.List;
 
@@ -34,4 +36,6 @@ public interface DeviceRepairApplyDetailService extends IService<DeviceRepairApp
     void finishDeviceRepair(Long applyId, String deviceCode);
 
     DeviceRepairApplyDetailEntity listByIdAndCode(DeviceRepairApplyListByIdAndCodeQuery query);
+
+    List<DeviceRepairApplyDetailMiniResponse> miniPage(DeviceRepairApplyDetailMiniQuery query);
 }

src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java

@@ -3,6 +3,8 @@ package com.glxp.api.service.dev.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -12,10 +14,7 @@ import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
 import com.glxp.api.entity.dev.DeviceRepairEntity;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
 import com.glxp.api.exception.JsonException;
-import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam;
+import com.glxp.api.req.dev.*;
-import com.glxp.api.req.dev.DeviceCheckDetailParam;
-import com.glxp.api.req.dev.DeviceCheckDetailQuery;
-import com.glxp.api.req.dev.DeviceCheckDetailRepairParam;
 import com.glxp.api.service.dev.*;
 import com.glxp.api.dao.dev.DeviceCheckDetailMapper;
 import com.glxp.api.util.IntUtil;
@@ -145,6 +144,26 @@ public class DeviceCheckDetailServiceImpl extends ServiceImpl<DeviceCheckDetailM
     @Override
     public void finish(DeviceCheckDetailParam param, AuthAdmin user) {
     }
+
+    @Override
+    public List<DeviceCheckDetailEntity> miniPage(DeviceCheckDetailMiniQuery query) {
+        if (query.getPage() != null) {
+            PageHelper.startPage(query.getPage(), query.getLimit());
+        }
+        LambdaQueryWrapper<DeviceCheckDetailEntity> queryWrapper = Wrappers.lambdaQuery(DeviceCheckDetailEntity.class)
+                .eq(DeviceCheckDetailEntity::getDeptCode, query.getDeptCode());
+        if (StrUtil.isNotBlank(query.getDeviceCodeAndUdi())) {
+            queryWrapper.and(qW -> {
+                qW.like(DeviceCheckDetailEntity::getDeviceCode, query.getDeviceCodeAndUdi())
+                        .or().like(DeviceCheckDetailEntity::getUdi, query.getDeviceCodeAndUdi());
+            });
+        }
+        if (query.getFinishFlag() != null) {
+            queryWrapper.eq(DeviceCheckDetailEntity::getFinishFlag, query.getFinishFlag());
+        }
+        List<DeviceCheckDetailEntity> list = super.list(queryWrapper);
+        return list;
+    }
 }
 
 

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java

@@ -1,6 +1,9 @@
 package com.glxp.api.service.dev.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,8 +18,10 @@ import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
 import com.glxp.api.enums.dev.DeviceStatusEnum;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam;
+import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
 import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery;
 import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
+import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
 import com.glxp.api.service.dev.*;
 import com.glxp.api.dao.dev.DeviceRepairApplyDetailMapper;
 import com.glxp.api.util.SnowflakeUtil;
@@ -44,6 +49,8 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
 
     @Resource
     DeviceCheckDetailService deviceCheckDetailService;
+    @Resource
+    DeviceRepairApplyDetailMapper deviceRepairApplyDetailMapper;
 
     @Autowired
     @Lazy
@@ -67,9 +74,10 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
     public void diagnosis(DeviceRepairApplyDetailDiagnosisParam param, AuthAdmin user) {
         LocalDateTime now = LocalDateTime.now();
         param.valid();
-        DeviceRepairApplyEntity repairApply = deviceRepairApplyService.getByIdAndStatus(param.getApplyId(), DeviceRepairApplyStatusEnum.PROCESSING);
+        DeviceRepairApplyEntity repairApply = deviceRepairApplyService.getByIdAndStatus(param.getApplyId(), DeviceRepairApplyStatusEnum.WAIT_PROCESS);
-        if (repairApply == null) {
+        DeviceRepairApplyEntity repairApplyPROCESSING = deviceRepairApplyService.getByIdAndStatus(param.getApplyId(), DeviceRepairApplyStatusEnum.PROCESSING);
-            throw new JsonException(String.format("报修单不处于[%s]状态，无法诊断", DeviceRepairApplyStatusEnum.PROCESSING.getDesc()));
+        if (repairApply == null && repairApplyPROCESSING == null) {
+            throw new JsonException(String.format("报修单不处于[%s]、[%s]状态，无法诊断", DeviceRepairApplyStatusEnum.PROCESSING.getDesc(), DeviceRepairApplyStatusEnum.WAIT_PROCESS.getDesc()));
         }
         DeviceRepairApplyDetailEntity one = super.getOne(Wrappers.lambdaQuery(DeviceRepairApplyDetailEntity.class)
                 .eq(DeviceRepairApplyDetailEntity::getApplyId, param.getApplyId())
@@ -119,6 +127,29 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                 .eq(DeviceCheckDetailEntity::getApplyId, param.getApplyId())
                 .eq(DeviceCheckDetailEntity::getDeviceCode, param.getDeviceCode())
         );
+
+        //更新主表状态
+        updateDeviceRepairApplyEntity(param.getApplyId());
+    }
+
+    /**
+     * 如果还有未受理的 那就是部分受理
+     * @param applyId
+     */
+    private void updateDeviceRepairApplyEntity(Long applyId) {
+
+        List<DeviceRepairApplyDetailEntity> list = super.list(Wrappers.lambdaQuery(DeviceRepairApplyDetailEntity.class)
+                .eq(DeviceRepairApplyDetailEntity::getApplyId, applyId)
+                .eq(DeviceRepairApplyDetailEntity::getStatus, DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS));
+        if (CollectionUtil.isNotEmpty(list)){
+            deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
+                    .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING)
+                    .eq(DeviceRepairApplyEntity::getId, applyId));
+        }else {
+            deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class)
+                    .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.FINISH)
+                    .eq(DeviceRepairApplyEntity::getId, applyId));
+        }
     }
 
     @Override
@@ -162,6 +193,14 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
         one.setRepairUserPhone(apply.getApplyUserPhone());
         return one;
     }
+
+    @Override
+    public List<DeviceRepairApplyDetailMiniResponse> miniPage(DeviceRepairApplyDetailMiniQuery query) {
+        if (query.getPage() != null) {
+            PageHelper.startPage(query.getPage(), query.getLimit());
+        }
+        return super.baseMapper.miniPage(query);
+    }
 }
 
 

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.dev.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -28,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 针对表【device_repair_apply(设备报修单)】的数据库操作Service实现
@@ -49,14 +51,18 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
 
     @Override
     public List<DeviceRepairApplyEntity> pageList(DeviceRepairApplyQuery query) {
-        String acceptInfo = query.getAcceptInfo();
-        String repairInfo = query.getRepairInfo();
         if (query.getPage() != null) {
             PageHelper.startPage(query.getPage(), query.getLimit());
         }
+        List<DeviceRepairApplyStatusEnum> statuss = query.getStatuss();
+        DeviceRepairApplyStatusEnum status = query.getStatus();
+        if (status != null){
+            statuss.add(status);
+        }
+        String acceptInfo = query.getAcceptInfo();
+        String repairInfo = query.getRepairInfo();
         LambdaQueryWrapper<DeviceRepairApplyEntity> wrapper = Wrappers.lambdaQuery(DeviceRepairApplyEntity.class);
         wrapper.eq(query.getApplyId() != null, DeviceRepairApplyEntity::getId, query.getApplyId())
-                .eq(query.getStatus() != null, DeviceRepairApplyEntity::getStatus, query.getStatus())
                 .eq(query.getConfirmUserId() != null, DeviceRepairApplyEntity::getConfirmUserId, query.getConfirmUserId())
                 .eq(StrUtil.isNotBlank(query.getApplyDeptCode()), DeviceRepairApplyEntity::getApplyDeptCode, query.getApplyDeptCode())
                 .orderByDesc(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyEntity::getApplyTime);
@@ -84,6 +90,12 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl<DeviceRepairApplyM
                     .or()
                     .like(DeviceRepairApplyEntity::getId, repairInfo));
         }
+        if (CollectionUtil.isNotEmpty(statuss)){
+            List<String> statusValues = statuss.stream()
+                    .map(DeviceRepairApplyStatusEnum::getKey) // 假设 getStatusValue() 是获取用于查询的字符串值的方法
+                    .collect(Collectors.toList());
+            wrapper.in(DeviceRepairApplyEntity::getStatus, statusValues);
+        }
 
         List<DeviceRepairApplyEntity> list = super.list(wrapper);
         return list;

src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml

@@ -86,6 +86,13 @@
             <if test="param.productName!=null and param.productName!=''">
                 and info.productName like concat('%',#{param.productName},'%')
             </if>
+            <if test="param.deviceCodeAndUdi!=null and param.deviceCodeAndUdi!=''">
+                and (
+                    info.deviceCode like concat('%',#{param.deviceCodeAndUdi},'%')
+                    or
+                    info.udi like concat('%',#{param.deviceCodeAndUdi},'%')
+                )
+            </if>
         <if test="param.planId!=null">
             and info.status != 'destroy'
             and info.deviceCode not in ( select deviceCode from device_plan_detail where planId = #{param.planId} )

src/main/resources/mybatis/mapper/dev/DeviceRepairApplyDetailMapper.xml

@@ -44,4 +44,68 @@
         supName,confirmUserId,confirmUserName,
         confirmTime,confirmRemark
     </sql>
+
+
+    <select id="miniPage"  parameterType="com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery"
+            resultType="com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse">
+        select
+        drad.applyId,
+        drad.deviceCode,
+        drad.deptCode,
+        drad.deptName,
+        drad.description,
+        drad.status,
+        drad.repairFlag,
+        drad.repairId,
+        drad.productId,
+        drad.udi,
+        drad.nameCode,
+        drad.productName,
+        drad.ggxh,
+        drad.batchNo,
+        drad.serialNo,
+        drad.productionDate,
+        drad.expireDate,
+        drad.manufactory,
+        drad.measname,
+        drad.zczbhhzbapzbh,
+        drad.supId,
+        drad.supName,
+        drad.confirmUserId,
+        drad.confirmUserName,
+        drad.confirmTime,
+        drad.confirmRemark,
+
+        dra.id,
+        dra.applyDeptCode,
+        dra.applyDeptName,
+        dra.applyUserId,
+        dra.applyUserName,
+        dra.applyUserPhone,
+        dra.applyTime,
+        dra.deviceCount,
+        dra.finishCount,
+        dra.confirmUserId,
+        dra.confirmUserName,
+        dra.confirmTime,
+        dra.finishTime
+        from device_repair_apply_detail drad
+        Left Join device_repair_apply dra ON drad.applyId = dra.id
+        <where>
+            <if test="param.deviceCodeAndUdi!=null and param.deviceCodeAndUdi!=''">
+                and (
+                drad.deviceCode like concat('%',#{param.deviceCodeAndUdi},'%')
+                or
+                drad.udi like concat('%',#{param.deviceCodeAndUdi},'%')
+                )
+            </if>
+            <if test="param.deptCode != null and param.deptCode != ''">
+                AND drad.deptCode = #{param.deptCode}
+            </if>
+            <if test="param.status != null and param.status != ''">
+                AND drad.status = #{param.status}
+            </if>
+
+        </where>
+    </select>
 </mapper>