UP

common/pom.xml

@@ -6,12 +6,12 @@
     <parent>
           <groupId>com.ecep.contract</groupId>
           <artifactId>Contract-Manager</artifactId>
-          <version>0.0.101-SNAPSHOT</version>
+          <version>0.0.102-SNAPSHOT</version>
     </parent>
 
     <groupId>com.ecep.contract</groupId>
     <artifactId>common</artifactId>
-    <version>0.0.101-SNAPSHOT</version>
+    <version>0.0.102-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>${java.version}</maven.compiler.source>

common/src/main/java/com/ecep/contract/util/ContextUtils.java

@@ -1,4 +1,9 @@
 package com.ecep.contract.util;
 
+import org.springframework.beans.BeansException;
+
 public interface ContextUtils {
+    <T> T getBean(Class<T> requiredType) throws BeansException;
+
+    <T> T getCachedBean(Class<T> requiredType) throws BeansException;
 }

common/src/main/java/com/ecep/contract/util/FileUtils.java

@@ -72,4 +72,28 @@ public class FileUtils {
         }
         return fileName.startsWith("~$");
     }
+
+    /**
+     * 检查文件是否为可编辑文件
+     *
+     * @param fileName 文件名
+     * @return 是否为可编辑文件
+     */
+    public static boolean isEditableFile(String fileName) {
+        return withExtensions(fileName,
+                XLS, XLSX,
+                DOC, DOCX);
+    }
+
+    /**
+     * 检查文件是否为归档文件
+     *
+     * @param fileName 文件名
+     * @return 是否为归档文件
+     */
+    public static boolean isArchiveFile(String fileName) {
+        return withExtensions(fileName,
+                PNG, PDF,
+                JPG, JPEG);
+    }
 }

common/src/main/java/com/ecep/contract/vo/CustomerFileVo.java

@@ -7,7 +7,7 @@ import java.time.LocalDate;
 import lombok.Data;
 
 @Data
-public class CompanyCustomerFileVo implements IdentityEntity, Serializable {
+public class CustomerFileVo implements IdentityEntity, Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
     private Integer customer;

common/src/main/java/com/ecep/contract/vo/CustomerVo.java

@@ -9,7 +9,7 @@ import com.ecep.contract.model.IdentityEntity;
 import lombok.Data;
 
 @Data
-public class CompanyCustomerVo implements IdentityEntity, CompanyBasedVo, Serializable {
+public class CustomerVo implements IdentityEntity, CompanyBasedVo, Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
     /**

common/src/main/java/com/ecep/contract/vo/SalesBillVoucherVo.java

@@ -15,7 +15,6 @@ public class SalesBillVoucherVo implements IdentityEntity, CompanyBasedVo, java.
     private String code;
     private Integer companyId;
     private Integer orderId;
-    private String orderCode;
     private Integer employeeId;
     private Integer makerId;
     private LocalDateTime makerDate;