原材料下单：报告下载添加审批状态校验，避免跳转页面报错问题&配置修改

zouyu

6 天以前 7e3cc4b30a8e0c30b6a0574061ba733a426d9f4f

原材料下单：报告下载添加审批状态校验，避免跳转页面报错问题&配置修改

 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("下发时间")

 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,

 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

 ruoyi-admin/src/main/resources/application.yml

@@ -19,7 +19,7 @@
  port: 8001
  servlet:
    # 应用的访问路径
    context-path:
    context-path: /lims
  tomcat:
    # tomcat的URI编码
    uri-encoding: UTF-8

 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">