From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java |  201 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 193 insertions(+), 8 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 545d243..0555a2a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,7 +11,11 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鎶曚繚鐢宠淇℃伅琛�
@@ -32,7 +38,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +46,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -66,22 +70,26 @@
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//     @JsonFormat(pattern="yyyy-MM-dd")
     private Date applyEndTime;
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-
-    private Date applyStartTime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date  applyStartTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date endTime;
 
     @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
-
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date startTime;
 
     @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@@ -96,15 +104,58 @@
     @ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
     @ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
     private Integer checkUserId;
+    @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)", example = "1")
+    @ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)")
+    private Integer unionApplyId;
+
+    @ApiModelProperty(value = "鍚堝苟鍗�-鎶曚繚鍗曠姸鎬� 0=鏈笂浼�;1=宸蹭笂浼�;2=宸茬缃�;3=宸蹭笂浼犱繚闄╁崟", example = "1")
+    private Integer unionApplyTbdStatus;
+
+    @ApiModelProperty(value = "濮旀墭淇�-鎶曚繚鍗曞悎鍚屽彿 锛堝晢鎴蜂笂浼狅紝浼佷笟绛剧讲锛�")
+    @ExcelColumn(name="濮旀墭淇�-鎶曚繚鍗曞悎鍚屽彿 锛堝晢鎴蜂笂浼狅紝浼佷笟绛剧讲锛�")
+    private String applyTbdNo;
 
     @ApiModelProperty(value = "鍗曞彿")
     @ExcelColumn(name="鍗曞彿")
     private String code;
+    @ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
+    @ExcelColumn(name="鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
+    private String signApplyNo;
 
-    @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級  3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴  锛堝凡鍏抽棴锛�", example = "1")
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級  3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴  锛堝凡鍏抽棴锛�;" +
+            " 銆愬鎵樻姇淇濄�� 0鎻愪氦鎶曚繚 12宸茬缃叉柟妗堢‘璁や功 13宸茬缃插悕鍗� 10瀹℃牳閫氳繃 5淇濋殰涓�", example = "1")
     @ExcelColumn(name="鐘舵�� 0寰呭鏍� 1骞冲彴閫�鍥炰繚鍗曪紙宸查��鍥烇級 2宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔狅紙寰呯缃诧級  3宸茬绔犲緟涓婁紶淇濋櫓鍗曪紙寰呭嚭鍗曪級 4淇濆崟鍑哄叿澶辫触閫�鍥烇紙宸查��鍥烇級 5宸蹭笂浼犱繚鍗曪紙淇濋殰涓級6浼佷笟鐢宠閫�鍥炰腑 7骞冲彴鍚屾剰閫�鍥烇紙宸查��鍥烇級 8浼佷笟鍏抽棴  锛堝凡鍏抽棴锛�")
     private Integer status;
 
