From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
index 1b970f7..20e1362 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.FinishedInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.pojo.FinishedInspect;
-import java.time.LocalDate;
+import java.util.List;
import java.util.Map;
/**
@@ -18,11 +18,12 @@
*/
public interface FinishedInspectMapper extends BaseMapper<FinishedInspect> {
- IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
+ //鍒嗛〉鏌ヨ鎴愬搧妫�楠�
+ IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer result, String material);
- //璁＄畻鎴愬搧鎴栬�呰繃绋嬫楠屽湪鏌愪竴涓椂闂存鐨勫悎鏍兼暟
- Integer selCountFin(String begin, String end, int type,int result);
+ //鏂板妫�楠屽崟-->鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅
+ List<Map<String, Object>> chooseMater(String orderNumber);
- //璁＄畻鏈堜骇閲�
- Long seAllCount(String begin, String end, int type);
+ //鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏
+ List<Map<String, Object>> selectFinishInspectsListById(Integer id);
}
--
Gitblit v1.9.3