Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:新增是否BPO客户字段"

See merge request !251

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java

@@ -228,6 +228,12 @@ public class EkpInsuranceUtil {
 			}else{
 				pushParam.setFd_3b0a5937928c8c(CommonConstants.EMPTY_STRING);
 			}
+			//是否bro客户
+			if(null != param.getBpoFlag()){
+				pushParam.setFd_3b178f8ba1a91c(param.getBpoFlag());
+			}else{
+				pushParam.setFd_3b178f8ba1a91c(CommonConstants.EMPTY_STRING);
+			}
 		return pushParam;
 	}
 	}

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java

@@ -125,6 +125,13 @@ public class EKPInsurancePushParam {
 	 */
 	private String	fd_3b0a5937928c8c;
 
+	/**
+	 * 是否为BPO业务（是、否）
+	 */
+	private String	fd_3b178f8ba1a91c;
+
+
+
 
 
 

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

@@ -315,8 +315,12 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "减员id")
 	private String refundId;
 
-
-
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
 
 
 

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -176,4 +177,11 @@ public class EkpInteractiveParam implements Serializable {
 	 */
 	@Schema(description = "状态:有，无")
 	private String estimateStatus;
+
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -170,4 +171,11 @@ public class InsuranceAddParam  implements Serializable {
 	 */
 	@JsonIgnore
 	private Integer insuranceHandleCity;
+
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -183,4 +184,11 @@ public class InsuranceBatchParam implements Serializable {
 	 */
 	@JsonIgnore
 	private LocalDate policyEnd;
+
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -100,4 +101,11 @@ public class InsuranceReplaceParam implements Serializable {
 	@JsonIgnore
 	private Integer settleType;
 
+	/**
+	 * EKP的 是否BPO：  是  否
+	 */
+	@Schema(description = "是否BPO", name = "bpoFlag")
+	@ExcelIgnore
+	private String bpoFlag;
+
 }

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

@@ -1494,8 +1494,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						if(StringUtils.isNotBlank(defaultSettleId)){
 							TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
 							if(Optional.ofNullable(settle).isPresent()){
+								Integer isActualPush = settle.getIsActualPush();
 								//如果当前实缴信息未推送，则新增实缴单推送
-								if(settle.getIsActualPush() == CommonConstants.ZERO_INT){
+								if(CommonConstants.ZERO_INT == isActualPush){
 									//保费存储
 									settle.setActualPremium(new BigDecimal(success.getActualPremium()));
 									settle.setIsActualPush(CommonConstants.ZERO_INT);
@@ -1516,7 +1517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								//如果当前实缴信息已推送，且金额与本次不一致，则推送实缴更新
 								BigDecimal bigDecimal = new BigDecimal(success.getActualPremium());
 								boolean b = bigDecimal.compareTo(detail.getActualPremium()) == CommonConstants.ZERO_INT;
-								if(CommonConstants.ONE_INT == settle.getIsActualPush() && b){
+								if(CommonConstants.ONE_INT == isActualPush && !b){
 									//推送保费更新
 									settle.setActualPremium(bigDecimal);
 									settle.setIsActualPush(CommonConstants.ZERO_INT);
@@ -1533,21 +1534,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 										}
 									});
 								}else{
-										//推送保费更新
-										settle.setActualPremium(bigDecimal);
-										settle.setIsActualPush(CommonConstants.ZERO_INT);
-										settle.setUpdateTime(LocalDateTime.now());
-										tInsuranceSettleService.updateById(settle);
-										//调EKP更新实际保费
-										detail.setActualPremium(bigDecimal);
-										threadPool.execute(() ->{
-											String s = pushEstimate(detail,CommonConstants.FOUR_INT);
-											if(StringUtils.isNotBlank(s)){
-												settle.setActualPushTime(LocalDateTime.now());
-												settle.setIsActualPush(CommonConstants.ONE_INT);
-												tInsuranceSettleService.updateById(settle);
-											}
-									});
+									//推送保费更新
+									settle.setActualPremium(bigDecimal);
+									settle.setIsActualPush(CommonConstants.ZERO_INT);
+									settle.setUpdateTime(LocalDateTime.now());
+									tInsuranceSettleService.updateById(settle);
+									//调EKP更新实际保费
+									detail.setActualPremium(bigDecimal);
+									threadPool.execute(() ->{
+										String s = pushEstimate(detail,CommonConstants.FOUR_INT);
+										if(StringUtils.isNotBlank(s)){
+											settle.setActualPushTime(LocalDateTime.now());
+											settle.setIsActualPush(CommonConstants.ONE_INT);
+											tInsuranceSettleService.updateById(settle);
+										}});
 								}
 							}
 						}
@@ -1936,6 +1936,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							listResult.add(param);
 							continue;
 						}else {
+							param.setBpoFlag(projectSetInfoVo.getBpoFlag());
 							param.setSettleType(Integer.parseInt(settleType));
 						}
 					}
@@ -2309,6 +2310,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							}else {
 								param.setSettleType(Integer.parseInt(settleType));
 							}
+							param.setBpoFlag(projectSetInfoVo.getBpoFlag());
 							param.setDeptId(projectSetInfoVo.getId());
 						}
 					}
@@ -2692,6 +2694,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							}else {
 								param.setSettleType(Integer.parseInt(settleType));
 								param.setDeptId(projectSetInfoVo.getId());
+								param.setBpoFlag(projectSetInfoVo.getBpoFlag());
 							}
 						}
 					}

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

@@ -57,6 +57,7 @@
 			<result property="createUserDeptId" column="CREATE_USER_DEPT_ID" jdbcType="VARCHAR"/>
 			<result property="createUserDeptName" column="CREATE_USER_DEPT_NAME" jdbcType="VARCHAR"/>
 			<result property="deptId" column="DEPT_ID" jdbcType="VARCHAR"/>
+			<result property="bpoFlag" column="BPO_FLAG" jdbcType="VARCHAR"/>
 	</resultMap>
     <sql id="Base_Column_List">
         ID,EMP_NAME,
@@ -69,7 +70,7 @@
         ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SIGN_FLAG,
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
-        CREATE_BY,CREATE_NAME,CREATE_TIME,
+        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
 
 	</sql>
@@ -136,9 +137,6 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and detail.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
-		<if test="param.authSql != null and param.authSql.trim() != ''">
-			${tEmployeeInfo.authSql}
-		</if>
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 	<!--投保不分页查询-->