修改设备维修、点检任务、点检记录

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java

@@ -32,14 +32,19 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
                     .like(DvRepairDO::getRepairCode, reqVO.getRepairCode())
                     .or()
                     .like(DvRepairDO::getMachineryCode, reqVO.getMachineryCode())
+                    .or()
+                    .in(DvRepairDO::getMachineryId,reqVO.getMachineryIds())
             );
-        }else{
+        }else if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+            dvRepairDOLambdaQueryWrapperX.in(DvRepairDO::getMachineryId,reqVO.getMachineryIds());
+        }
+        else{
             dvRepairDOLambdaQueryWrapperX.eqIfPresent(DvRepairDO::getRepairCode, reqVO.getRepairCode())
                     .eqIfPresent(DvRepairDO::getMachineryCode, reqVO.getMachineryCode());
         }
-        if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+     /*   if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
             dvRepairDOLambdaQueryWrapperX.in(DvRepairDO::getMachineryId,reqVO.getMachineryIds());
-        }
+        }*/
         dvRepairDOLambdaQueryWrapperX
 
                 .likeIfPresent(DvRepairDO::getRepairName, reqVO.getRepairName())

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java

@@ -25,12 +25,23 @@ public interface TaskManagementMapper extends BaseMapperX<TaskManagementDO> {
     default PageResult<TaskManagementDO> selectPage(TaskManagementPageReqVO reqVO) {
         LambdaQueryWrapperX<TaskManagementDO> taskManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
 
-        if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+/*        if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
             taskManagementDOLambdaQueryWrapperX.in(TaskManagementDO::getDeviceList,reqVO.getMachineryIds());
-        }
+        }*/
 
+        if(StringUtils.isNotBlank(reqVO.getName())&&CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+            taskManagementDOLambdaQueryWrapperX.and(w -> w
+                    .like(TaskManagementDO::getName, reqVO.getName())
+                    .or()
+                    .in(TaskManagementDO::getDeviceList,reqVO.getMachineryIds())
+            );
+        }else if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
+            taskManagementDOLambdaQueryWrapperX.in(TaskManagementDO::getDeviceList,reqVO.getMachineryIds());
+        }else{
+            taskManagementDOLambdaQueryWrapperX.likeIfPresent(TaskManagementDO::getName, reqVO.getName());
+        }
         taskManagementDOLambdaQueryWrapperX
-                .likeIfPresent(TaskManagementDO::getName, reqVO.getName())
+               // .likeIfPresent(TaskManagementDO::getName, reqVO.getName())
                 .eqIfPresent(TaskManagementDO::getTaskType, reqVO.getTaskType())
                 .eqIfPresent(TaskManagementDO::getDeviceList, reqVO.getDeviceList())
                 .eqIfPresent(TaskManagementDO::getProjectForm, reqVO.getProjectForm())

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java

@@ -26,13 +26,25 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
     default PageResult<TicketManagementDO> selectPage(TicketManagementPageReqVO reqVO) {
 
         LambdaQueryWrapperX<TicketManagementDO> ticketManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
-        if(CollUtil.isNotEmpty(reqVO.getMachineryNames())){
+       /* if(CollUtil.isNotEmpty(reqVO.getMachineryNames())){
             ticketManagementDOLambdaQueryWrapperX.in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames());
+        }*/
+
+        if(StringUtils.isNotBlank(reqVO.getPlanNo())&&CollUtil.isNotEmpty(reqVO.getMachineryNames())){
+            ticketManagementDOLambdaQueryWrapperX.and(w -> w
+                    .like(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
+                    .or()
+                    .in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames())
+            );
+        }else if(CollUtil.isNotEmpty(reqVO.getMachineryNames())){
+            ticketManagementDOLambdaQueryWrapperX.in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames());
+        }else{
+            ticketManagementDOLambdaQueryWrapperX.likeIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo());
         }
         ticketManagementDOLambdaQueryWrapperX
                 .eqIfPresent(TicketManagementDO::getTaskId, reqVO.getTaskId())
                 .eqIfPresent(TicketManagementDO::getPlanId, reqVO.getPlanId())
-                .likeIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
+                //.likeIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
                 .likeIfPresent(TicketManagementDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(TicketManagementDO::getPlanType, reqVO.getPlanType())
                 .likeIfPresent(TicketManagementDO::getConfigName, reqVO.getConfigName())

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java

@@ -136,10 +136,18 @@ public class DvRepairServiceImpl implements DvRepairService {
 
     @Override
     public PageResult<DvRepairDO> getDvRepairPage(DvRepairPageReqVO pageReqVO) {
-        if(StringUtils.isNotBlank(pageReqVO.getDeviceLine())) {
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLine())|| StringUtils.isNotBlank(pageReqVO.getRepairCode())) {
-            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(new LambdaQueryWrapperX<DeviceLedgerDO>()
+            LambdaQueryWrapperX<DeviceLedgerDO> deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
-                    .eq(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLine())
+            if(StringUtils.isNotBlank(pageReqVO.getDeviceLine()))
-            );
+                deviceLedgerDOLambdaQueryWrapperX.eqIfPresent(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLine());
+            if(StringUtils.isNotBlank(pageReqVO.getRepairCode())){
+                deviceLedgerDOLambdaQueryWrapperX.and(w -> w
+                        .like(DeviceLedgerDO::getDeviceCode, pageReqVO.getRepairCode())
+                        .or()
+                        .like(DeviceLedgerDO::getDeviceName, pageReqVO.getRepairCode())
+                );
+            }
+            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(deviceLedgerDOLambdaQueryWrapperX);
             List<Long> machineryIds = deviceLedgerDOS.stream().map(DeviceLedgerDO::getId).distinct().collect(Collectors.toList());
             if(CollUtil.isNotEmpty(machineryIds)){
                 pageReqVO.setMachineryIds(machineryIds);

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java

@@ -156,16 +156,23 @@ public class TaskManagementServiceImpl implements TaskManagementService {
 
     @Override
     public PageResult<TaskManagementDO> getTaskManagementPage(TaskManagementPageReqVO pageReqVO) {
-        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())) {
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())||StringUtils.isNotBlank(pageReqVO.getName())) {
-            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(new LambdaQueryWrapperX<DeviceLedgerDO>()
+            LambdaQueryWrapperX<DeviceLedgerDO> deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
-                    .eq(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId())
+            if(com.alibaba.excel.util.StringUtils.isNotBlank(pageReqVO.getDeviceLineId()))
-            );
+                deviceLedgerDOLambdaQueryWrapperX.eqIfPresent(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId());
+            if(StringUtils.isNotBlank(pageReqVO.getName())){
+                deviceLedgerDOLambdaQueryWrapperX.and(w -> w
+                        .like(DeviceLedgerDO::getDeviceCode, pageReqVO.getName())
+                        .or()
+                        .like(DeviceLedgerDO::getDeviceName, pageReqVO.getName())
+                );
+            }
+            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(deviceLedgerDOLambdaQueryWrapperX);
             List<Long> machineryIds = deviceLedgerDOS.stream().map(DeviceLedgerDO::getId).distinct().collect(Collectors.toList());
             if(CollUtil.isNotEmpty(machineryIds)){
                 pageReqVO.setMachineryIds(machineryIds);
             }else {
                 List<Long> objects = new ArrayList<>();
-                objects.add((long) -1);
                 pageReqVO.setMachineryIds(objects);
             }
         }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java

@@ -93,10 +93,18 @@ public class TicketManagementServiceImpl implements TicketManagementService {
 
     @Override
     public PageResult<TicketManagementDO> getTicketManagementPage(TicketManagementPageReqVO pageReqVO) {
-        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())) {
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())||StringUtils.isNotBlank(pageReqVO.getPlanNo())) {
-            List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(new LambdaQueryWrapperX<DeviceLedgerDO>()
+        LambdaQueryWrapperX<DeviceLedgerDO> deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
-                    .eq(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId())
+        if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId()))
+        deviceLedgerDOLambdaQueryWrapperX.eqIfPresent(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId());
+        if(StringUtils.isNotBlank(pageReqVO.getPlanNo())){
+            deviceLedgerDOLambdaQueryWrapperX.and(w -> w
+                    .like(DeviceLedgerDO::getDeviceCode, pageReqVO.getPlanNo())
+                    .or()
+                    .like(DeviceLedgerDO::getDeviceName, pageReqVO.getPlanNo())
             );
+        }
+        List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(deviceLedgerDOLambdaQueryWrapperX);
             List<String> machineryNames = deviceLedgerDOS.stream().map(DeviceLedgerDO::getDeviceName).distinct().collect(Collectors.toList());
             if(CollUtil.isNotEmpty(machineryNames)){
                 pageReqVO.setMachineryNames(machineryNames);