From f625df7f9180e19deb502660a64e2f65dd5f52e6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 15:02:35 +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/InsuranceApplyServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 7 +++++++
server/company/src/main/java/com/doumee/api/business/MemberController.java | 3 +++
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 6 ++++++
server/service/src/main/java/com/doumee/dao/business/vo/CountCyclePriceVO.java | 1 -
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 3 +--
6 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index a8180c8..807f9ee 100644
--- a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -136,6 +136,13 @@
}
+ @ApiOperation("鑾峰彇淇濋殰涓汉鏁�")
+ @GetMapping("/guaranteeNum")
+ public ApiResponse<Integer> guaranteeNum() {
+ return ApiResponse.success(insuranceApplyService.guaranteeNum());
+ }
+
+
@ApiOperation("娴嬭瘯瀹為檯閲戦")
@GetMapping("/testFee")
public ApiResponse testFee(Integer id) {
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index a5f8676..cceaae3 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -112,6 +112,9 @@
}
+
+
+
@ApiOperation(value = "浜哄憳淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
@PostMapping("/importExcel")
@ApiImplicitParams({
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/CountCyclePriceVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/CountCyclePriceVO.java
index 5238c8d..220b347 100644
--- a/server/service/src/main/java/com/doumee/dao/business/vo/CountCyclePriceVO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/CountCyclePriceVO.java
@@ -18,5 +18,4 @@
@ApiModelProperty(value = "鐢熸晥姝㈡湡")
private Date endDate;
-
}
diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
index cc8a60d..755231b 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -162,5 +162,11 @@
* @return
*/
String getSignWTBTBDLink(SmsCheckDTO smsCheckDTO);
+
+ /**
+ * 淇濋殰涓噾棰�
+ * @return
+ */
+ Integer guaranteeNum();
}
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 6e65926..153b63e 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
@@ -42,6 +42,7 @@
import java.io.File;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -1422,9 +1423,7 @@
applyLogMapper.insert(log);
-
//鍙戦�佸緟鍔炰笟鍔�
-
//瀛樺偍寰呭姙淇℃伅
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
//鍒犻櫎鍏朵粬寰呭姙
@@ -1624,6 +1623,14 @@
applyDetail.setSex(member.getSex());
applyDetail.setFee(countCyclePriceVO.getCyclePrice());
applyDetail.setCurrentFee(BigDecimal.ZERO);
+ //鑾峰彇璁＄畻鎬诲ぉ鏁�
+ Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+ if(Constants.equalsInteger(maxDays,0)||Objects.isNull(applyDetail.getFee())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
+ }
+ applyDetail.setPrice(
+ applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
+ );
//楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
@@ -2161,6 +2168,30 @@
/**
+ * 浼佷笟淇濋殰涓汉鏁�
+ * @return
+ */
+ @Override
+ public Integer guaranteeNum() {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo.getType().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ MPJLambdaWrapper<ApplyDetail> lambdaWrapper = new MPJLambdaWrapper<ApplyDetail>();
+ lambdaWrapper.selectAll(Member.class)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+ .and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()).or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
+ .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
+ .apply(" now() betwwen t.START_TIME and t.END_TIME ");
+
+ Integer count = applyDetailJoinMapper.selectJoinCount(lambdaWrapper);
+ return count;
+ }
+
+
+
+
+ /**
* 鏇存柊淇濆崟瀹為檯閲戦
*/
@Override
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2b57685..1bda1ec 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -306,6 +306,7 @@
.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
.eq(Member::getIsdeleted, Constants.ZERO)
.eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
+ .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
.le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
.ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
.exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&!Objects.isNull(memberQueryDTO.getValidTime()),
@@ -316,8 +317,6 @@
List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper);
return memberList;
}
-
-
@Override
public List<MemberImport> importBatch(MultipartFile file,Integer solutionId){
--
Gitblit v1.9.3