From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
index 3d5f275..0ff462e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 鍚堝苟鎶曚繚鍗曚俊鎭〃
@@ -33,7 +34,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +42,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -85,8 +84,8 @@
     @ExcelColumn(name="鍗曞彿")
     private String code;
 
-    @ApiModelProperty(value = "鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥�", example = "1")
-    @ExcelColumn(name="鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥�")
+    @ApiModelProperty(value = "鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥� 5寰呭瀹�", example = "1")
+    @ExcelColumn(name="鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗� 4宸查��鍥� 5寰呭瀹�")
     private Integer status;
 
     @ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
@@ -105,18 +104,40 @@
     @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
     private Integer solutionId;
 
+
+    @ApiModelProperty(value = "澶嶅瀹℃壒浜�", example = "1")
+    @ExcelColumn(name="澶嶅瀹℃壒浜�")
+    private Integer retrialId;
+
     @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1")
     @TableField(exist = false)
     private String companyName;
+    @ApiModelProperty(value = "琚繚闄╀汉浼佷笟鍚嶇О ,鍒嗗壊")
+    @TableField(exist = false)
+    private String companyNames;
 
     @ApiModelProperty(value = "鏂规鍚嶇О", example = "1")
     @TableField(exist = false)
     private String solutionName;
 
+    @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+    @TableField(exist = false)
+    private Integer delOnlyReplace;
+
+    @ApiModelProperty(value = "鏄惁鏈夋淳閬e崟浣� 0鏈� 1鏃�", example = "1")
+    @TableField(exist = false)
+    private Integer hasDispatchUnit;
+
+    @ApiModelProperty(value = "濮旀墭鏂规绛剧珷鏂瑰紡 0浼佷笟绛剧讲鍟嗘埛涓婁紶鎶曚繚鍗� 1浼佷笟绛炬姇淇濈敵璇� 2浼佷笟鏃犻渶绛剧珷", example = "1")
+    @TableField(exist = false)
+    private Integer signType;
     @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈�", example = "1")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date queryStartTime;
+    @ApiModelProperty(value = "鏌ヨ绫诲瀷 1瀛愭煡璇㈠彲鍚堝苟鍗曟暟", example = "1")
+    @TableField(exist = false)
+    private  int queryFlag;
 
     @ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -126,4 +147,81 @@
     @ApiModelProperty(value = "鏈嶅姟澶╂暟")
     @TableField(exist = false)
     private Integer serviceDays;
+
+    @ApiModelProperty(value = "鍙煡璇㈠緟澶勭悊鐨勭敵璇峰崟锛�1=鍔犲噺淇濓紱2=鎹㈠巶")
+    @TableField(exist = false)
+    private Integer hasApplying;
+
+    @ApiModelProperty(value = "鎶曚繚浜烘暟")
+    @TableField(exist = false)
+    private Integer insureNum;
+
+    @ApiModelProperty(value = "鍦ㄤ繚浜烘暟")
+    @TableField(exist = false)
+    private Integer guaranteeNum;
+
+    @ApiModelProperty(value = "鐘舵�佸悕绉�")
+    @TableField(exist = false)
+    private String statusInfo;
+
+    @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer minAge;
+
+    @ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer maxAge;
+
+    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+    @TableField(exist = false)
+    private Integer timeUnit;
+
+    @ApiModelProperty(value = "鐗瑰埆绾﹀畾")
+    @TableField(exist = false)
+    private String specialAgreement;
+
+    @ApiModelProperty(value = "鐗瑰埆璇存槑")
+    @TableField(exist = false)
+    private String specialInfo;
+
+    @ApiModelProperty(value = "鍏朵粬璇存槑")
+    @TableField(exist = false)
+    private String ortherInfo;
+
+
+    @ApiModelProperty(value = "鍔犲噺淇濈敵璇锋暟閲�", example = "1")
+    @TableField(exist = false)
+    private Integer addApplyNum;
+
+    @ApiModelProperty(value = "鎹㈠巶鐢宠鏁伴噺", example = "1")
+    @TableField(exist = false)
+    private Integer changeApplyNum;
+
+
+    @ApiModelProperty(value = "鏌ヨ鐘舵�� 0寰呬笂浼犳姇淇濆崟 1寰呯缃叉姇淇濆崟 2寰呬笂浼犱繚鍗� 3宸蹭笂浼犳壒鍗曪紙淇濋殰涓級 4宸查��鍥� 5宸蹭笂浼犳壒鍗曪紙寰呯敓鏁堬級 6宸蹭笂浼犳壒鍗曪紙宸茶繃鏈燂級", example = "1")
+    @TableField(exist = false)
+    private Integer queryStatus;
+
+
+    @ApiModelProperty(value = "鏃ュ織璁板綍")
+    @TableField(exist = false)
+    private List<ApplyLog> applyLogList;
+
+    @ApiModelProperty(value = "浜哄憳淇℃伅")
+    @TableField(exist = false)
+    private List<ApplyDetail> applyDetailList;
+
+    @ApiModelProperty(value = "鎶曚繚鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile toubaodanFile;
+    @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄")
+    @TableField(exist = false)
+    private Multifile toubaodanSignedFile;
+    @ApiModelProperty(value = "淇濋櫓鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile baoxiandanFile;
 }

--
Gitblit v1.9.3