From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期五, 16 五月 2025 17:15:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java new file mode 100644 index 0000000..36fd10b --- /dev/null +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanTaskServiceImpl.java @@ -0,0 +1,72 @@ +package com.aps.core.service.impl; + +import cn.hutool.core.util.IdUtil; +import com.aps.common.core.utils.DateUtils; +import com.aps.common.security.utils.SecurityUtils; +import com.aps.core.enums.PLAN_TASK_STATUS; +import com.aps.core.enums.PLAN_TASK_TYPE; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.aps.core.domain.ApsPlanTask; +import com.aps.core.service.ApsPlanTaskService; +import com.aps.core.mapper.ApsPlanTaskMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @author zhl +* @description 閽堝琛ㄣ�恆ps_plan_task(璁″垝鐢熸垚鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 +* @createDate 2025-05-16 14:41:49 +*/ +@Service +public class ApsPlanTaskServiceImpl extends ServiceImpl<ApsPlanTaskMapper, ApsPlanTask> implements ApsPlanTaskService{ + + + @Autowired + ApsPlanTaskMapper mapper; + + public Page<ApsPlanTask> pagingList(Page<ApsPlanTask> page ,ApsPlanTask task){ + LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.like( !task.getTaskType().isEmpty(), ApsPlanTask::getTaskType,task.getTaskType()); + return mapper.selectPage(page, queryWrapper); + } + + /** + * 鍒涘缓鏂扮敓璁″垝浠诲姟 + */ + @Override + public void savePlanTask(String batchNum){ + ApsPlanTask task = ApsPlanTask.builder().id(IdUtil.getSnowflakeNextId()) + .batchNum(batchNum) + .taskStatus(PLAN_TASK_STATUS.IN_PROCESS.getCode()) + .taskType(PLAN_TASK_TYPE.PLATE_PLAN.getCode()) + .createBy(SecurityUtils.getUsername()) + .createTime(DateUtils.getNowDate()) + .delFlag(0) + .build(); + baseMapper.insert(task); + + } + /** + * 鏍规嵁鎵规鍙� 鏇存柊鐘舵�� + * */ + @Override + public void updateTaskStatus(String batchNum, PLAN_TASK_STATUS status){ + LambdaQueryWrapper<ApsPlanTask> queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.like(ApsPlanTask::getBatchNum,batchNum); + ApsPlanTask task = ApsPlanTask.builder() + .taskStatus(status.getCode()) + .updateBy(SecurityUtils.getUsername()) + .updateTime(DateUtils.getNowDate()) + .build(); + baseMapper.update(task,queryWrapper); + } +} + + + + -- Gitblit v1.9.3