From 34428bd30b004336f9ebc93de0ebe8fae65017c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 27 十一月 2025 14:09:30 +0800
Subject: [PATCH] 审批界面增加pdf，图片预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
index 894cd84..3f6f28f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/entity/MachineFile.java
@@ -61,17 +61,47 @@
* temp鐩綍
*/
public static final String DIR_TYPE_TEMP = "TEMP";
+ /**
+ * PROGRAM鐩綍(铏氭嫙锛屾棤瀹為檯鏂囦欢澶�)
+ */
+ public static final String DIR_TYPE_PROGRAM = "PROGRAM";
+ /**
+ * 鏂囦欢寮傚父绫诲瀷锛氭甯�
+ */
+ public static final int EXCEPTION_OK = 0;
+ /**
+ * 鏂囦欢寮傚父绫诲瀷锛氶潪鏂囨湰鏂囦欢
+ */
+ public static final int EXCEPTION_NOT_TEXT = 1;
+ /**
+ * 鏂囦欢寮傚父绫诲瀷锛氭枃浠跺悕鏍煎紡涓嶅悎娉�
+ */
+ public static final int EXCEPTION_BAD_FILENAME = 2;
+ /**
+ * 鏂囦欢寮傚父绫诲瀷锛氭枃浠剁‘澶�(娈垫暟涓嶅)
+ */
+ public static final int EXCEPTION_LOST_FILES = 3;
+
+ /**
+ * 鏂囦欢寮傚父绫诲瀷锛氭枃浠舵鏁颁笌涓嬪彂璁板綍涓嶅尮閰嶏紙杞﹀簥/鐜板満缂栧埗闄ゅ)
+ */
+ public static final int EXCEPTION_NOT_MATCH_SEND_SEG_COUNT = 4;
+
+ /**
+ * 涓嶅尮閰嶄笅鍙戣褰曪紙璇曞垏涓嬪彂 銆� 鐜板満缂栫▼涓嬪彂锛�
+ */
+ public static final int EXCEPTION_NOT_MATCH_RECORD = 5;
+
+ /**
+ * 涓嶅尮閰嶄笅鍙戣褰曚复鏃舵洿鏀瑰崟閮ㄥ垎
+ */
+ public static final int EXCEPTION_NOT_MATCH_SEND_LG = 6;
/**
* 鏂囦欢鍚�
*/
private String name;
-
- /**
- * 鑺傜偣绫诲瀷锛氬瓧鍏�
- */
- //private String nodeType;
/**
* 鎵�灞炴満搴�
@@ -99,13 +129,32 @@
private Long fileSize;
/**
+ * 绋嬪簭鐘舵��
+ */
+ private String programStatus;
+
+ /**
+ * 涓存椂鏇存敼鍗曞彿,SQ/GH/LG 鍏朵粬鍊奸兘鏄湭鐭�
+ */
+ private String deviation;
+ /**
+ * 涓存椂鏇存敼鍗曞彿搴忓彿,P鍚庨潰鐨勯儴鍒�
+ */
+ private String deviationSerial;
+ /**
* 纭鏃堕棿锛屾帴鍙楁垨鑰呮嫆缁濈殑鏃堕棿
*/
private Date determineTime;
+
/**
- * 绋嬪簭鐘舵�侊紙1璇曞垏锛�2鍥哄寲锛�3鍋忕锛�4鏈煡锛�
+ * REC鐩綍鏂囦欢寮傚父绫诲瀷锛�0/null:姝ｅ父; 1闈炴枃鏈牸寮忥紱2:鏂囦欢鍚嶆牸寮忎笉鍚堟硶锛�3:鏂囦欢纭け(娈垫暟涓嶅)锛�4:鏂囦欢娈垫暟涓庝笅鍙戣褰曚笉鍖归厤锛堣溅搴�/鐜板満缂栧埗闄ゅ)
*/
- private Integer programStatus;
+ private Integer exceptionType;
+
+ /**
+ * oss鏂囦欢鍚嶏紝鐢ㄤ簬program鏂囦欢澶�
+ */
+ private String ossName;
/**
* 鐢熸垚鏂囦欢澶у皬鐨勬樉绀烘枃鏈�
* @return 鏄剧ず鏂囨湰
@@ -133,4 +182,23 @@
setStatus(STATUS_REJECTED);
this.determineTime = new Date();
}
+
+ /**
+ * 寮傚父璇︾粏鎻忚堪
+ * @return 鎻忚堪鏂囨湰
+ */
+ public String getExceptionMsg(){
+ if(exceptionType == null){
+ return "姝ｅ父";
+ }
+ return switch (exceptionType) {
+ case EXCEPTION_NOT_TEXT -> "闈炴枃鏈�";
+ case EXCEPTION_BAD_FILENAME -> "鏂囦欢鍚嶆牸寮忛敊璇�";
+ case EXCEPTION_LOST_FILES -> "鏂囦欢纭け";
+ case EXCEPTION_NOT_MATCH_SEND_SEG_COUNT -> "娈垫暟涓庝笅鍙戣褰曚笉鍖归厤";
+ case EXCEPTION_NOT_MATCH_RECORD -> "鏃犺褰曞尮閰�";//璇曞垏涓嬪彂锛岀幇鍦虹紪绋嬮兘涓嶅尮閰�
+ case EXCEPTION_NOT_MATCH_SEND_LG -> "涓存椂鏇存敼鍗曚笉鍖归厤";
+ default -> "姝ｅ父";
+ };
+ }
}
--
Gitblit v1.9.3