瀏覽代碼

feat: 积分包结算管理-发票上传4

lixuesong 1 年之前
父節點
當前提交
25ed56d079

+ 5 - 0
db/v2.0/20231122.sql

@@ -0,0 +1,5 @@
+alter table wm_score_package
+    add invoice_number varchar(64) null comment '发票号码';
+
+alter table wm_score_package
+    add invoice_file json null comment '发票文件';

+ 18 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -15,6 +15,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -509,7 +510,8 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	/**
 	 * 发票文件
 	 */
-	private String[] invoiceFile;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<FileUrlObj> invoiceFile;
 
 	/**
 	 * 获取积分包的关联试卷
@@ -542,4 +544,19 @@ public class WmScorePackage extends Model<WmScorePackage> {
 		private final String msg;
 	}
 
+	/**
+	 * 文件 URL obj
+	 *
+	 * @author lixuesong
+	 * @date 2023/09/27
+	 */
+	@Data
+	public static class FileUrlObj implements Serializable {
+		private static final long serialVersionUID = 7914265352319844404L;
+
+		private String fileName;
+
+		private String url;
+	}
+
 }

+ 3 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -1,10 +1,12 @@
 package com.qunzhixinxi.hnqz.admin.entity.input;
 
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -93,6 +95,6 @@ public class WmScorePackageSettleOutput {
 	/**
 	 * 发票文件
 	 */
-	private String[] invoiceFile;
+	private List<WmScorePackage.FileUrlObj> invoiceFile;
 
 }

+ 2 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -95,6 +95,8 @@
 		<result property="omsOrderSn" column="oms_order_sn"/>
 		<result property="packageSn" column="pkg_sn"/>
 		<result property="drugtable" column="drugtable"/>
+		<result property="invoiceNumber" column="invoice_number"/>
+		<result property="invoiceFile" column="invoice_file" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
 	</resultMap>
 
 	<select id="listWmScorePackageAndTask" resultMap="wmScorePackageMap">