From 0c1ac49f859a0570a19f267d6def82100cb39860 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 18:15:43 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 d77f45f..be480d9 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;
@@ -314,6 +318,21 @@
}
}
initStatusInfo(unionApply);
+
+ //鏌ヨ鎿嶄綔璁板綍
+ 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;
}
@@ -365,6 +384,8 @@
UnionApply unionApply = new UnionApply();
unionApply.setCreateDate(new Date());
unionApply.setCreator(user.getId());
+ unionApply.setEditor(user.getId());
+ unionApply.setEditDate(new Date());
unionApply.setCompanyId(user.getCompanyId());
unionApply.setStartTime(saveUnionApplyDTO.getStartDate());
unionApply.setEndTime(saveUnionApplyDTO.getEndDate());
@@ -421,7 +442,9 @@
if(!user.getType().equals(Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
- if(Objects.isNull(closeDTO)||Objects.isNull(closeDTO.getId())){
+ if(Objects.isNull(closeDTO)
+ ||Objects.isNull(closeDTO.getId())
+ ||StringUtils.isBlank(closeDTO.getReason())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
UnionApply unionApply = unionApplyMapper.selectById(closeDTO.getId());
@@ -440,15 +463,24 @@
//鍚堝苟鍗曠姸鎬佸浜庡緟鎶曚繚
if(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
|| unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
- //TODO 鍒犻櫎浼佷笟鎶曚繚鍗曠殑 绛剧讲鏁版嵁
-
+ multifileMapper.delete(new QueryWrapper<Multifile>()
+ .lambda()
+ .apply(" multifile.id in ( select i.id from insurance_apply i where i.UNION_APPLY_ID = "+unionApply.getId()+" ) ")
+ .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey()));
}
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
.set(InsuranceApply::getUnionApplyId,null)
.set(InsuranceApply::getCheckDate,new Date())
+ .set(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
+ || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
+ InsuranceApply::getUnionApplyTbdStatus,Constants.ZERO)
+ .set(unionApply.getStatus().equals(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey())
+ || unionApply.getStatus().equals(Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey()),
+ InsuranceApply::getApplyTbdNo,null)
.set(InsuranceApply::getCheckUserId,user.getId())
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())
- .eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
+ .eq(InsuranceApply::getUnionApplyId,unionApply.getId())
+ );
applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
.set(ApplyDetail::getUnionApplyId,null)
@@ -467,8 +499,6 @@
info = info.replace("${param}", closeDTO.getReason());
ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), info
,unionApply.getId(),applyLogType.getKey(),null, null);
- applyLogMapper.insert(log);
-
applyLogMapper.insert(log);
}
@@ -749,7 +779,7 @@
.set(UnionApply::getCurrentFee,sumCurrFee)
.eq(UnionApply::getId,unionApply.getId())
);
- //鍚堝苟鍗� 鎬讳繚鍗�
+ //鍚堝苟鍗� 鏂囦欢
if(StringUtils.isNotBlank(unionApplyBXDDTO.getFileUrl())){
Multifile multifile = new Multifile();
multifile.setIsdeleted(Constants.ZERO);
@@ -763,9 +793,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