+    @ApiModelProperty(value = "褰撳墠璐圭敤")
+    @ExcelColumn(name="褰撳墠璐圭敤")
+    private BigDecimal currentFee;
+
+    @ApiModelProperty(value = "鎬昏垂鐢�")
+    @ExcelColumn(name="鎬昏垂鐢�")
+    private BigDecimal fee;
+
+    @ApiModelProperty(value = "鏈嶅姟璐�")
+    @ExcelColumn(name="鏈嶅姟璐�")
+    private BigDecimal serverCost;
+
+    @ApiModelProperty(value = "鍦ㄧ嚎纭涔﹀悎鍚屽彿")
+    @ExcelColumn(name="鍦ㄧ嚎纭涔﹀悎鍚屽彿")
+    private String signQrsNo;
+
+    @ApiModelProperty(value = "浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+    @ExcelColumn(name="浜哄憳鍚嶅崟绛剧讲鍚堝悓鍙�")
+    private String signMemberListNo;
+
+
+    @ApiModelProperty(value = "鍛ㄦ湡缁撴潫鏃ユ湡 锛�2022-02-02 23:59:59锛�")
+    @ExcelColumn(name="鍛ㄦ湡缁撴潫鏃ユ湡 锛�2022-02-02 23:59:59锛�")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date finalEndTime;
+
+    @ApiModelProperty(value = "澶嶅浜轰富閿�")
+    private Integer retrialId;
 
     @ApiModelProperty(value = "浼佷笟鍚嶇О")
     @TableField(exist = false)
@@ -114,4 +165,138 @@
     @TableField(exist = false)
     private String solutionsName;
 
+    @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 = "鎵规敼鎻愰啋鏃堕棿 HH:mm")
+    @TableField(exist = false)
+    private String correctWarnTime;
+
+    @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+    @TableField(exist = false)
+    private Integer solutionType;
+    @ApiModelProperty(value = "鏂规閭欢")
+    @TableField(exist = false)
+    private String solutionEmail;
+    @ApiModelProperty(value = "绛剧珷鍏抽敭瀛�")
+    @TableField(exist = false)
+    private String signKeyword;
+
+    @ApiModelProperty(value = "浜哄憳淇℃伅")
+    @TableField(exist = false)
+    private List<ApplyDetail> applyDetailList;
+
+    @ApiModelProperty(value = "鎶曚繚浜烘暟")
+    @TableField(exist = false)
+    private Integer insureNum;
+
+    @ApiModelProperty(value = "鍦ㄤ繚浜烘暟")
+    @TableField(exist = false)
+    private Integer guaranteeNum;
+
+
+    @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+    @TableField(exist = false)
+    private BigDecimal taxesMoney;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "鏈�鍚庝竴娆″紑绁ㄦ椂闂�")
+    @TableField(exist = false)
+    private Date taxesLast;
+
+    @ApiModelProperty(value = "澶辨晥鍓╀綑澶╂暟")
+    @TableField(exist = false)
+    private Integer loseEfficacyDays;
+
+    @ApiModelProperty(value = "鏈嶅姟澶╂暟")
+    @TableField(exist = false)
+    private Integer serviceDays;
+    @ApiModelProperty(value = "鎶曚繚鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile toubaodanFile;
+    @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄")
+    @TableField(exist = false)
+    private Multifile toubaodanSignedFile;
+    @ApiModelProperty(value = "淇濋櫓鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile baoxiandanFile;
+
+    @ApiModelProperty(value = "鐢宠鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile shenqingdanFile;
+    @ApiModelProperty(value = "绛剧讲鍚庢柟妗堢‘璁や功瀵硅薄")
+    @TableField(exist = false)
+    private Multifile fanganFile;
+
+    @ApiModelProperty(value = "鏃ュ織璁板綍")
+    @TableField(exist = false)
+    private List<ApplyLog> applyLogList;
+    @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵��  0鍚屾剰 1椹冲洖")
+    @TableField(exist = false)
+    private int dealBackApply;
+    @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓�  3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+    @TableField(exist = false)
+    private Integer statusCollect;
+    @ApiModelProperty(value = "闆嗗悎鐘舵��" , example = "1")
+    @TableField(exist = false)
+    private String statusInfo;
+
+    @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+    @TableField(exist = false)
+    private Date lastChangeDate;
+
+    @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 BigDecimal changeMoney;
+
+    @ApiModelProperty(value = "鏂规鍩虹鐗堟湰涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer solutionBaseId;
+
+    @ApiModelProperty(value = "鏈�鏂扮増鏈殑鏂规涓婚敭", example = "1")
+    @TableField(exist = false)
+    private Integer newVersionSolutionId;
+
+
+    @ApiModelProperty(value = "鍟嗘埛鍚嶇О")
+    @TableField(exist = false)
+    private String shopName;
+
+
+
+    public TaxesInvoicingVO toTaxesInvoicingVO(){
+        TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
+        taxesInvoicingVO.setId(this.getId());
+        taxesInvoicingVO.setSolutionsName(this.getSolutionsName());
+        taxesInvoicingVO.setInsuranceCode(this.getCode());
+        taxesInvoicingVO.setInsuranceNum(this.getInsureNum());
+        taxesInvoicingVO.setStartTime(this.getStartTime());
+        taxesInvoicingVO.setAmount(this.getFee());
+        taxesInvoicingVO.setType(Constants.ZERO);
+        return taxesInvoicingVO;
+    }
+
 }

--
Gitblit v1.9.3