商险提醒

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceWarnExportVo.java

@@ -97,8 +97,8 @@ public class InsuranceWarnExportVo implements Serializable {
 	 * 实际保费
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "保费")
-	@Schema(name = "保费")
+	@ExcelProperty(value = "实际保费")
+	@Schema(name = "实际保费")
 	private BigDecimal actualPremium;
 	/**
 	 * 创建人
@@ -120,8 +120,8 @@ public class InsuranceWarnExportVo implements Serializable {
 	 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "办理状态")
-	@Schema(name = "办理状态")
+	@ExcelProperty(value = "状态")
+	@Schema(name = "状态")
 	private String buyHandleStatus;
 	/**
 	 * 出险状态（0未出险；1已出险）
@@ -256,11 +256,11 @@ public class InsuranceWarnExportVo implements Serializable {
 	private BigDecimal estimatePremium;
 
 	/**
-	 * 结算类型 (0、与薪资合并结算 1、单独结算)
+	 * 结算类型 (0、与薪资结算 1、单独结算)
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "结算类型")
-	@Schema(description = "结算类型 (0、与薪资合并结算 1、单独结算)")
+	@Schema(description = "结算类型 (0、与薪资结算 1、单独结算)")
 	private String settleType;
 
 	/**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -7530,7 +7530,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (entity == null) {
 			return R.failed("未查询到相关商险订单");
 		}
-		entity.setExpireIgnoreFlag(vo.getExpireIgnoreFlag());
+		entity.setExpireIgnoreFlag(CommonConstants.ZERO_STRING);
 		baseMapper.updateById(entity);
 		return R.ok();
 	}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -1592,11 +1592,13 @@
 			a.ACTUAL_PREMIUM,
 			a.CREATE_NAME,
 			a.CREATE_TIME,
-			"已办理" as "BUY_HANDLE_STATUS",
+			"已投保" as "BUY_HANDLE_STATUS",
 			a.POLICY_NO,
 			a.MEDICAL_QUOTA,
 			a.DIE_DISABLE_QUOTA,
-			a.SETTLE_TYPE,
+			case when a.SETTLE_TYPE = 0 then "与薪资结算"
+				 when a.SETTLE_TYPE = 1 then "单独结算"
+				 else null  end  as  "SETTLE_TYPE" ,
 			a.SETTLE_MONTH,
 			a.INVOICE_NO,
 			r2.REPLACE_TIME,