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/MemberInsurance.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
index 6ff0df0..5942f1f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
@@ -47,15 +48,17 @@
this.duName = applyDetail.getDuName();
// this.relationType = Constants.ZERO;
this.relationId = applyDetail.getId();
+ this.isValid = Constants.ZERO;
}
//鍔犲噺淇濈敵璇锋暟鎹�
- public MemberInsurance(ApplyChagneDetail applyChangeDetail, ApplyChange applyChange, Integer sysUserId,Integer applyDetailId){
+ public MemberInsurance(ApplyChagneDetail applyChangeDetail, ApplyChange applyChange, Integer sysUserId,Integer applyDetailId,Integer solutionId){
this.createDate = new Date();
this.creator = sysUserId;
this.isdeleted = Constants.ZERO;
this.applyId = applyChange.getApplyId();
+ this.applyChangeId = applyChange.getId();
this.memberId = applyChangeDetail.getMemberId();
this.endTime = applyChangeDetail.getEndTime();
this.startTime = applyChangeDetail.getStartTime();
@@ -64,13 +67,15 @@
this.worktypeId = applyChangeDetail.getWorktypeId();
this.fee = applyChangeDetail.getFee();
this.sex = applyChangeDetail.getSex();
- this.bdCode = applyChange.getApplyCode();
- this.pdCode = applyChange.getCode();
- this.solutionName = applyChange.getSolutionsName();
+ this.bdCode = applyChangeDetail.getApplyCode();
+ this.pdCode = applyChange.getValidCode();
+ this.solutionName = applyChangeDetail.getSolutionsName();
this.worktypeName = applyChangeDetail.getWorkTypeName();
this.duName = applyChangeDetail.getDuName();
// this.relationType = Constants.ONE;
this.relationId = applyDetailId;
+ this.solutionId=solutionId;
+ this.isValid = Constants.ZERO;
}
@@ -108,11 +113,11 @@
private Integer memberId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 7)
+ @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 7,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 6)
+ @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 6,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
@@ -129,7 +134,7 @@
@ApiModelProperty(value = "宸ョ缂栫爜(鍏宠仈worktype)", example = "1")
private Integer worktypeId;
- @ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
+ @ApiModelProperty(value = "褰撳墠宸蹭骇鐢熻垂鐢�", example = "1")
private BigDecimal currentFee;
@ApiModelProperty(value = "璐圭敤", example = "1")
@@ -140,31 +145,53 @@
private Integer sex;
@ApiModelProperty(value = "淇濆崟鍙�")
- @ExcelColumn(name="淇濆崟鍙�",index = 2)
+ @ExcelColumn(name="淇濆崟鍙�",index = 2,width = 5)
private String bdCode;
@ApiModelProperty(value = "鎵瑰崟鍙�")
- @ExcelColumn(name="鎵瑰崟鍙�",index = 3)
+ @ExcelColumn(name="鎵瑰崟鍙�",index = 3,width = 5)
private String pdCode;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
- @ExcelColumn(name="淇濋櫓鏂规",index = 1)
+ @ExcelColumn(name="淇濋櫓鏂规",index = 1,width = 6)
private String solutionName;
@ApiModelProperty(value = "鎵瑰崟鐢宠缂栫爜", example = "1")
private Integer applyChangeId;
@ApiModelProperty(value = "宸ョ鍚嶇О")
- @ExcelColumn(name="宸ョ鍚嶇О",index = 5)
+ @ExcelColumn(name="宸ョ鍚嶇О",index = 5,width = 6)
private String worktypeName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- @ExcelColumn(name="娲鹃仯鍗曚綅",index = 4)
+ @ExcelColumn(name="娲鹃仯鍗曚綅",index = 4,width = 6)
private String duName;
+
+
+ @ApiModelProperty(value = "搴忓彿", example = "1")
+ @ExcelColumn(name="搴忓彿",index = 0,width = 3)
+ @TableField(exist = false)
+ private Integer sn;
@ApiModelProperty(value = "鍏宠仈鏄庣粏涓婚敭", example = "1")
private Integer relationId;
+ @ApiModelProperty(value = "鍏宠仈绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶", example = "1")
+ private Integer relationType;
+
+ @ApiModelProperty(value = "鍛樺伐鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鏄惁鏈夋晥锛�0=鏈夋晥锛�1=鏃犳晥", example = "1")
+ @ExcelColumn(name="鏄惁鏈夋晥",index = 8,width = 6,valueMapping = "0=鏈夋晥;1=宸插け鏁�")
+ private Integer isValid;
+
+ @ApiModelProperty(value = "绛涢�夌姸鎬侊細0=鏈紑濮嬶紱1=宸插紑濮嬶紙鍖呮嫭宸茶繃鏈燂級", example = "1")
+ @TableField(exist = false)
+ private Integer status;
+
+
// @ApiModelProperty(value = "鍏宠仈鏄庣粏绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶", example = "1")
// @ExcelColumn(name="鍏宠仈鏄庣粏绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶")
// private Integer relationType;
--
Gitblit v1.9.3