From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index d62ed5f..9da6d79 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -1,8 +1,14 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.ADto;
+import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.PkMaster;
+import com.yuanchu.mom.vo.Result;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -11,7 +17,7 @@
*/
public interface DeviceService extends IService<Device> {
- Map<String, Object> selectDeviceParameter(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, Device itemParameter);
+ Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);
int addDeviceParameter(Device itemParameter);
@@ -27,5 +33,13 @@
List<Device> selectDevicePrincipal();
-}
+ List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass);
+ Device selectDeviceByCode(String code);
+
+ Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);
+
+ List<ADto> menu();
+
+ List<Map<String, Object>> treeDevice(String deviceName);
+}
--
Gitblit v1.9.3