From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java | 139 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 32 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 218436d..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,6 +1,9 @@
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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,104 +24,176 @@
@TableName("`member_insurance`")
public class MemberInsurance {
+ public MemberInsurance(){
+
+ }
+ //鎶曚繚鐢宠鏁版嵁
+ public MemberInsurance(ApplyDetail applyDetail, Integer sysUserId){
+ this.createDate = new Date();
+ this.creator = sysUserId;
+ this.isdeleted = Constants.ZERO;
+ this.applyId = applyDetail.getApplyId();
+ this.memberId = applyDetail.getMemberId();
+ this.endTime = applyDetail.getEndTime();
+ this.startTime = applyDetail.getStartTime();
+ this.idcardNo = applyDetail.getIdcardNo();
+ this.solutionId = applyDetail.getSolutionId();
+ this.duId = applyDetail.getDuId();
+ this.worktypeId = applyDetail.getWorktypeId();
+ this.fee = applyDetail.getFee();
+ this.sex = applyDetail.getSex();
+ this.bdCode = applyDetail.getApplyCode();
+ this.solutionName = applyDetail.getSolutionName();
+ this.worktypeName = applyDetail.getWorkTypeName();
+ 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,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();
+ this.idcardNo = applyChangeDetail.getIdcardNo();
+ this.duId = applyChangeDetail.getDuId();
+ this.worktypeId = applyChangeDetail.getWorktypeId();
+ this.fee = applyChangeDetail.getFee();
+ this.sex = applyChangeDetail.getSex();
+ 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;
+ }
+
+
+
+
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply", example = "1")
- @ExcelColumn(name="鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply")
private Integer applyId;
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎emeber锛�", example = "1")
- @ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎emeber锛�")
private Integer memberId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- private String endTime;
+ @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 7,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- private String startTime;
+ @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 6,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date idcardNo;
+ @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+ private String idcardNo;
+
+
+ @ApiModelProperty(value = "鏂规涓婚敭", example = "1")
+ private Integer solutionId;
+
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
- @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
private Integer duId;
@ApiModelProperty(value = "宸ョ缂栫爜(鍏宠仈worktype)", example = "1")
- @ExcelColumn(name="宸ョ缂栫爜(鍏宠仈worktype)")
private Integer worktypeId;
- @ApiModelProperty(value = "褰撳墠浜х敓璐圭敤", example = "1")
- @ExcelColumn(name="褰撳墠浜х敓璐圭敤")
+ @ApiModelProperty(value = "褰撳墠宸蹭骇鐢熻垂鐢�", example = "1")
private BigDecimal currentFee;
@ApiModelProperty(value = "璐圭敤", example = "1")
- @ExcelColumn(name="璐圭敤")
private BigDecimal fee;
@ApiModelProperty(value = "鎬у埆 0鐢� 1濂�", example = "1")
- @ExcelColumn(name="鎬у埆 0鐢� 1濂�")
+// @ExcelColumn(name="鎬у埆",valueMapping = "0=鐢�;1=濂�;")
private Integer sex;
@ApiModelProperty(value = "淇濆崟鍙�")
- @ExcelColumn(name="淇濆崟鍙�")
+ @ExcelColumn(name="淇濆崟鍙�",index = 2,width = 5)
private String bdCode;
@ApiModelProperty(value = "鎵瑰崟鍙�")
- @ExcelColumn(name="鎵瑰崟鍙�")
+ @ExcelColumn(name="鎵瑰崟鍙�",index = 3,width = 5)
private String pdCode;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
- @ExcelColumn(name="淇濋櫓鏂规鍚嶇О")
+ @ExcelColumn(name="淇濋櫓鏂规",index = 1,width = 6)
private String solutionName;
@ApiModelProperty(value = "鎵瑰崟鐢宠缂栫爜", example = "1")
- @ExcelColumn(name="鎵瑰崟鐢宠缂栫爜")
private Integer applyChangeId;
@ApiModelProperty(value = "宸ョ鍚嶇О")
- @ExcelColumn(name="宸ョ鍚嶇О")
+ @ExcelColumn(name="宸ョ鍚嶇О",index = 5,width = 6)
private String worktypeName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- @ExcelColumn(name="娲鹃仯鍗曚綅鍚嶇О")
+ @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