From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index 0167ba5..2fadde3 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -54,7 +54,7 @@
private String remark;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="搴忓彿",index = 1)
+ @ExcelColumn(name="搴忓彿",index = 1,width = 3)
private Integer sortnum;
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply", example = "1")
@@ -66,15 +66,18 @@
private Integer memberId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9)
+ @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index =8)
+ @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index =8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date startTime;
+ @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_apply)", example = "1")
+ private Integer unionApplyId;
+
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
- @ExcelColumn(name="韬唤璇佸彿鐮�",index = 5)
+ @ExcelColumn(name="韬唤璇佸彿鐮�",index = 5,width = 12)
private String idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
@@ -86,11 +89,15 @@
private Integer worktypeId;
@ApiModelProperty(value = "璐圭敤", example = "1")
- @ExcelColumn(name="璐圭敤",index = 10)
+ @ExcelColumn(name="璐圭敤",index = 10,width = 5)
private BigDecimal fee;
- @ApiModelProperty(value = "鎬у埆 0鐢� 1濂�", example = "1")
- @ExcelColumn(name="鎬у埆",index =4,valueMapping = "0=鐢�;1=濂�;")
+
+ @ApiModelProperty(value = "鍗曚环", example = "1")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "鎬у埆 0=鐢�;1=濂�", example = "1")
+ @ExcelColumn(name="鎬у埆",index =4,valueMapping = "0=鐢�;1=濂�;",width = 3)
private Integer sex;
@ApiModelProperty(value = "褰撳墠璐圭敤")
@@ -101,31 +108,80 @@
// @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪")
private Integer fromId;
+ @ApiModelProperty(value = "鍑忓皯璐圭敤")
+// @ExcelColumn(name="褰撳墠璐圭敤")
+ private BigDecimal reduceMoney;
+
+ @ApiModelProperty(value = "鍔犱繚涓氬姟缁戝畾鐨勫噺淇濇暟鎹富閿�")
+// @ExcelColumn(name="褰撳墠璐圭敤")
+ private Integer reduceId;
+
+ @ApiModelProperty(value = "鍔犲噺淇濇暟鎹姸鎬侊細0=姝ｅ父锛�1=涓嶅彲鍑忎繚锛�2=鍑忎繚宸插彇娑�")
+// @ExcelColumn(name="褰撳墠璐圭敤")
+ private Integer changeStatus;
+
+
@ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
private String applyCode;
@ApiModelProperty(value = "鏂规鍚嶇О")
@TableField(exist = false)
- @ExcelColumn(name="淇濋櫓鏂规",index =2)
+ @ExcelColumn(name="淇濋櫓鏂规",index =2,width = 10)
private String solutionName;
+
+ @ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
+ @TableField(exist = false)
+ private Integer solutionType;
+
+ @ApiModelProperty(value = "鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer solutionId;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@TableField(exist = false)
private String validCode;
+ @ApiModelProperty(value = "淇濋殰鐘舵�侊細0=淇濋殰涓紱1=涓嶅湪淇�")
+ @TableField(exist = false)
+ private Integer applyStatus;
+
+ @ApiModelProperty(value = "鏄惁鏄鍑猴紱0=鍚︼紱1=鏄�",hidden = true)
+ @TableField(exist = false)
+ private Integer isExcel;
+
+
+ @ApiModelProperty(value = "淇濆崟鐘舵��")
+ @TableField(exist = false)
+ private Integer status;
+
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
- @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6)
+ @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6,width = 10)
private String duName;
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
- @ExcelColumn(name="鍛樺伐濮撳悕",index =3)
+ @ExcelColumn(name="鍛樺伐濮撳悕",index =3,width = 5)
private String memberName;
@ApiModelProperty(value = "宸ョ鍚嶇О")
- @ExcelColumn(name="鎵�灞炲伐绉�",index = 7)
+ @ExcelColumn(name="鎵�灞炲伐绉�",index = 7,width = 10)
@TableField(exist = false)
private String workTypeName;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屾湇鍔¤垂")
+ @TableField(exist = false)
+ private BigDecimal detailServerCost;
+
+ @ApiModelProperty(value = "琛屼繚闄╃敓鏁堟鏈�")
+ @TableField(exist = false)
+ private Date parentEndTime;
+
+ @ApiModelProperty(value = "琛屼繚闄╃敓鏁堣捣鏈�")
+ @TableField(exist = false)
+ private Date parentStartTime;
}
--
Gitblit v1.9.3