Merge branch 'develop' into feature-licancan

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -37,21 +38,15 @@ public class TInsuranceSettleCancel implements Serializable {
      * 项目名称
      */
     private String deptName;
-
-    /**
-     * 订单编号
-     */
-    private String orderNo;
-
     /**
-     * 推送标识 1成功 0失败
+     * 推送标识 未推送，1成功 0失败
      */
     private Integer isCancelPush;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 操作人

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

@@ -327,8 +327,8 @@ public class TInsuranceDetailController {
 	 * @return {@link R<IPage<  RefundExportListVo  >>}
 	 */
 	@Operation(summary = "减员办理列表分页查询", description = "减员办理列表分页查询")
-	@PostMapping("/getInsuranceRefundHandlingPageList")
-	public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, @RequestBody InsuranceRefundHandlingParam param) {
+	@GetMapping("/getInsuranceRefundHandlingPageList")
+	public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page,InsuranceRefundHandlingParam param) {
 		return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param));
 	}
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java

@@ -152,7 +152,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	TInsuranceRefundDetail selectRefundDetail(@Param("param") TInsuranceRefundDetail refundDetail);
 
 	/**
-	 * TODO
+	 * 根据ID导出减员办理列表
 	 *
 	 * @author zhaji
 	 * @param idList
@@ -161,7 +161,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	List<RefundExportListVo> getRefundExportListBySelect(@Param("idList")List<String> idList);
 
 	/**
-	 * TODO
+	 * 导出减员办理列表
 	 *
 	 * @author zhaji
 	 * @param param

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

@@ -2632,12 +2632,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.set(TInsuranceDetail :: getSettleType,success.getNewSettleType())
 						.set(TInsuranceDetail :: getUpdateBy,user.getId())
 						.set(TInsuranceDetail :: getUpdateTime,LocalDateTime.now());
-				TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
+
 				//如果旧项目为合并结算，且新项目也是合并结算，则计算新的预估保费，作废旧的预估保费
 				if(CommonConstants.ZERO_INT == oldSettleType && CommonConstants.ZERO_INT == newSettleType){
 					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 					//如果存在则更新，不存在则新建
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
+
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2645,6 +2647,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceSettle.setUpdateTime(LocalDateTime.now());
 						tInsuranceSettleService.updateById(tInsuranceSettle);
 					}else{
+						TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
 						tInsuranceSettle.setInsDetailId(success.getId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setSettleHandleStatus(CommonConstants.ONE_STRING);
@@ -2661,6 +2664,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if(CommonConstants.ZERO_INT == oldSettleType && CommonConstants.ONE_INT == newSettleType){
 					//更新旧的结算信息
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2671,7 +2675,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						TInsuranceSettleCancel tInsuranceSettleCancel = new TInsuranceSettleCancel();
 						tInsuranceSettleCancel.setInsDetailId(success.getId());
 						tInsuranceSettleCancel.setSettleId(success.getDefaultSettleId());
-
+						tInsuranceSettleCancel.setDeptNo(success.getOldDeptNo());
+						tInsuranceSettleCancel.setIsCancelPush(CommonConstants.ZERO_INT);
+						tInsuranceSettleCancel.setCreateUesr(user.getId());
+						tInsuranceSettleCancel.setCreateTime(LocalDateTime.now());
 					}else{
 						//更新预估保费
 						updateWrapper.set(TInsuranceDetail ::getEstimatePremium,new BigDecimal("0"));
@@ -2682,6 +2689,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 					//更新旧的结算信息
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2690,6 +2698,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceSettleService.updateById(tInsuranceSettle);
 						//推送EKP
 					}else{
+						TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
 						tInsuranceSettle.setInsDetailId(success.getId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setSettleHandleStatus(CommonConstants.ONE_STRING);
@@ -2702,9 +2711,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						updateWrapper.set(TInsuranceDetail::getDefaultSettleId,tInsuranceSettle.getId());
 					}
 				}
-				//如果旧项目为单独结算，且新项目也是单独结算，则更新单独结算信息
+				//如果旧项目为单独结算，且新项目也是单独结算，则更新项目编码，并发送至ekp
 				if(CommonConstants.ONE_INT == oldSettleType && CommonConstants.ONE_INT == newSettleType){
-					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
+					//updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 				}
 				update(updateWrapper);
 				TInsuranceOperate insuranceOperate = new TInsuranceOperate();
@@ -2720,8 +2729,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<DeptChangeCheckParam> errorList = stringListMap.get("errorList");
 		return R.ok(errorList,"导入成功");
 	}
+
+	/**
+	 * 发送变更结算月至EKP
+	 *
+	 * @author zhaji
+	 * @param successList
+	 * @return void
+	 */
+	private void updateMonth2EKP(List<DeptChangeCheckParam> successList) {
+		for (DeptChangeCheckParam param : successList) {
+			String newDeptNo = param.getNewDeptNo();
+			String oldDeptNo = param.getOldDeptNo();
+			Integer newSettleType = param.getNewSettleType();
+			Integer oldSettleType = param.getOldSettleType();
+			String defaultSettleId = param.getDefaultSettleId();
+			if (StringUtils.isNotBlank(defaultSettleId) && CommonConstants.ZERO_INT == newSettleType){
+
+			}
+		}
+	}
+
 	/**
-	 * 发送变更通知至EKP
+	 * 发送变更项目至EKP
 	 *
 	 * @author zhaji
 	 * @param successList
@@ -2740,6 +2770,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 	}
 
+	/**
+	 * 发送作废信息至EKP
+	 *
+	 * @author zhaji
+	 * @param cancelList 作废信息列表
+	 * @return void
+	 */
+	private void pushSettleCancel2EKP(List<TInsuranceSettleCancel> cancelList) {
+		for (TInsuranceSettleCancel param : cancelList) {
+
+		}
+	}
+
 	/**
 	 * 根据保险公司名称查询保单明细
 	 *
@@ -3485,7 +3528,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					param.setEstimatePremium(estimatePremium);
 				}
 			}
-			//如果
+			//去重
 			for (int j =0 ;j< deptChangeCheckList.size();j++) {
 				DeptChangeCheckParam CheckParam = deptChangeCheckList.get(j);
 				if(CheckParam.getEmpName().equals(param.getEmpName())

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

@@ -564,16 +564,13 @@
 			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
-			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
+			and detail.DEPT_NO = #{param.deptNo}
 		</if>
 		<if test="param.reduceHandleStatus != null">
 			and detail.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
 		</if>
-		<if test="param.isOverdue != null">
-			and detail.IS_OVERDUE like concat('%',replace(replace(#{param.isOverdue},'_','\_'),'%','\%'),'%')
-		</if>
-		<if test="param.isUse != null">
-			and detail.IS_USE like concat('%',replace(replace(#{param.isUse},'_','\_'),'%','\%'),'%')
+		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
+			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
 		</if>
 		ORDER BY refund.CREATE_TIME DESC
 	</select>
@@ -672,7 +669,7 @@
 			and detail.POLICY_NO = #{param.policyNo}
 		</if>
 	</select>
-	<!-- 已投保列表分页查询-->
+	<!-- 根据ID导出减员办理列表-->
 	<select id="getRefundExportListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.RefundExportListVo">
 		select
 			detail.id as id,
@@ -705,7 +702,7 @@
 		</foreach>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
-	<!-- 已投保列表分页查询-->
+	<!-- 根据查询参数导出减员办理列表-->
 	<select id="getRefundExportList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.RefundExportListVo">
 		select
 		    detail.id as id,
@@ -740,14 +737,14 @@
 			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
-			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
+			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
-			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
+		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
+			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
-	<!-- 已投保列表分页查询-->
+	<!-- 减员办理-->
 	<update id="updateInsuranceRefund">
 		update
 			t_insurance_detail detail
@@ -762,7 +759,7 @@
 		</foreach>
 	</update>
 
-	<!--getInsuranceListByIdCard-->
+	<!--根据身份证查询商险信息-->
 	<select id="getInsuranceListByIdCard" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListByIdCardVo">
 		SELECT
 		<include refid="Base_Column_List"/>

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

@@ -10,7 +10,6 @@
             <result property="settleId" column="SETTLE_ID" jdbcType="VARCHAR"/>
             <result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
             <result property="deptName" column="DEPT_NAME" jdbcType="VARCHAR"/>
-            <result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
             <result property="isCancelPush" column="IS_CANCEL_PUSH" jdbcType="TINYINT"/>
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="createUesr" column="CREATE_UESR" jdbcType="VARCHAR"/>
@@ -18,7 +17,7 @@
 
     <sql id="Base_Column_List">
         ID,INS_DETAIL_ID,SETTLE_ID,
-        DEPT_NO,DEPT_NAME,ORDER_NO,
+        DEPT_NO,DEPT_NAME,
         IS_CANCEL_PUSH,CREATE_TIME,CREATE_UESR
     </sql>
 </mapper>