From bb9499352faae20bb2c898f3f6078f7a4e9ceef2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:17:19 +0800
Subject: [PATCH] 检验项目数据导入；检验模板调整
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index c580fc2..a3bbde2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import cn.hutool.core.lang.UUID;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.ReportPageDto;
@@ -18,6 +19,8 @@
import javax.annotation.Resource;
import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
@@ -58,7 +61,7 @@
if (!realpath.exists()) {
realpath.mkdirs();
}
- pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+ pathName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmmss")) + "_" + file.getOriginalFilename();
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
return Result.success(insReportService.inReport("/word/"+pathName, id));
@@ -79,4 +82,22 @@
return Result.success();
}
+ @ApiOperation(value = "鎻愪氦")
+ @PostMapping("/writeReport")
+ public Result writeReport(Integer id) {
+ return Result.success(insReportService.writeReport(id));
+ }
+
+ @ApiOperation(value = "瀹℃牳")
+ @PostMapping("/examineReport")
+ public Result examineReport(Integer id, Integer isExamine, String examineTell) {
+ return Result.success(insReportService.examineReport(id, isExamine, examineTell));
+ }
+
+ @ApiOperation(value = "鎵瑰噯")
+ @PostMapping("/ratifyReport")
+ public Result ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
+ return Result.success(insReportService.ratifyReport(id, isRatify, ratifyTell));
+ }
+
}
--
Gitblit v1.9.3