From 4185a44f983c7aa3cf45ec03a65eece9e847e229 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期四, 16 五月 2024 13:22:44 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java index 01cf539..c54fa2b 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java @@ -1,6 +1,8 @@ package com.mes.downworkstation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.downglassinfo.entity.DownGlassInfo; @@ -33,7 +35,7 @@ Long newId = (maxId == null) ? 1 : maxId + 1; - BeanUtils.copyProperties(entity,downGlassInfo); + BeanUtils.copyProperties(downGlassInfo,entity); entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id entity.setState(1); baseMapper.insert(entity); @@ -62,12 +64,24 @@ queryWrapper.eq("state", 1); return baseMapper.selectList(queryWrapper); } - @Override - public void updateTaskStateToZero(long id) { - UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("state", 0).eq("id", id); - baseMapper.update(new DownWorkstationTask(), updateWrapper); + @Override + public void updateTaskStateToZero(DownWorkstationTask downWorkstationTask) { + LambdaUpdateWrapper<DownWorkstationTask> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + + lambdaUpdateWrapper.set(DownWorkstationTask::getState, 0) + .eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId()); + + baseMapper.update(new DownWorkstationTask(), lambdaUpdateWrapper); + } + + + @Override + public void deleteTask(DownWorkstationTask downWorkstationTask) { + LambdaQueryWrapper<DownWorkstationTask> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId()); + + baseMapper.delete(queryWrapper); } } -- Gitblit v1.8.0