"feature-zhaJi:修改商险重发部分逻辑"

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java

@@ -38,7 +38,7 @@ public class TInsuranceEkp implements Serializable {
 	/**
 	 * 单据类型 (0、与薪资合并结算 1、单独结算)
 	 */
-	private Integer settleType;
+	private String settleType;
 
     /**
      * 项目编码
@@ -138,7 +138,7 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 单据状态
      */
-    private Integer interactiveType;
+    private String interactiveType;
 
     /**
      * 重发标识

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

@@ -5648,13 +5648,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-			pushType = CommonConstants.FIVE_INT;
+			pushType = CommonConstants.SIX_INT;
 		}
 		//4更新实际保费(用于登记保单保费场景推送过实缴保费)
 		if(CommonConstants.FOUR_INT == type){
 			param.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
-			pushType = CommonConstants.SEVEN_INT;
+			pushType = CommonConstants.THREE_INT;
 		}
 		//作废
 		if(CommonConstants.FIVE_INT == type){

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

@@ -32,6 +32,7 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="pushTime" column="PUSH_TIME" jdbcType="TIMESTAMP"/>
 			<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
+		<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
 
     </resultMap>
 
@@ -44,7 +45,7 @@
         POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
         DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
-        CREATE_TIME,PUSH_TIME,PUSH_TYPE
+        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE
     </sql>
 
 	<select id="getEkpRefundList" resultMap="BaseResultMap">