From 3adcc36797b576b6c6f793e0eeac41068b6dd717 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 14 一月 2025 11:26:00 +0800
Subject: [PATCH] 1.14调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 2 +-
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 2 +-
cnas-server/src/main/java/com/yuanchu/mom/controller/DocumentController.java | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index c1df04d..1ce280d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -150,7 +150,7 @@
}
@ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
- @PostMapping("/selectDeviceByCode")
+ @GetMapping("/selectDeviceByCode")
@ValueAuth
public Result selectDeviceByCode(String code) {
return Result.success(deviceService.selectDeviceByCode(code));
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DocumentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DocumentController.java
index fbf50f0..9ef75c1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DocumentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DocumentController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.Document;
import com.yuanchu.mom.service.DocumentService;
import com.yuanchu.mom.vo.Result;
@@ -15,27 +16,32 @@
private DocumentService documentService;
@PostMapping
+ @ValueAuth
public Result createDocument( Document document) {
documentService.save(document);
return Result.success("ok");
}
@GetMapping("/{id}")
+ @ValueAuth
public Document getDocumentById(@PathVariable Integer id) {
return documentService.getById(id);
}
@PutMapping("updateDocument")
+ @ValueAuth
public Result updateDocument(@RequestBody Document document) {
return Result.success(documentService.updateById(document));
}
@DeleteMapping("/{id}")
+ @ValueAuth
public Result deleteDocumentById(@PathVariable Integer id) {
return Result.success(documentService.removeById(id));
}
@GetMapping("/getListByDId/{id}")
+ @ValueAuth
public Result getAllDocuments(@PathVariable Integer id) {
LambdaQueryWrapper<Document> lambdaQueryWrapper=new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Document::getDeviceId,id);
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
index 18ccab2..36d1385 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -24,7 +24,7 @@
ios.laboratory sonLaboratory,
sample_code,
sample sampleName,
- IFNULL(TIMESTAMPDIFF(HOUR, iou.ins_time, submit_time), 0) AS hours
+ IFNULL(TIMESTAMPDIFF(MINUTE, iou.ins_time, submit_time), 0) AS hours
from ins_order_user iou
left join ins_order_state ios on iou.ins_order_state_id = ios.id
left join ins_sample isa on ios.ins_sample_id = isa.id
--
Gitblit v1.9.3