调整合同、运力、基础配置、客商

2026-09-14 23:43:00 +08:00
parent 70e44da789
commit 087d89b31a
33 changed files with 881 additions and 93 deletions
@@ -61,6 +61,10 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "客商性质")
 	private String customerNature;

+	@Schema(description = "是否广西百强：0否，1是")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private Integer guangxiTop100;
+
 	@Schema(description = "统一社会信用代码")
 	private String unifiedCreditCode;

@@ -101,6 +105,10 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "经营范围")
 	private String businessScope;

+	@Schema(description = "网络货运平台：0否，1是")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private Integer networkFreightPlatform;
+
 	@Schema(description = "营业期限类型")
 	private String businessTermType;

@@ -0,0 +1,71 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 客商发票联系信息实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_customer_invoice_contact")
+@Schema(description = "客商发票联系信息")
+public class CustomerInvoiceContact extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "发票信息ID")
+	private Long invoiceId;
+
+	@Schema(description = "联系人")
+	private String contactName;
+
+	@Schema(description = "联系电话")
+	private String contactPhone;
+
+	@Schema(description = "邮箱地址")
+	private String email;
+
+	@Schema(description = "所属部门ID集合")
+	private String deptIds;
+
+	@Schema(description = "所属部门")
+	private String deptNames;
+
+	@Schema(description = "备注")
+	private String remark;
+
+}
@@ -50,21 +50,15 @@ public class CustomerInvoiceInfo extends TenantEntity {
 	@Schema(description = "客商ID")
 	private Long customerId;

-	@Schema(description = "受票方名称")
+	@Schema(description = "企业全称")
 	private String invoiceTitle;

-	@Schema(description = "发票类型")
-	private String invoiceType;
-
 	@Schema(description = "纳税人识别号")
 	private String taxNo;

 	@Schema(description = "开户行名称")
 	private String bankName;

-	@Schema(description = "注册电话")
-	private String registeredPhone;
-
 	@Schema(description = "银行账号")
 	private String bankAccount;

@@ -77,24 +71,6 @@ public class CustomerInvoiceInfo extends TenantEntity {
 	@Schema(description = "注册地址详细地址")
 	private String registeredDetailAddress;

-	@Schema(description = "邮箱")
-	private String email;
-
-	@Schema(description = "收件人姓名")
-	private String receiverName;
-
-	@Schema(description = "收件人电话")
-	private String receiverPhone;
-
-	@Schema(description = "收件人地址")
-	private String receiverAddress;
-
-	@Schema(description = "收件人地址行政区划")
-	private String receiverRegionName;
-
-	@Schema(description = "收件人详细地址")
-	private String receiverDetailAddress;
-
 	@Schema(description = "是否默认")
 	private Integer isDefault;

@@ -52,6 +52,11 @@ public class InsuranceOcrTemplate extends TenantEntity {
 	@Schema(description = "模板名称")
 	private String name;

+	/** 车船类型：车辆/船舶。 */
+	@TableField("vehicle_type")
+	@Schema(description = "车船类型：车辆/船舶")
+	private String vehicleType;
+
 	/** 字段映射配置JSON。 */
 	@TableField("mapping_config")
 	@Schema(description = "字段映射配置JSON")
@@ -0,0 +1,55 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 年检记录有效期统计
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "年检记录有效期统计")
+public class AnnualInspectionRecordExpiryStatVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "全部")
+	private Long total;
+
+	@Schema(description = "30天内")
+	private Long within30;
+
+	@Schema(description = "已过期")
+	private Long expired;
+
+}
@@ -72,4 +72,18 @@ public class AnnualInspectionRecordVO extends AnnualInspectionRecord {
 	@Schema(description = "更新人姓名")
 	private String updateUserName;

+	@TableField(exist = false)
+	@Schema(description = "有效期状态：within30-30天内，expired-已过期")
+	private String expireStatus;
+
+	@TableField(exist = false)
+	@Schema(description = "当天日期")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate today;
+
+	@TableField(exist = false)
+	@Schema(description = "预警截止日期")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate warningDate;
+
 }
@@ -77,4 +77,12 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@Schema(description = "变更记录")
 	private List<CustomerChangeRecordVO> changeRecords = new ArrayList<>();

+	@TableField(exist = false)
+	@Schema(description = "是否保存变更记录（仅提交时为 true，保存时不记录）")
+	private Boolean recordChange;
+
+	@TableField(exist = false)
+	@Schema(description = "客商类型：external外部客商，internal内部组织")
+	private String customerKind;
+
 }
@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.transport.pojo.entity.CustomerInvoiceContact;
+
+import java.io.Serial;
+
+/**
+ * 客商发票联系信息视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "客商发票联系信息")
+public class CustomerInvoiceContactVO extends CustomerInvoiceContact {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}
@@ -22,12 +22,15 @@
 */
 package org.springblade.transport.pojo.vo;

+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.transport.pojo.entity.CustomerInvoiceInfo;

 import java.io.Serial;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * 客商发票信息视图实体类
@@ -42,4 +45,8 @@ public class CustomerInvoiceInfoVO extends CustomerInvoiceInfo {
 	@Serial
 	private static final long serialVersionUID = 1L;

+	@TableField(exist = false)
+	@Schema(description = "联系信息")
+	private List<CustomerInvoiceContactVO> contacts = new ArrayList<>();
+
 }