From 7e3cc4b30a8e0c30b6a0574061ba733a426d9f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 03 七月 2026 11:33:44 +0800
Subject: [PATCH] 原材料下单：报告下载添加审批状态校验，避免跳转页面报错问题&配置修改
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 2 ++
ruoyi-admin/src/main/resources/application-ztzb.yml | 2 +-
ruoyi-admin/src/main/resources/logback.xml | 6 +++---
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 6 ++++++
ruoyi-admin/src/main/resources/application.yml | 2 +-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index b44234d..280e79e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -56,6 +56,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String enterUrlS;
+ @ApiModelProperty("杩涘巶鎶ュ憡瀹℃壒鐘舵��(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer enterRatifyStatus;
+
// 瀛ｅ害
@ApiModelProperty("瀛ｅ害璁㈠崟id")
private Integer quarterOrderId;
@@ -69,6 +72,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String quarterUrlS;
+ @ApiModelProperty("瀛ｅ害妫�楠屾姤鍛婂鎵圭姸鎬�(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer quarterRatifyStatus;
+
private Integer orderState;
@ApiModelProperty("涓嬪彂鏃堕棿")
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index aca179c..96beb37 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -280,10 +280,12 @@
ir1.id enter_report_id,
ir1.url enter_url,
ir1.url_s enter_url_s,
+ ir1.is_ratify enter_ratify_status,
io2.id quarter_order_id,
ir2.id quarter_report_id,
ir2.url quarter_url,
ir2.url_s quarter_url_s,
+ ir2.is_ratify quarter_ratify_status,
group_concat(distinct isa.sample_code, ' ') sample_code,
group_concat(distinct isa.sample, ' ') sample_name,
group_concat(distinct isa.model, ' ') sample_model,
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
index df6b62c..59d6c2a 100644
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ b/ruoyi-admin/src/main/resources/application-ztzb.yml
@@ -104,7 +104,7 @@
# 鏃ュ織閰嶇疆
logging:
- file-location: /center-lims/after
+ file-location: /center-lims/after/logs
level:
com.ruoyi: info
org.springframework: warn
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0575c58..2fbeb92 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -19,7 +19,7 @@
port: 8001
servlet:
# 搴旂敤鐨勮闂矾寰�
- context-path:
+ context-path: /lims
tomcat:
# tomcat鐨刄RI缂栫爜
uri-encoding: UTF-8
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index a1252bd..d51e7a3 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <springProperty scope="context" name="logs" source="logging.file-location" default="/logs"/>
- <property name="log.path" value="logs"/>
+ <springProperty scope="context" name="logs" source="logging.file-location" default="/ztzb-logs"/>
+ <property name="log.path" value="${logs}"/>
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+ <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 鎺у埗鍙拌緭鍑� -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
--
Gitblit v1.9.3