Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

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

@@ -7236,9 +7236,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			//根据结算单号获取明细id和结算状态
 			viewVoList = ekpSettleService.selectViewBySettleNo(vo.getSettleNo(),vo.getPayFlag());
 			if (!viewVoList.isEmpty()) {
+				String insuranceId;
 				for (EkpInsuranceViewVo viewVo : viewVoList) {
 					//获取所有的明细id
-					detail = baseMapper.selectById(viewVo.getId());
+					insuranceId = viewVo.getId().substring(0,19);
+					detail = baseMapper.selectById(insuranceId);
 					if (Common.isNotNull(detail)) {
 						//判断是收入还是支出结算单号
 						if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {