From fc306434b98acf242f8e5a71291ae079a4b6961c Mon Sep 17 00:00:00 2001 From: huyuchen <chainahyc2021@126.com> Date: Mon, 10 Feb 2025 15:21:34 +0800 Subject: [PATCH] =?UTF-8?q?huych-=E5=95=86=E9=99=A9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/yifu/insurances/entity/EkpInsurancesInfo.java | 5 ++--- .../v1/yifu/insurances/util/DoJointInsuranceTask.java | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/EkpInsurancesInfo.java b/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/EkpInsurancesInfo.java index ec6d22eeb..051b09d19 100644 --- a/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/EkpInsurancesInfo.java +++ b/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/EkpInsurancesInfo.java @@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,9 +17,9 @@ import java.util.Date; */ @Data @TableName("ekp_insurances_info") -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode() @Schema(description = "商险订å•æ˜Žç»†è¡¨") -public class EkpInsurancesInfo extends BaseEntity { +public class EkpInsurancesInfo { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "fd_Id") diff --git a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java index f0885f6af..759f2e58c 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java +++ b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java @@ -733,9 +733,9 @@ public class DoJointInsuranceTask { pushParam.setFd_3b16dfb32778f2_text(deptInfoVo.getDeptNo()); //实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM") if ("结算月本月数æ®".equals(deptInfoVo.getInsurancesType())) { - pushParam.setFd_3af9d11088facc(DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM")); + pushParam.setFd_3af9d11088facc(DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM)); } else if ("生æˆæœˆä¸Šæœˆæ•°æ®".equals(deptInfoVo.getInsurancesType())) { - pushParam.setFd_3af9d11088facc(DateUtil.addMonthByDate(DateUtil.parseDate(param.getSettleMonth(), "yyyyMM"), -1)); + pushParam.setFd_3af9d11088facc(DateUtil.addMonthByDate(DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM), -1)); } else { pushParam.setFd_3af9d11088facc(null); } @@ -786,7 +786,7 @@ public class DoJointInsuranceTask { //预估ä¿è´¹ pushParam.setFd_3af9d15f7018fa(null != param.getEstimatePremium() ? param.getEstimatePremium().doubleValue() : null); //hro结算月 - pushParam.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM") : null); + pushParam.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM) : null); //æœ‰æ— é¢„ä¼° pushParam.setFd_3af9d1441ef7b6(null != param.getEstimateStatus() ? param.getEstimateStatus() : CommonConstants.EMPTY_STRING); //ç»“ç®—çŠ¶æ€ @@ -798,7 +798,7 @@ public class DoJointInsuranceTask { //创建时间 pushParam.setCreateTime(DateUtil.getCurrentDateTime()); //应支出 - pushParam.setFd_3adfe6e3911ffe("实缴".equals(param.getSettleType()) ? pushParam.getFd_3adfe6610c0d2c() : 0); + pushParam.setFd_3adfe6e3911ffe(InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType()) ? pushParam.getFd_3adfe6610c0d2c() : 0); } //商险更新赋值 @@ -835,7 +835,7 @@ public class DoJointInsuranceTask { //事故或残疾 info.setFd_3adfe6609aa810(null != param.getDieDisableQuota() ? param.getDieDisableQuota() : CommonConstants.EMPTY_STRING); //hro结算月 - info.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM") : null); + info.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM) : null); insurancesInfoMapper.updateById(info); } } -- 2.18.1