From c1b5d8b81d63555f6f0095aa823f07d99f80fe21 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 18:22:49 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index e136e8b..71b3d50 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -35,6 +35,8 @@
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -513,7 +515,7 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- Company company = user.getCompany();
+ Company company = user.getShowCompany();
if(debugModel){
company = companyMapper.selectById(model.getCompanyId());
}
@@ -2375,8 +2377,13 @@
+
+ private static Logger logger = LoggerFactory.getLogger(InsuranceApplyServiceImpl.class);
+
public void dealApplyDetailData(InsuranceApply insuranceApply,Solutions solutions,List<ApplyDetail> applyDetailList,
LoginUserInfo loginUserInfo,CountCyclePriceVO countCyclePriceVO,Boolean checkNewData){
+ Long start = System.currentTimeMillis();
+ logger.error("澶勭悊淇濆崟鏁版嵁寮�濮嬫椂闂�:=========================>"+start);
//2024骞�11鏈�6鏃�15:01:34 鍔犲叆 鏂规閰嶇疆浜嗘湁娲鹃仯鍗曚綅 鎵嶄細鍘婚獙璇佹淳閬ｅ崟浣嶆暟鎹�
List<DuSolution> duSolutionList = new ArrayList<>();
List<DuWorktype> duWorktypeList = new ArrayList<>();
@@ -2459,6 +2466,8 @@
}
memberList.addAll(addMemberList);
for (int i = 0; i < applyDetailList.size(); i++) {
+ Long singlStart = System.currentTimeMillis();
+ logger.error("澶勭悊淇濆崟鍗曟潯鏁版嵁寮�濮嬫椂闂�:=========================>"+singlStart);
ApplyDetail applyDetail = applyDetailList.get(i);
if(Objects.isNull(applyDetail)
||StringUtils.isBlank(applyDetail.getIdcardNo())
@@ -2535,11 +2544,11 @@
.collect(Collectors.toList()).size()<=Constants.ZERO){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
}
-// if(duWorktypeList.stream().filter(d->d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
-// .collect(Collectors.toList()).size()<=Constants.ZERO){
-// throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
-// }
+ Long singlEnd = System.currentTimeMillis();
+ logger.error("澶勭悊淇濆崟鍗曟潯鏁版嵁缁撴潫鏃堕棿:=========================>"+singlEnd+";鑰楁椂锛�====銆�"+(singlStart-singlEnd));
}
+ Long end = System.currentTimeMillis();
+ logger.error("澶勭悊鍗曟暟鎹粨鏉熸椂闂�:=========================>"+end +";鑰楁椂锛�====銆�"+(end-start));
applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
}
}
@@ -2592,7 +2601,7 @@
};
}
- public static void checkStaticMemberSolution(Integer solutionId,String idCode,String memberName,Date startTime,
+ public static void checkStaticMemberSolution(Integer solutionId,Integer memberId,String memberIdCard,String memberName,Date startTime,
Date endTime,ApplyDetailJoinMapper applyDetailJoinMapper){
List<ApplyDetail> applyDetailList = new ArrayList<ApplyDetail>();
try {
@@ -2604,7 +2613,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
- .eq(ApplyDetail::getIdcardNo,idCode)
+ .eq(ApplyDetail::getIdcardNo,memberIdCard)
.eq(Solutions::getBaseId,solutionId)
.eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.notIn(InsuranceApply::getStatus
@@ -2622,6 +2631,7 @@
}
if(applyDetailList.size() >Constants.ZERO){
String companyName = applyDetailList.get(Constants.ZERO).getCompanyName();
+ String idCode = applyDetailList.get(Constants.ZERO).getIdcardNo();
if(StringUtils.isNotBlank(companyName)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ュ憳宸ャ��"+memberName+" "+idCode+"銆戝凡鍦ㄣ��"+companyName+"銆戝瓨鍦ㄤ繚闄�,璇疯仈绯诲鏈嶇‘璁�");
}else{
@@ -3493,7 +3503,7 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- Company company = user.getCompany();
+ Company company = user.getShowCompany();
if(debugModel){
company = companyMapper.selectById(model.getCompanyId());
}
@@ -3578,7 +3588,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Company company = user.getCompany();
+ Company company = user.getShowCompany();
if(debugModel){
company = companyMapper.selectById(model.getCompanyId());
}
@@ -3659,7 +3669,7 @@
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- Company company = user.getCompany();
+ Company company = user.getShowCompany();
if(debugModel){
company = companyMapper.selectById(model.getCompanyId());
}
--
Gitblit v1.9.3