From 131c6e18ff9f81024e933597788b16287e73f294 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 14 三月 2024 17:37:24 +0800
Subject: [PATCH] 功能调整
---
/dev/null | 20 --------------------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 28 +---------------------------
2 files changed, 1 insertions(+), 47 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
deleted file mode 100644
index 17230e4..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.InsOrderUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-03-08 09:44:47
-* @Entity com.yuanchu.mom.pojo.InsOrderUser
-*/
-public interface InsOrderUserMapper extends BaseMapper<InsOrderUser> {
-
-}
-
-
-
-
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java
deleted file mode 100644
index 575fb9d..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.InsOrderUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-08 09:44:47
-*/
-public interface InsOrderUserService extends IService<InsOrderUser> {
-
-}
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..669f0fd 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
@@ -6,9 +6,7 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.mapper.InsOrderMapper;
-import com.yuanchu.mom.mapper.InsOrderUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
@@ -29,34 +27,10 @@
private InsOrderMapper insOrderMapper;
- private InsOrderUserMapper insOrderUserMapper;
-
private GetLook getLook;
@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());
- 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");
- 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());
- map.put("body", insOrderPage);
- return map;
+ return null;
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java
deleted file mode 100644
index 8015aa3..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.pojo.InsOrderUser;
-import com.yuanchu.mom.service.InsOrderUserService;
-import com.yuanchu.mom.mapper.InsOrderUserMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-08 09:44:47
-*/
-@Service
-public class InsOrderUserServiceImpl extends ServiceImpl<InsOrderUserMapper, InsOrderUser>
- implements InsOrderUserService{
-
-}
-
-
-
-
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
deleted file mode 100644
index 4b19a1c..0000000
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.InsOrderUserMapper">
-
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderUser">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
- <result property="userId" column="user_id" jdbcType="INTEGER"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,ins_order_id,user_id,
- state,create_user,create_time
- </sql>
-</mapper>
--
Gitblit v1.9.3