From b85e9515805a88914c5c97de8c312146510d1b4e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 10:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index f79a210..2615bbf 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -214,11 +214,11 @@
update.setId(model.getId());
settleClaimsMapper.updateById(update);
-// Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
-// String info =applyLogType.getInfo();
-// info = info.replace("${param}", param.getCheckInfo());
-// SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
-// settleClaimsLogMapper.insert(log);
+ Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", param.getCheckInfo());
+ SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ settleClaimsLogMapper.insert(log);
return 1;
}
@@ -803,6 +803,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,SettleClaims::getInsuranceApplyId)
.leftJoin(Solutions.class,Solutions::getId,SettleClaims::getSolutionId);
queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(SettleClaims::getIsdeleted,Constants.ZERO);
if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
//鍙兘鐪嬫潈闄愯寖鍥村唴
if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
--
Gitblit v1.9.3