From 53da067c76ca7d4406b57c1a78565bd7b990868d Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 17:58:50 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 01011d2..5b4a1e7 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,24 +1,27 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import cn.hutool.core.util.ObjectUtil;
+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.InsOrderUserMapper;
+import com.yuanchu.mom.mapper.InsSampleMapper;
+import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsOrderUser;
+import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsOrderService;
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;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -27,36 +30,47 @@
@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
- private InsOrderMapper insOrderMapper;
+ private InsSampleMapper insSampleMapper;
- private InsOrderUserMapper insOrderUserMapper;
+ private InsSampleUserMapper insSampleUserMapper;
private GetLook getLook;
+ private InsOrderMapper insOrderMapper;
+
+ private InsOrderService insOrderService;
+
@Override
- public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) {
- //鍒濆鍖杙age
- Page<InsOrder> insOrderPage = new Page<>();
- insOrderPage.setCurrent(page.getCurrent());
- insOrderPage.setPages(page.getPages());
- insOrderPage.setSize(page.getSize());
+ 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");
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
- if (map1.get("look") == 1) insOrder.setCreateUser(userId);
- //鏌ヨ
- List<InsOrder> orderPage = insOrderMapper.selectList(QueryWrappers.queryWrappers(insOrder));
- List<InsOrder> filterData = orderPage.stream().filter(order -> {
- List<InsOrderUser> insOrderUsers = insOrderUserMapper.selectList(Wrappers.<InsOrderUser>lambdaQuery()
- .eq(InsOrderUser::getInsOrderId, order.getId()));
- boolean isZero = insOrderUsers.stream().noneMatch(iou -> iou.getUserId().equals(userId));
- return insOrderUsers.isEmpty() || !isZero;
- }).collect(Collectors.toList());
- insOrderPage.setRecords(filterData);
- insOrderPage.setTotal(filterData.size());
+ if(ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())){
+ insOrderPlanDTO.setUserId(userId.longValue());
+ }
+ IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
map.put("body", insOrderPage);
return map;
}
+
+ @Override
+ public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
+ if(Objects.isNull(entity)){
+ return false;
+ }
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ Integer userId = map1.get("userId");
+ InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
+ return insSampleUserMapper.insert(insSampleUser)>0;
+ }
+
+ @Override
+ public Map<String, Object> doInsOrder(Integer id) {
+ InsOrder insOrder = new InsOrder();
+ insOrder.setId(id);
+ insOrder.setInsState(1);
+ insOrderMapper.updateById(insOrder);
+ return insOrderService.getInsOrder(id);
+ }
}
--
Gitblit v1.9.3