设备之系统——保养检修 V2

任务生成添加工厂字段

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceScheduleServiceImpl.java

@@ -39,6 +39,7 @@ public class EquMaintenanceScheduleServiceImpl extends ServiceImpl<EquMaintenanc
         queryWrapper.eq(EquMaintenanceScheduleDo::getEquipmentid,taskCreator.getEquipmentId())
                 .eq(EquMaintenanceScheduleDo::getPlanyear,taskCreator.getYear())
                 .eq(EquMaintenanceScheduleDo::getPlantype,taskCreator.getPlanType())
+                .eq(EquMaintenanceScheduleDo::getTenantid,taskCreator.getTenantId())
                 .last("limit 1");
         return maintenanceScheduleDao.selectOne(queryWrapper);
     }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceTaskServiceImpl.java

@@ -40,6 +40,7 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
                 .eq(EquMaintenanceTaskDo::getPlanyear, taskCreator.getYear())
                 .eq(EquMaintenanceTaskDo::getMonth, taskCreator.getMonth())
                 .eq(EquMaintenanceTaskDo::getPlantype, taskCreator.getPlanType())
+                .eq(EquMaintenanceTaskDo::getTenantid,taskCreator.getTenantId())
                 .eq(EquMaintenanceTaskDo::getDeleted,0);
         return maintenanceTaskDao.selectList(queryWrapper);
     }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/dto/TaskCreatorDTO.java

@@ -24,6 +24,10 @@ public class TaskCreatorDTO implements Serializable {
      * 设备ID
      */
     private String equipmentId;
+    /**
+     * 工厂ID
+     */
+    private String tenantId;
 
     /**
      * 计划类型