server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -104,4 +104,13 @@ @TableField(exist = false) private String workTypeName; @ApiModelProperty(value = "企业名称") @TableField(exist = false) private String companyName; @ApiModelProperty(value = "保险状态:1=保障中;2=不在保") @TableField(exist = false) private Integer solutionsStatus; } server/service/src/main/java/com/doumee/dao/business/model/MemberInsurance.java
@@ -78,111 +78,91 @@ @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 = "投保申请编码（关联insurance_apply", example = "1") @ExcelColumn(name="投保申请编码（关联insurance_apply") private Integer applyId; @ApiModelProperty(value = "人员编码（关联memeber）", example = "1") @ExcelColumn(name="人员编码（关联memeber）") private Integer memberId; @ApiModelProperty(value = "实际保险生效止期") @ExcelColumn(name="实际保险生效止期") @ExcelColumn(name="保险生效止期",index = 7) private Date endTime; @ApiModelProperty(value = "实际保险生效起期") @ExcelColumn(name="实际保险生效起期") @ExcelColumn(name="保险生效起期",index = 6) private Date startTime; @ApiModelProperty(value = "身份证号码") @ExcelColumn(name="身份证号码") private String idcardNo; @ApiModelProperty(value = "方案主键", example = "1") @ExcelColumn(name="方案主键") private Integer solutionId; @ApiModelProperty(value = "派遣单位编码（关联dispatch_unit)", example = "1") @ExcelColumn(name="派遣单位编码（关联dispatch_unit)") private Integer duId; @ApiModelProperty(value = "工种编码(关联worktype)", example = "1") @ExcelColumn(name="工种编码(关联worktype)") private Integer worktypeId; @ApiModelProperty(value = "当前产生费用", example = "1") @ExcelColumn(name="当前产生费用") 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) private String bdCode; @ApiModelProperty(value = "批单号") @ExcelColumn(name="批单号") @ExcelColumn(name="批单号",index = 3) private String pdCode; @ApiModelProperty(value = "保险方案名称") @ExcelColumn(name="保险方案名称") @ExcelColumn(name="保险方案",index = 1) private String solutionName; @ApiModelProperty(value = "批单申请编码", example = "1") @ExcelColumn(name="批单申请编码") private Integer applyChangeId; @ApiModelProperty(value = "工种名称") @ExcelColumn(name="工种名称") @ExcelColumn(name="工种名称",index = 5) private String worktypeName; @ApiModelProperty(value = "派遣单位名称") @ExcelColumn(name="派遣单位名称") @ExcelColumn(name="派遣单位",index = 4) private String duName; @ApiModelProperty(value = "关联明细主键", example = "1") @ExcelColumn(name="关联明细主键") private Integer relationId; // @ApiModelProperty(value = "关联明细类型：0=投保申请；1=加减保/换厂", example = "1") server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -181,6 +181,7 @@ .selectAs(DispatchUnit::getName,Member::getDuName) .selectAs(Worktype::getName,Member::getWorkTypeName) .selectAs(Solutions::getName,Member::getSolutionName) .select(" case when now() between t.start_time and t.end_time then 1 else 0 end solutionsStatus ") .leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId) .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId) .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId) @@ -191,15 +192,9 @@ .like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard()) .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId()) .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getId, memberQueryDTO.getSolutionsId()) .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&!memberQueryDTO.getSolutionsStatus().equals(Constants.ZERO), Member::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00") .le(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE), Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59") .ge(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO), Member::getEndTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 23:59:59") .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time") .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time") ; for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); @@ -220,15 +215,20 @@ @Override public List<Member> findListByDTO(MemberQueryDTO memberQueryDTO) { MPJLambdaWrapper<Member> lambdaWrapper = new MPJLambdaWrapper<Member>() .selectAll(Member.class) MPJLambdaWrapper<Member> lambdaWrapper = new MPJLambdaWrapper<Member>(); lambdaWrapper.selectAll(Member.class) .selectAs(DispatchUnit::getName,Member::getDuName) .selectAs(Worktype::getName,Member::getWorkTypeName) .selectAs(Company::getName,Member::getCompanyName) .select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ") .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId) .leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId) .leftJoin(Company.class,Company::getId,Member::getCompanyId) .notIn(CollectionUtils.isNotEmpty(memberQueryDTO.getMemberIds()),Member::getId,memberQueryDTO.getMemberIds()) .eq(!Objects.isNull(memberQueryDTO.getCompanyId()),Member::getCompanyId,memberQueryDTO.getCompanyId()) .eq(Member::getIsdeleted, Constants.ZERO) .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time") .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time") .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName()) .notExists(!Objects.isNull(memberQueryDTO.getNotInInsuranceApplyId()), " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getNotInInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " + @@ -238,6 +238,7 @@ .selectAll(Member.class) .selectAs(DispatchUnit::getName,Member::getDuName) .selectAs(Worktype::getName,Member::getWorkTypeName) .selectAs(Company::getName,Member::getCompanyName) .leftJoin(ApplyDetail.class,ApplyDetail::getMemberId,Member::getId) .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId) .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId) @@ -248,8 +249,7 @@ " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " + " and ad.member_id = t.id "); } List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper ); List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper); return memberList; }
@@ -589,6 +589,7 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无法修改方案信息"); } if(!(oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey()) || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey()) || oldSettleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前状态无法进行该操作"); } @@ -627,6 +628,7 @@ } SettleClaims settleClaims = settleClaimsMapper.selectById(scSupplementDTO.getId()); if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey()) || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey()) || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前状态无法进行该操作"); } @@ -658,6 +660,7 @@ SettleClaims settleClaims = settleClaimsMapper.selectById(scSupplementDTO.getId()); if(!(settleClaims.getStatus().equals(Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey()) || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.DEAL_ING.getKey()) || settleClaims.getStatus().equals(Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前状态无法进行该操作"); }
