From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java |   41 ++++++++++++++++++++++++++++++++---------
 1 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index 994e554..e4132d4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -1,9 +1,13 @@
 package com.yuanchu.mom.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.pojo.RawInspect;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yuanchu.mom.pojo.vo.RawInspectVo;
 
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -12,25 +16,44 @@
 * @createDate 2023-07-31 14:43:15
 */
 public interface RawInspectService extends IService<RawInspect> {
-    Map<String, Object> selectRawInspectsList(int pageSize, int countSize, String formTime, String createTime, int insState, int judgeState);
+
+    /**
+     *鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
+     * @param code
+     * @return
+     */
+    RawInspectVo chooseIFS(String code);
+
+    /**
+     * 鏂板鍘熸潗鏂欐楠屽崟
+     * @param userName
+     * @param rawInspectVo
+     */
+    String addRawInspects(String userName, RawInspectVo rawInspectVo);
+
+    /**
+     * 鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+     * @param formTime
+     * @param code
+     * @param insState
+     * @param name
+     * @return
+     */
+    IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);
+
 
     /**
      * 鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
      * @param id
      * @return
      */
-    RawInspectVo selectRawInspectsListById(Integer id);
+    Map<String,Object> selectRawInspectsListById(Integer id);
 
     /**
      * 鏇存柊妫�楠岀姸鎬�
      * @param id
      */
-    boolean updateRawInspectsById(Integer id);
+    String updateRawInspectsById(Integer id,Integer number);
 
-    /**
-     * 鏂板妫�楠屽崟
-     * @param userName
-     * @param rawInspect
-     */
-    Integer addRawInspects(String userName, RawInspect rawInspect);
+
 }

--
Gitblit v1.9.3