From 49864198306482dc8c28a519ba7291cfe3a6f562 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 15:56:32 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index a92609d..e9de07d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -13,9 +13,11 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.ApplyDetailJoinMapper;
+import com.doumee.dao.business.join.ApplyLogJoinMapper;
import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
import com.doumee.dao.business.join.UnionApplyJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UnionApplyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -79,6 +81,8 @@
private SmsEmailService smsEmailService;
@Autowired
private ApplyLogMapper applyLogMapper;
+ @Autowired
+ private ApplyLogJoinMapper applyLogJoinMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -274,6 +278,21 @@
unionApply.setServiceDays(DateUtil.daysBetweenDates(new Date(),unionApply.getStartTime())+1);
}
}
+
+ //鏌ヨ鎿嶄綔璁板綍
+ List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
+ new MPJLambdaWrapper<ApplyLog>()
+ .selectAll(ApplyLog.class)
+ .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
+ .selectAs(Company::getName,ApplyLog::getCompanyName)
+ .selectAs(SystemUser::getType,ApplyLog::getCreatorType)
+ .leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.THREE))
+ .eq(ApplyLog::getApplyId,unionApply.getId())
+ .orderByAsc(ApplyLog::getCreateDate)
+ );
+ unionApply.setApplyLogList(applyLogList);
return unionApply;
}
@@ -723,9 +742,14 @@
multifileMapper.insert(multifile);
}
-
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
- ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
+ String info = "";
+ if(Objects.nonNull(unionApplyBXDDTO.getStartTime())&&Objects.nonNull(unionApplyBXDDTO.getEndTime())){
+ info =applyLogType.getInfo();
+ info = info.replace("${param1}",DateUtil.getPlusTime2(unionApplyBXDDTO.getStartTime()));
+ info = info.replace("${param2}",DateUtil.getPlusTime2(unionApplyBXDDTO.getEndTime()));
+ }
+ ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
applyLogMapper.insert(log);
--
Gitblit v1.9.3