Merge branch 'feature-20250424-release' into feature-20250422-community2

This commit is contained in:
lxu75
2025-04-25 14:06:56 +08:00
2 changed files with 7 additions and 1 deletions

View File

@@ -241,6 +241,9 @@ public class ClaimVerificationServiceImpl implements ClaimVerificationService {
@NotNull @NotNull
private static JSONObject getJsonObjectToNewBie(JSONObject diFyObject, ClaimVerificationFileDTO claimVerificationFileAnalysisDTO, String aiAnalysisRequestId) { private static JSONObject getJsonObjectToNewBie(JSONObject diFyObject, ClaimVerificationFileDTO claimVerificationFileAnalysisDTO, String aiAnalysisRequestId) {
if (diFyObject.containsKey("answer") && !diFyObject.getJSONObject("answer").isEmpty()) {
diFyObject = diFyObject.getJSONObject("answer");
}
String warrantyAuditReport = diFyObject.getString("warrantyAuditReport"); String warrantyAuditReport = diFyObject.getString("warrantyAuditReport");
warrantyAuditReport = StringEscapeUtils.unescapeJava(warrantyAuditReport); warrantyAuditReport = StringEscapeUtils.unescapeJava(warrantyAuditReport);
JSONObject audiResToAfter = JSON.parseObject(warrantyAuditReport); JSONObject audiResToAfter = JSON.parseObject(warrantyAuditReport);
@@ -266,6 +269,10 @@ public class ClaimVerificationServiceImpl implements ClaimVerificationService {
throw new RuntimeException(" 售后索赔检核文件分析dify返回结果为空"); throw new RuntimeException(" 售后索赔检核文件分析dify返回结果为空");
} }
JSONObject difyToAfter = JSONObject.parseObject(toAfter); JSONObject difyToAfter = JSONObject.parseObject(toAfter);
if (difyToAfter.containsKey("answer") && !difyToAfter.getJSONObject("answer").isEmpty()) {
difyToAfter = diFyObject.getJSONObject("answer");
}
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("newBieAfterSalesId", claimVerificationFileAnalysisDTO.getNewBieAfterSalesId()); data.put("newBieAfterSalesId", claimVerificationFileAnalysisDTO.getNewBieAfterSalesId());
data.put("businessType", claimVerificationFileAnalysisDTO.getBusinessType()); data.put("businessType", claimVerificationFileAnalysisDTO.getBusinessType());

View File

@@ -24,7 +24,6 @@ public class DataMaskingRuleServiceImpl extends ServiceImpl<DataMaskingRuleMappe
//根据适用渠道applicationChannel获取数据脱敏规则List //根据适用渠道applicationChannel获取数据脱敏规则List
List<DataMaskingRule> dataMaskingRuleList = this.lambdaQuery() List<DataMaskingRule> dataMaskingRuleList = this.lambdaQuery()
.like(DataMaskingRule::getApplicationChannel, applicationChannel) .like(DataMaskingRule::getApplicationChannel, applicationChannel)
.eq(DataMaskingRule::getApplicationChannel, applicationChannel)
.eq(DataMaskingRule::getRuleStatus, YesOrNoConstants.YES) .eq(DataMaskingRule::getRuleStatus, YesOrNoConstants.YES)
.eq(DataMaskingRule::getIsDeleted, YesOrNoConstants.NO) .eq(DataMaskingRule::getIsDeleted, YesOrNoConstants.NO)
.list(); .list();