【设备维护记录】增加车间搜索

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java

@@ -27,9 +27,13 @@ public class EquipMaintenanceRecordPageReqVO extends PageParam {
     @Schema(description = "设备id", example = "12621")
     private Long equipId;
 
+    @Schema(description = "车间id", example = "12621")
+    private Long workshopId;
+
     @Schema(description = "描述", example = "随便")
     private String description;
 
+
     @Schema(description = "维保人")
     private Long owner;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java

@@ -45,6 +45,7 @@ public interface EquipMaintenanceRecordMapper extends BaseMapperX<EquipMaintenan
                 .eqIfPresent(EquipMaintenanceRecordDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getCreateTime, reqVO.getCreateTime())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getSubmitTime, reqVO.getSubmitTime())
+                .eq(reqVO.getWorkshopId()!=null,WorkshopDO::getId,reqVO.getWorkshopId())
                 ;
 
         return selectPage(reqVO, query);