Commit a6a966a4 authored by fangxinjiang's avatar fangxinjiang

EKP项目是否BPO结算模式字段同步-fxj

parent 0118f33d
...@@ -1639,7 +1639,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1639,7 +1639,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (Common.isNotNull(oldInsurance.getProcessStatus()) if (Common.isNotNull(oldInsurance.getProcessStatus())
&& (CommonConstants.THREE_STRING.equals(oldInsurance.getProcessStatus()) && (CommonConstants.THREE_STRING.equals(oldInsurance.getProcessStatus())
|| CommonConstants.FOUR_STRING.equals(oldInsurance.getProcessStatus()) || CommonConstants.FOUR_STRING.equals(oldInsurance.getProcessStatus())
|| CommonConstants.SIX_STRING.equals(oldInsurance.getProcessStatus()))) { || CommonConstants.SIX_STRING.equals(oldInsurance.getProcessStatus())
|| CommonConstants.SEVEN_STRING.equals(oldInsurance.getProcessStatus()))) {
oldInsurance.setModelType(CommonConstants.FOUR_STRING); oldInsurance.setModelType(CommonConstants.FOUR_STRING);
} }
} }
......
...@@ -412,4 +412,36 @@ public class InsuranceDetailVO implements Serializable { ...@@ -412,4 +412,36 @@ public class InsuranceDetailVO implements Serializable {
*/ */
@Schema(description = "是否地市自购") @Schema(description = "是否地市自购")
private String isAdress; private String isAdress;
/**
* 预估缴费状态 0待缴费、1已缴费
*/
@Schema(description = "预估缴费状态 0待缴费、1已缴费")
private String paymentStatus;
/**
* 缴费时间: EKP已收/已垫付 更新时间, 退单或撤销匹配 清空时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "缴费时间")
private String paymentTime;
/**
* 是否见费出单 0是 1 否 (新增或批增且启用‘是否启用BPO结算模式’且险种配置‘是否见费出单’为是时 此字段为是,否则为否)
*/
@Schema(description = "是否见费出单")
private String isJfcd;
/**
* 购买周期 (格式:4个月/117天)
*/
@Schema(description = "购买周期")
private String purchaseCycle;
/**
* 预计办理日期
*/
@Schema(description = "预计办理日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private LocalDate preHandleTime;
} }
...@@ -18,6 +18,11 @@ import java.util.List; ...@@ -18,6 +18,11 @@ import java.util.List;
@Schema(description = "投保列表请求参数") @Schema(description = "投保列表请求参数")
public class InsuranceListParam extends BaseEntity { public class InsuranceListParam extends BaseEntity {
/**
* 派单ID
*/
@Schema(description = "派单ID")
private String id;
/** /**
* 项目编码 * 项目编码
*/ */
......
...@@ -1011,7 +1011,7 @@ public class TInsuranceDetailController { ...@@ -1011,7 +1011,7 @@ public class TInsuranceDetailController {
if (detail == null) { if (detail == null) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
} }
if (!CommonConstants.SIX_STRING.equals(detail.getBuyHandleStatus())){ if (null != detail.getBuyHandleStatus() && CommonConstants.SIX_INT != detail.getBuyHandleStatus().intValue()){
return R.failed("请选择待缴费状态的投保记录!"); return R.failed("请选择待缴费状态的投保记录!");
} }
return tInsuranceDetailService.callBack(detail); return tInsuranceDetailService.callBack(detail);
......
...@@ -87,4 +87,6 @@ public interface EkpSettleMapper { ...@@ -87,4 +87,6 @@ public interface EkpSettleMapper {
List<EkpSettleStatusVo> getBalanceByInsuranceId(@Param("id")String id); List<EkpSettleStatusVo> getBalanceByInsuranceId(@Param("id")String id);
void deleteEkpInsuranceDetailAsso(@Param("id")String id); void deleteEkpInsuranceDetailAsso(@Param("id")String id);
void callBackBalance(@Param("id")String id);
} }
...@@ -80,4 +80,6 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> { ...@@ -80,4 +80,6 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
List<EkpSettleStatusVo> getBalanceByInsuranceId(String id); List<EkpSettleStatusVo> getBalanceByInsuranceId(String id);
void deleteEkpInsuranceDetailAsso(String id); void deleteEkpInsuranceDetailAsso(String id);
void callBackBalance(String id);
} }
...@@ -155,4 +155,16 @@ public class EkpSettleServiceImpl implements EkpSettleService { ...@@ -155,4 +155,16 @@ public class EkpSettleServiceImpl implements EkpSettleService {
public void deleteEkpInsuranceDetailAsso(String id) { public void deleteEkpInsuranceDetailAsso(String id) {
ekpSettleMapper.deleteEkpInsuranceDetailAsso(id); ekpSettleMapper.deleteEkpInsuranceDetailAsso(id);
} }
/**
* @Author fxj
* @Description 见费出单直接删除实缴与预估的差额
* @Date 15:45 2026/1/22
* @Param
* @return
**/
@Override
public void callBackBalance(String id) {
ekpSettleMapper.callBackBalance(id);
}
} }
...@@ -93,6 +93,9 @@ public class DoJointInsuranceTask { ...@@ -93,6 +93,9 @@ public class DoJointInsuranceTask {
if (type == CommonConstants.ONE_INT) { if (type == CommonConstants.ONE_INT) {
settle.setIsEstimatePush(CommonConstants.ONE_INT); settle.setIsEstimatePush(CommonConstants.ONE_INT);
settle.setEstimatePushTime(LocalDateTime.now()); settle.setEstimatePushTime(LocalDateTime.now());
}else if (type == CommonConstants.SEVEN_INT) {
settle.setIsEstimatePush(CommonConstants.ONE_INT);
settle.setEstimatePushTime(LocalDateTime.now());
} else { } else {
settle.setIsActualPush(CommonConstants.ONE_INT); settle.setIsActualPush(CommonConstants.ONE_INT);
settle.setActualPushTime(LocalDateTime.now()); settle.setActualPushTime(LocalDateTime.now());
......
...@@ -110,6 +110,9 @@ ...@@ -110,6 +110,9 @@
delete from ekp_insurances_info where fd_3b0a5743acab7e like concat(#{id},'%') and fd_jfcd='是' and (fd_3adfe6af71a1cc = '差额' or fd_3adfe6af71a1cc = '实缴') delete from ekp_insurances_info where fd_3b0a5743acab7e like concat(#{id},'%') and fd_jfcd='是' and (fd_3adfe6af71a1cc = '差额' or fd_3adfe6af71a1cc = '实缴')
</delete> </delete>
<delete id="callBackBalance">
delete from ekp_insurances_info where fd_3b0a5743acab7e like concat(#{id},'%') and fd_jfcd='是' and fd_3adfe6af71a1cc = '差额'
</delete>
<select id="getDeptSettle" resultMap="BaseDeptResultMap"> <select id="getDeptSettle" resultMap="BaseDeptResultMap">
select select
<include refid="Base_Column_Dept"></include> <include refid="Base_Column_Dept"></include>
......
...@@ -71,6 +71,14 @@ ...@@ -71,6 +71,14 @@
<result property="spaySettleFlag" column="SPAY_COLLECT_FLAG"/> <result property="spaySettleFlag" column="SPAY_COLLECT_FLAG"/>
<result property="spayCollectFlag" column="SPAY_SETTLE_FLAG"/> <result property="spayCollectFlag" column="SPAY_SETTLE_FLAG"/>
<result property="isAdress" column="IS_ADRESS" jdbcType="VARCHAR"/> <result property="isAdress" column="IS_ADRESS" jdbcType="VARCHAR"/>
<result property="paymentStatus" column="PAYMENT_STATUS" jdbcType="VARCHAR"/>
<result property="paymentTime" column="PAYMENT_TIME" jdbcType="VARCHAR"/>
<result property="isJfcd" column="IS_JFCD" jdbcType="VARCHAR"/>
<result property="purchaseCycle" column="PURCHASE_CYCLE" jdbcType="VARCHAR"/>
<result property="preHandleTime" column="PRE_HANDLE_TIME" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<resultMap id="UpdateMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceUpdateVO"> <resultMap id="UpdateMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceUpdateVO">
<id property="id" column="ID" jdbcType="VARCHAR"/> <id property="id" column="ID" jdbcType="VARCHAR"/>
...@@ -90,7 +98,7 @@ ...@@ -90,7 +98,7 @@
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK, IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,BPO_FLAG, CREATE_BY,CREATE_NAME,CREATE_TIME,BPO_FLAG,
UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME, UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME,
DEPT_NAME,UNIT_ID,UNIT_NAME,UNIT_NO,IS_ADRESS DEPT_NAME,UNIT_ID,UNIT_NAME,UNIT_NO,IS_ADRESS,PAYMENT_STATUS,PAYMENT_TIME,IS_JFCD,PURCHASE_CYCLE,PRE_HANDLE_TIME
</sql> </sql>
...@@ -125,12 +133,16 @@ ...@@ -125,12 +133,16 @@
a.IS_JFCD as isJfcd, a.IS_JFCD as isJfcd,
a.PURCHASE_CYCLE as purchaseCycle, a.PURCHASE_CYCLE as purchaseCycle,
a.BILLING_TYPE as billingType, a.BILLING_TYPE as billingType,
a.PRE_HANDLE_TIME as preHandleTime a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 where a.DELETE_FLAG = 0
<if test="param.isEffect != null"> <if test="param.isEffect != null">
and a.IS_EFFECT = #{param.isEffect} and a.IS_EFFECT = #{param.isEffect}
</if> </if>
<if test="param.id != null">
and a.id = #{param.id}
</if>
<if test="param.unitName != null and param.unitName.trim() != ''"> <if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%') and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if> </if>
...@@ -191,10 +203,10 @@ ...@@ -191,10 +203,10 @@
<if test="param.isJfcd != null and param.isJfcd.trim() != ''"> <if test="param.isJfcd != null and param.isJfcd.trim() != ''">
and a.IS_JFCD = #{param.isJfcd} and a.IS_JFCD = #{param.isJfcd}
</if> </if>
<if test="param.estimatePremiumStart != null and param.estimatePremiumStart.trim() != '' "> <if test="param.estimatePremiumStart != null">
and a.ESTIMATE_PREMIUM <![CDATA[ >= ]]> #{param.estimatePremiumStart} and a.ESTIMATE_PREMIUM <![CDATA[ >= ]]> #{param.estimatePremiumStart}
</if> </if>
<if test="param.estimatePremiumEnd != null and param.estimatePremiumEnd.trim() != ''"> <if test="param.estimatePremiumEnd != null">
and a.ESTIMATE_PREMIUM <![CDATA[ <= ]]> #{param.estimatePremiumEnd} and a.ESTIMATE_PREMIUM <![CDATA[ <= ]]> #{param.estimatePremiumEnd}
</if> </if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
...@@ -231,12 +243,16 @@ ...@@ -231,12 +243,16 @@
a.IS_JFCD as isJfcd, a.IS_JFCD as isJfcd,
a.PURCHASE_CYCLE as purchaseCycle, a.PURCHASE_CYCLE as purchaseCycle,
a.PRE_HANDLE_TIME as preHandleTime, a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium a.ESTIMATE_PREMIUM as estimatePremium,
a.BILLING_TYPE as billingType
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 where a.DELETE_FLAG = 0
<if test="param.isEffect != null"> <if test="param.isEffect != null">
and a.IS_EFFECT = #{param.isEffect} and a.IS_EFFECT = #{param.isEffect}
</if> </if>
<if test="param.id != null">
and a.id = #{param.id}
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''"> <if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo} and a.DEPT_NO = #{param.deptNo}
</if> </if>
...@@ -288,10 +304,10 @@ ...@@ -288,10 +304,10 @@
<if test="param.isJfcd != null and param.isJfcd.trim() != ''"> <if test="param.isJfcd != null and param.isJfcd.trim() != ''">
and a.IS_JFCD = #{param.isJfcd} and a.IS_JFCD = #{param.isJfcd}
</if> </if>
<if test="param.estimatePremiumStart != null and param.estimatePremiumStart.trim() != '' "> <if test="param.estimatePremiumStart != null">
and a.ESTIMATE_PREMIUM <![CDATA[ >= ]]> #{param.estimatePremiumStart} and a.ESTIMATE_PREMIUM <![CDATA[ >= ]]> #{param.estimatePremiumStart}
</if> </if>
<if test="param.estimatePremiumEnd != null and param.estimatePremiumEnd.trim() != ''"> <if test="param.estimatePremiumEnd != null">
and a.ESTIMATE_PREMIUM <![CDATA[ <= ]]> #{param.estimatePremiumEnd} and a.ESTIMATE_PREMIUM <![CDATA[ <= ]]> #{param.estimatePremiumEnd}
</if> </if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
...@@ -419,7 +435,7 @@ ...@@ -419,7 +435,7 @@
a.REFUND_ID as refundId, a.REFUND_ID as refundId,
a.EXPIRE_REMARK, a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG, a.EXPIRE_IGNORE_FLAG,
a.IS_ADRESS as isAdress a.IS_ADRESS as isAdress,PAYMENT_STATUS,PAYMENT_TIME,IS_JFCD,PURCHASE_CYCLE,PRE_HANDLE_TIME
from t_insurance_detail a from t_insurance_detail a
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
where a.ID = #{id} where a.ID = #{id}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment