From fc03a64522e6c6e0f47eeb82c8900e1910a0a363 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 01 二月 2024 09:11:11 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java | 80 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 74 insertions(+), 6 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..0ce8b72 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,8 @@ package com.doumee.dao.business.model; 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; @@ -20,6 +22,59 @@ @ApiModel("鍛樺伐鎶曚繚鏄庣粏璁板綍") @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(); + } + + + //鍔犲噺淇濈敵璇锋暟鎹� + public MemberInsurance(ApplyChagneDetail applyChangeDetail, ApplyChange applyChange, Integer sysUserId,Integer applyDetailId){ + this.createDate = new Date(); + this.creator = sysUserId; + this.isdeleted = Constants.ZERO; + this.applyId = applyChange.getApplyId(); + 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 = applyChange.getApplyCode(); + this.pdCode = applyChange.getCode(); + this.solutionName = applyChange.getSolutionsName(); + this.worktypeName = applyChangeDetail.getWorkTypeName(); + this.duName = applyChangeDetail.getDuName(); +// this.relationType = Constants.ONE; + this.relationId = applyDetailId; + } + + + @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -66,16 +121,21 @@ @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡") - private String endTime; + private Date endTime; @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡") - private String startTime; + private Date startTime; - @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�") - @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date idcardNo; + @ApiModelProperty(value = "韬唤璇佸彿鐮�") + @ExcelColumn(name="韬唤璇佸彿鐮�") + private String idcardNo; + + + @ApiModelProperty(value = "鏂规涓婚敭", example = "1") + @ExcelColumn(name="鏂规涓婚敭") + private Integer solutionId; + @ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1") @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)") @@ -121,4 +181,12 @@ @ExcelColumn(name="娲鹃仯鍗曚綅鍚嶇О") private String duName; + @ApiModelProperty(value = "鍏宠仈鏄庣粏涓婚敭", example = "1") + @ExcelColumn(name="鍏宠仈鏄庣粏涓婚敭") + private Integer relationId; + +// @ApiModelProperty(value = "鍏宠仈鏄庣粏绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶", example = "1") +// @ExcelColumn(name="鍏宠仈鏄庣粏绫诲瀷锛�0=鎶曚繚鐢宠锛�1=鍔犲噺淇�/鎹㈠巶") +// private Integer relationType; + } -- Gitblit v1.9.3