申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

 pom.xml

@@ -27,7 +27,7 @@
  </repositories>

  <properties>
    <spring.version>4.3.8.RELEASE</spring.version>
    <spring.version>4.3.29.RELEASE</spring.version>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  </properties>
@@ -140,7 +140,7 @@
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>jstl</artifactId>
      <version>1.2</version>
      <version>1.1.2</version>
    </dependency>

    <dependency>
@@ -322,29 +322,29 @@
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-core</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-web</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-ehcache</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-spring</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <!--- end shiro -->

    <dependency>
      <groupId>com.alibaba</groupId>
      <artifactId>fastjson</artifactId>
      <version>1.2.8</version>
      <version>1.2.75</version>
    </dependency>
    <dependency>
      <groupId>com.google.collections</groupId>
@@ -360,7 +360,7 @@
      <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
          <version>2.9.0.pr3</version>
          <version>2.9.10.7</version>
      </dependency>
    <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
    <dependency>
@@ -368,24 +368,26 @@
      <artifactId>mail</artifactId>
      <version>1.4.1</version>
    </dependency>

    <dependency >
      <groupId >com.sun.mail </groupId >
      <artifactId >javax.mail </artifactId >
      <version >1.6.0 </version >
    </dependency >
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi</artifactId>
      <version>4.0.1</version>
      <version>4.1.1</version>
    </dependency>

    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi-ooxml</artifactId>
      <version>3.17</version>
      <version>4.1.1</version>
    </dependency>

      <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-compress</artifactId>
          <version>1.9</version>
      </dependency>
    <dependency>
      <groupId>org.apache.commons</groupId>
      <artifactId>commons-compress</artifactId>
      <version>1.20</version>
    </dependency>
  </dependencies>

  <profiles>
@@ -458,6 +460,42 @@
        <profile.active>zkysh</profile.active>
      </properties>
    </profile>
    <profile>
      <id>shgjs</id>
      <properties>
        <profile.active>shgjs</profile.active>
      </properties>
    </profile>
    <profile>
      <id>zkyshs</id>
      <properties>
        <profile.active>zkyshs</profile.active>
      </properties>
    </profile>
    <profile>
      <id>gslab</id>
      <properties>
        <profile.active>gslab</profile.active>
      </properties>
    </profile>
    <profile>
      <id>zkdsz</id>
      <properties>
        <profile.active>zkdsz</profile.active>
      </properties>
    </profile>
    <profile>
      <id>xjdx</id>
      <properties>
        <profile.active>xjdx</profile.active>
      </properties>
    </profile>
    <profile>
      <id>aky</id>
      <properties>
        <profile.active>aky</profile.active>
      </properties>
    </profile>
  </profiles>
  <build>
    <finalName>smartlab</finalName>
@@ -473,6 +511,14 @@
          <target>1.8</target>
          <encoding>UTF-8</encoding>
          <skip>true</skip>
          <excludes>
            <exclude>
              resources/template/*
            </exclude>
            <exclude>
              resources/*.docx
            </exclude>
          </excludes>
        </configuration>
      </plugin>
      <plugin>