From 81f615750dec3e3aba4b607033609a1f3c7fc7fd Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 15 三月 2024 16:03:18 +0800 Subject: [PATCH] 业务管理:检验任务(update) --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java index 669f0fd..c9a8008 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java @@ -1,22 +1,24 @@ package com.yuanchu.mom.service.impl; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +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.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; +import com.yuanchu.mom.dto.InsOrderPlanDTO; import com.yuanchu.mom.mapper.InsOrderMapper; +import com.yuanchu.mom.mapper.InsSampleMapper; +import com.yuanchu.mom.mapper.InsSampleUserMapper; import com.yuanchu.mom.pojo.InsOrder; +import com.yuanchu.mom.pojo.InsSampleUser; import com.yuanchu.mom.service.InsOrderPlanService; -import com.yuanchu.mom.utils.QueryWrappers; import com.yuanchu.mom.vo.InsOrderPlanVO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; +import java.util.Objects; /** * 妫�楠屼换鍔�-涓氬姟瀹炵幇灞� @@ -25,12 +27,35 @@ @AllArgsConstructor public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService { - private InsOrderMapper insOrderMapper; + private InsSampleMapper insSampleMapper; + + private InsSampleUserMapper insSampleUserMapper; private GetLook getLook; @Override - public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) { - return null; + public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) { + //鑾峰彇琛ㄥご + Map<String, Object> map = new HashMap<>(); + map.put("head", PrintChina.printChina(InsOrderPlanVO.class)); + Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderPlanList"); + Integer userId = map1.get("userId"); + //鏌ヨ + insOrderPlanDTO.setUserId(userId.longValue()); + insOrderPlanDTO.setState(1); + IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, insOrderPlanDTO); + map.put("body", insOrderPage); + return map; + } + + @Override + public boolean claimInsOrderPlan(InsOrderPlanDTO entity) { + if(Objects.isNull(entity)){ + return false; + } + Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("claimInsOrderPlan"); + Integer userId = map1.get("userId"); + InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1); + return insSampleUserMapper.insert(insSampleUser)>0; } } -- Gitblit v1.9.3