"feature-zhaJi:新增减员办理导入接口"

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -505,6 +505,11 @@ public class InsurancesConstants {
 	 */
 	public static final String SETTLE_MONTH_CHANGE_LIST_IS_EMPTY ="当前变更结算月列表为空";
 
+	/**
+	 * 减员办理导入列表为空
+	 */
+	public static final String INSURANCE_REFUND_IMPORT_LIST_IS_EMPTY ="减员办理导入列表为空";
+
 	/**
 	 * 替换类型无法变更项目
 	 */
@@ -684,12 +689,12 @@ public class InsurancesConstants {
 	/**
 	 * 导入减员数据
 	 */
-	public static final String INSURANCE_REFUND_IMPORT = "导入减员数据";
+	public static final String INSURANCE_REFUND_IMPORT = "减员提交申请";
 
 	/**
 	 * 减员导出办理
 	 */
-	public static final String INSURANCE_REFUND_EXPORT = "减员导出办理";
+	public static final String INSURANCE_REFUND_EXPORT = "减员办理中";
 
 	/**
 	 * 减员办理成功
@@ -700,7 +705,7 @@ public class InsurancesConstants {
 	/**
 	 * 减员退回成功
 	 */
-	public static final String INSURANCE_REFUND_FAILED = "减员退回";
+	public static final String INSURANCE_REFUND_FAILED = "减员办理退回";
 
 	/**
 	 * 变更所属项目
@@ -794,5 +799,96 @@ public class InsurancesConstants {
 	 */
 	public static final String INSURANCES_DETAIL_IS_OVERDUE_ERROR = "保单信息已过期，不能进行出险操作";
 
+	/**
+	 * 当前的操作类型不正确
+	 */
+
+	/**
+	 * 减员办理列表为空
+	 */
+
+	/**
+	 * 减员退回的办理意见不能为空
+	 */
+	public static final String REFUND_MESSAGE_IS_EMPTY = "减员退回的办理意见不能为空";
+
+	/**
+	 * 	该保单信息已被更新为减员退回
+	 */
+
+	/**
+	 * 该保单信息已被更新为减员成功
+	 */
+
+	/**
+	 * 该保单信息已被删除
+	 */
+	public static final String INSURANCES_IS_DELETE = "该保单信息已被删除";
+
+	/**
+	 * 导入成功
+	 */
+	public static final String IMPORT_SUCCESS = "导入成功";
+
+
+	/**
+	 * 成功
+	 */
+	public static final String SUCCESS = "成功";
+
+	/**
+	 * 失败
+	 */
+	public static final String FAILED = "失败";
+
+	/**
+	 * 办理结果类型错误
+	 */
+	public static final String HAND_RESULT_ERROR = "办理结果类型错误";
+
+	/**
+	 * 办理结果为空
+	 */
+	public static final String HAND_RESULT_IS_EMPTY = "办理结果为空";
+
+	/**
+	 * 无该条数据的操作权限
+	 */
+	public static final String NO_DETAIL_JURISDICTION = "无该条数据的操作权限";
+
+	/**
+	 * 当前为待投保状态，不可办理
+	 */
+	public static final String BUY_HANDLE_STATUS_ONE_HANDLE_ERROR = "当前为待投保状态，不可办理";
+	/**
+	 * 当前为投保中状态，不可办理
+	 */
+	public static final String BUY_HANDLE_STATUS_TWO_HANDLE_ERROR = "当前为投保中状态，不可办理";
+	/**
+	 * 当前为已投保状态，不可办理
+	 */
+	public static final String BUY_HANDLE_STATUS_THREE_HANDLE_ERROR = "当前为已投保状态，不可办理";
+	/**
+	 * 当前为投保退回状态，不可办理
+	 */
+	public static final String BUY_HANDLE_STATUS_FOUR_HANDLE_ERROR = "当前为投保退回状态，不可办理";
+	/**
+	 * 当前为待减员状态，不可办理
+	 */
+	public static final String REFUND_STATUS_ONE_HANDLE_ERROR = "当前为待减员状态，不可办理";
+	/**
+	 * 当前为已减员状态，不可办理
+	 */
+	public static final String REFUND_STATUS_THREE_HANDLE_ERROR = "当前为已减员状态，不可办理";
+	/**
+	 * 当前为减员退回状态，不可办理
+	 */
+	public static final String REFUND_STATUS_FOUR_HANDLE_ERROR = "当前为减员退回状态，不可办理";
+
+
+
+
+
+
 
 }

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

@@ -238,7 +238,7 @@ public class TInsuranceDetail extends BaseEntity {
     /**
      * 减员状态 1待减员 2减员中3减员退回
      */
-	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回,4减员成功")
     private Integer reduceHandleStatus;
 
     /**

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java

@@ -83,7 +83,7 @@ public class EKPUtil {
 	 * 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"]
 	 */
 	public static String sendToEKP(EKPInteractiveParam param){
-		System.out.println("开始推送EKP");
+		log.info("推送EKP开始");
 		RestTemplate yourRestTemplate = new RestTemplate();
 		TInsuranceSettlePushParam pushParam = InsuranceDetail2PushParam(param);
 		try{
@@ -112,21 +112,18 @@ public class EKPUtil {
 			//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
 			HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
 			//有返回值的情况 VO可以替换成具体的JavaBean
-			System.out.println("交易开始");
 			ResponseEntity<String> obj = yourRestTemplate.exchange(url, HttpMethod.POST, entity, String.class);
-			System.out.println("交易结束");
-			System.out.println("obj"+obj);
 			String body = obj.getBody();
 			if (StringUtils.isBlank(body)){
-				System.out.println("交易失败"+body);
-				return body;
+				log.error("交易失败");
+				return null;
 			}else{
-				System.out.println("交易成功"+body);
+				log.info("交易成功："+body);
 				return body;
 			}
 		}catch (Exception e){
-			log.info(e.toString());
-			return e.getMessage();
+			log.info(e.getMessage());
+			return null;
 		}
 	}
 

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
@@ -24,9 +22,60 @@ public class InsuranceRefundImportParam implements Serializable {
 	@Schema(description = "商险id")
 	private String id;
 
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+	/**
+	 * 员工身份证号码
+	 */
+	@Schema(description = "员工身份证号码")
+	private String empIdcardNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 保单开始日期
+	 */
+	@Schema(description = "保单开始日期")
+	private String policyStart;
+	/**
+	 * 保单结束日期
+	 */
+	@Schema(description = "保单结束日期")
+	private String policyEnd;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 办理类型
+	 */
+	@Schema(description = "办理类型")
+	private String handType;
+
 	/**
 	 * 办理意见
 	 */
 	@Schema(description = "办理意见")
 	private String remark;
+
+	/**
+	 * 错误信息
+	 */
+	@Schema(description = "错误信息")
+	private String errorMessage;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -381,6 +381,19 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.updateInsuranceRefund(insuranceDetail);
 	}
 
+	/**
+	 * 减员办理导入
+	 *
+	 * @author zhaji
+	 * @param insuranceRefundImportList 减员信息
+	 * @return {@link R<List<InsuranceRefundImportParam>>}
+	 */
+	@Operation(summary = "减员办理导入", description = "减员办理导入")
+	@PostMapping("/insuranceRefundImport")
+	public R insuranceRefundImport(@RequestBody List<InsuranceRefundImportParam> insuranceRefundImportList) {
+		return tInsuranceDetailService.insuranceRefundImport(insuranceRefundImportList);
+	}
+
 	/**
 	 * 根据保险公司名称查询保单明细
 	 *

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

@@ -242,6 +242,16 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	R updateInsuranceRefund(InsuranceRefundListParam insuranceDetail);
 
+	/**
+	 * 减员办理导入
+	 *
+	 * @author zhaji
+	 * @param insuranceRefundImportList 减员办理导入
+	 * @return {@link R}
+	 */
+	R insuranceRefundImport(List<InsuranceRefundImportParam> insuranceRefundImportList);
+
+
 	/**
 	 * 变更结算月
 	 *