Merge remote-tracking branch 'origin/develop' into develop

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

@@ -75,6 +75,15 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	List<InsuranceExportListVO> getInsuranceExportList(@Param("param") InsuranceExportListParam param);
 
+	/**
+	 * 批量更新保单号
+	 *
+	 * @author licancan
+	 * @param details
+	 * @return void
+	 */
+	void updatePolicyNoBatch(@Param("details") List<TInsuranceDetail> details);
+
 	/***********************减员办理********************************/
 
 	/**

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

@@ -800,7 +800,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<TInsuranceOperate> list = tInsuranceOperateService.list(Wrappers.<TInsuranceOperate>query().lambda()
 				.eq(TInsuranceOperate::getInsuranceDetailId,id)
 				.eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT)
-				.orderByDesc(TInsuranceOperate::getCreateTime)
+				.orderByAsc(TInsuranceOperate::getCreateTime)
 		);
 		return list;
 	}
@@ -1306,6 +1306,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				detail.setUpdateTime(LocalDateTime.now());
 				if (StringUtils.isNotBlank(success.getPolicyNo())){
 					detail.setPolicyNo(success.getPolicyNo());
+
+					//如果保单号不为空，将替换类型的保单号也全部更新
+					List<TInsuranceReplace> list = tInsuranceReplaceService.list(Wrappers.<TInsuranceReplace>query().lambda()
+							.eq(TInsuranceReplace::getOriginInsuranceDetailId, detail.getId()));
+					if (CollectionUtils.isNotEmpty(list)){
+						List<String> collect = list.stream().map(TInsuranceReplace::getToInsuranceDetailId).distinct().collect(Collectors.toList());
+						List<TInsuranceDetail> details = this.baseMapper.selectBatchIds(collect);
+						if (CollectionUtils.isNotEmpty(details)){
+							details.stream().forEach(e -> e.setPolicyNo(success.getPolicyNo()));
+							//这里自己写sql更新保单号，防止用mybatisPlus批量更新，把updateTime更新了（updateTime不能更新）
+							baseMapper.updatePolicyNoBatch(details);
+						}
+					}
 				}
 				if (StringUtils.isNotBlank(success.getActualPremium())){
 					//判断推送金额是否一致，不一致才推送ekp

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

@@ -386,6 +386,12 @@
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
 
+	<update id="updatePolicyNoBatch">
+		<foreach collection="details" index="index" item="item" separator=";">
+				update t_insurance_detail set POLICY_NO = #{item.policyNo} where ID = #{item.id}
+		</foreach>
+	</update>
+
 	<!-- ***********************减员办理******************************** -->
 	<!-- 已投保列表分页查询-->
 	<select id="getInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">

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

@@ -49,6 +49,7 @@
 		<if test="param.endTime != null and param.endTime.trim() != '' ">
 			AND e.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endTime}, ' 23:59:59')
 		</if>
+		order by e.CREATE_TIME desc
 
 	</select>