From 0c009141867c996897928c4f12490f21b78222f2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 24 一月 2024 18:12:37 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 20 +++
server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java | 2
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 20 +++
server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java | 41 ++++++
server/service/src/main/java/com/doumee/dao/business/join/ApplyDetailJoinMapper.java | 4
server/service/src/main/java/com/doumee/core/utils/Constants.java | 33 +++++
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 109 ++++++++++++-----
server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 3
server/company/src/main/java/com/doumee/api/business/MemberController.java | 19 ++
server/service/src/main/java/com/doumee/service/business/MemberService.java | 5
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 3
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 51 ++++++++
12 files changed, 273 insertions(+), 37 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 7e3a413..c261b54 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
@@ -12,7 +12,8 @@
import com.doumee.service.business.InsuranceApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import io.swagger.models.auth.In;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
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 4d134c9..105bf42 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
@@ -8,17 +8,20 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -109,4 +112,16 @@
}
return ApiResponse.success(memberService.findListByDTO(memberQueryDTO));
}
+
+
+ @ApiOperation("瀵煎叆妯℃澘")
+ @PostMapping("/importExcel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ })
+ @RequiresPermissions("business:worktype:create")
+ public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file) {
+ return ApiResponse.success(memberService.importBatch(file));
+ }
+
}
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 401b57e..028bde1 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -1,7 +1,9 @@
package com.doumee.task;
+import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.business.InsuranceApplyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -20,6 +22,11 @@
public class ScheduleTool {
@Autowired
private CompanyService companyService;
+
+ @Autowired
+ private InsuranceApplyService insuranceApplyService;
+
+
/**
* @throws Exception
*/
@@ -39,4 +46,17 @@
log.info("==============瀹氭椂涓婁紶寰呬笂浼犵殑浼佷笟鐢靛瓙鍗扮珷鏁版嵁======end=======");
}
+
+ /**
+ * 瀹氭椂鏇存柊淇濆崟閲戦 姣忓ぉ鍑屾櫒 12.05 鍒嗘墽琛�
+ * @throws Exception
+ */
+ @Scheduled(cron = " 0 5 00 * * ?")
+ public void updateApplyCurrentFee(){
+ log.info("==============瀹氭椂鏇存柊淇濆崟瀹為檯閲戦=======start======");
+ insuranceApplyService.updateApplyCurrentFee();
+ log.info("==============瀹氭椂鏇存柊淇濆崟瀹為檯閲戦======end=======");
+ }
+
+
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 2c7f422..278dcd8 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -3,6 +3,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.model.Solutions;
+import io.swagger.models.auth.In;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
import java.net.URL;
import java.net.URLDecoder;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.Date;
import java.util.regex.Matcher;
@@ -145,6 +148,36 @@
}
return d.intValue();
}
+
+ public static long getAgeByIdCard(String idCard){
+ int birthYear = Integer.parseInt(idCard.substring(6, 10));
+ int birthMonth = Integer.parseInt(idCard.substring(10, 12));
+ int birthDay = Integer.parseInt(idCard.substring(12, 14));
+
+ LocalDate birthDate = LocalDate.of(birthYear, birthMonth, birthDay);
+ LocalDate currentDate = LocalDate.now();
+ long age = ChronoUnit.YEARS.between(birthDate, currentDate);
+ return age;
+ }
+
+ public static Integer getSexByIdCard(String idCard){
+ Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
+ Matcher matcher = pattern.matcher(idCard);
+ Integer sex = 1;
+ if (matcher.matches()) {
+ int genderCode = Integer.parseInt(idCard.substring(16, 17)); // 浠庣17浣嶅紑濮嬫彁鍙栨�у埆缂栫爜锛堝鏁颁负鐢锋�э紝鍋舵暟涓哄コ鎬э級
+
+ if ((genderCode % 2 == 1)) {
+ sex = 1;
+ } else {
+ sex = 2;
+ }
+ } else {
+ sex = -1;
+ }
+ return sex;
+ }
+
/**
* 鐘舵�� 0宸蹭繚瀛樸��1寰呭鏍搞��2瀹℃牳閫氳繃銆�3閫�鍥炰慨鏀广��4瀹℃牳椹冲洖銆�5寰呮湇鍔℃満鏋勭‘璁ゃ��6鏈嶅姟鏈烘瀯鎷掔粷銆�7宸插垎閰嶆湇鍔℃満鏋勩��8璇婃柇涓�
* 锛堟垚鍔熶笂浼犵涓�浠芥湇鍔¤祫鏂欙級銆�9鏈嶅姟瀹屾垚銆�10宸插垎閰嶈瘎鍒嗕笓瀹躲��11宸插畬鎴愶紙涓撳涓婁紶璇勫垎锛� 12閫�鍥炰慨鏀逛腑 13 宸插畬鎴愰��鍥炰慨鏀�
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java
new file mode 100644
index 0000000..3b10169
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java
@@ -0,0 +1,41 @@
+package com.doumee.dao.business.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鍛樺伐淇℃伅瀵煎叆琛�
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+@Data
+@ApiModel("鍛樺伐淇℃伅瀵煎叆")
+public class MemberImport {
+
+ @ExcelColumn(name="濮撳悕",value = "name")
+ private String name;
+
+ @ExcelColumn(name="韬唤璇佸彿鐮�",value = "idCard")
+ private String idCard;
+
+ @ExcelColumn(name="骞撮緞",value = "age")
+ private Integer age;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅涓婚敭")
+ private Integer duId;
+
+ @ApiModelProperty(value = "鎬у埆")
+ private Integer sex;
+
+ @ApiModelProperty(value = "鎵�灞炲伐绉嶄富閿�")
+ private Integer workTypeId;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ private String duName;
+
+ @ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
+ private String workTypeName;
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java
index d4a1025..761cd49 100644
--- a/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/join/ApplyChagneDetailJoinMapper.java
@@ -13,5 +13,5 @@
*/
public interface ApplyChagneDetailJoinMapper extends MPJJoinMapper<ApplyChagneDetail> {
- void insertBatchSomeColumn(List<ApplyDetail> addList);
+ void insertBatchSomeColumn(List<ApplyChagneDetail> addList);
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/ApplyDetailJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/ApplyDetailJoinMapper.java
index b97c7de..d7b4952 100644
--- a/server/service/src/main/java/com/doumee/dao/business/join/ApplyDetailJoinMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/join/ApplyDetailJoinMapper.java
@@ -4,10 +4,14 @@
import com.doumee.dao.business.model.ApplyDetail;
import com.github.yulichang.base.mapper.MPJJoinMapper;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2024/01/16 10:03
*/
public interface ApplyDetailJoinMapper extends MPJJoinMapper<ApplyDetail> {
+ void insertBatchSomeColumn(List<ApplyDetail> addList);
+
}
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 dbe3a72..facba13 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
@@ -119,6 +119,9 @@
Integer editBaoxiandan(InsuranceApply param);
+ void updateApplyCurrentFee();
+
+
String getSignLink(Integer id);
void dealSignResult(NotifyDataReq data);
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index 70da9b5..592bffd 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -2,8 +2,11 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.model.Member;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -101,4 +104,6 @@
List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);
+ List<MemberImport> importBatch(MultipartFile file);
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 321678a..9264c44 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -51,6 +51,9 @@
private InsuranceApplyMapper insuranceApplyMapper;
@Autowired
+ private CompanySolutionMapper companySolutionMapper;
+
+ @Autowired
private ApplyChangeJoinMapper applyChangeJoinMapper;
@Autowired
@@ -348,7 +351,7 @@
}
}
if(addList!=null && addList.size()>0){
- applyChagneDetailJoinMapper.insertBatchSomeColumn(addList);
+ applyDetailJoinMapper.insertBatchSomeColumn(addList);
}
if(totalFee.compareTo(new BigDecimal(0)) != 0){
//濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
@@ -453,6 +456,15 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
+ CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+ .eq(CompanySolution::getCompanyId,loginUserInfo.getCompanyId())
+ .eq(CompanySolution::getSolutionBaseId,solutions.getId())
+ .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(companySolution)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
+ }
//鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
if (!(DateUtil.compareDate(applyChange.getValidTime(), insuranceApply.getStartTime()) >= Constants.ZERO
&& DateUtil.compareDate(insuranceApply.getEndTime(), applyChange.getValidTime()) >= Constants.ZERO)) {
@@ -485,12 +497,18 @@
//鍔犱繚鏁版嵁
List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
if (CollectionUtils.isNotEmpty(addDetailList)) {
+ if(companySolution.getCanAdd().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+ }
this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo);
}
//鍑忎繚鏁版嵁
List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
if (CollectionUtils.isNotEmpty(delDetailList)) {
+ if(companySolution.getCanReduce().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+ }
this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo);
}
//鎹㈠巶涓氬姟
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 3c38a49..4be1bc8 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
@@ -488,40 +488,43 @@
if(!CollectionUtils.isNotEmpty(duWorktypeList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
}
- for (int i = 0; i < applyDetailList.size(); i++) {
- ApplyDetail applyDetail = applyDetailList.get(i);
- if(Objects.isNull(applyDetail)
- ||Objects.isNull(applyDetail.getMemberId())
- ||Objects.isNull(applyDetail.getDuId())
- ||Objects.isNull(applyDetail.getWorktypeId())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け");
+ if(CollectionUtils.isNotEmpty(applyDetailList)){
+ for (int i = 0; i < applyDetailList.size(); i++) {
+ ApplyDetail applyDetail = applyDetailList.get(i);
+ if(Objects.isNull(applyDetail)
+ ||Objects.isNull(applyDetail.getMemberId())
+ ||Objects.isNull(applyDetail.getDuId())
+ ||Objects.isNull(applyDetail.getWorktypeId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け");
+ }
+ applyDetail.setCreateDate(new Date());
+ applyDetail.setCreator(loginUserInfo.getId());
+ applyDetail.setIsdeleted(Constants.ZERO);
+ applyDetail.setSortnum(i);
+ applyDetail.setApplyId(insuranceApply.getId());
+ if(Objects.isNull(applyDetail.getMemberId())){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+ Member member = memberMapper.selectById(applyDetail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
+ }
+ applyDetail.setIdcardNo(member.getIdcardNo());
+ applyDetail.setSex(member.getSex());
+ applyDetail.setFee(Constants.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime()));
+ //楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
+ 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()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+ }
+ if(duWorktypeList.stream().filter(d->d.getDuSolutionId().equals(applyDetail.getDuId())&&d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
+ .collect(Collectors.toList()).size()<=Constants.ZERO){
+ throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+ }
}
- applyDetail.setCreateDate(new Date());
- applyDetail.setCreator(loginUserInfo.getId());
- applyDetail.setIsdeleted(Constants.ZERO);
- applyDetail.setSortnum(i);
- applyDetail.setApplyId(insuranceApply.getId());
- if(Objects.isNull(applyDetail.getMemberId())){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
- }
- Member member = memberMapper.selectById(applyDetail.getMemberId());
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ヤ俊鎭瓨鍦ㄥ紓甯告暟鎹紒");
- }
- applyDetail.setIdcardNo(member.getIdcardNo());
- applyDetail.setSex(member.getSex());
- applyDetail.setFee(Constants.countDetailFee(solutions,insuranceApply.getApplyEndTime(),insuranceApply.getApplyStartTime()));
- //楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
- 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()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
- }
- if(duWorktypeList.stream().filter(d->d.getDuSolutionId().equals(applyDetail.getDuId())&&d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
- .collect(Collectors.toList()).size()<=Constants.ZERO){
- throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
- }
- applyDetailMapper.insert(applyDetail);
+ applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
}
+
//瀛樺偍鏃ュ織鏁版嵁
this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
return insuranceApply.getId();
@@ -910,6 +913,48 @@
}
+ /**
+ * 鏇存柊淇濆崟瀹為檯閲戦
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public void updateApplyCurrentFee(){
+ List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
+ .eq(InsuranceApply::getIsdeleted,Constants.ZERO)
+ .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ .ge(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
+ .le(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
+ );
+
+ if(CollectionUtils.isNotEmpty(insuranceApplyList)){
+ for (InsuranceApply insuranceApply:insuranceApplyList) {
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ continue;
+ }
+ BigDecimal sumAmount = BigDecimal.ZERO;
+ List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+ if(CollectionUtils.isNotEmpty(applyDetailList)){
+ for (ApplyDetail applyDetail: applyDetailList) {
+ applyDetail.setCurrentFee(Constants.countDetailFee(solutions,new Date(),applyDetail.getStartTime()));
+ applyDetailMapper.updateById(applyDetail);
+ sumAmount = sumAmount.add(applyDetail.getCurrentFee());
+ }
+ }
+ insuranceApply.setCurrentFee(sumAmount);
+ insuranceApplyMapper.updateById(insuranceApply);
+ }
+ }
+
+
+
+
+
+
+ }
+
+
+
}
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 0e9f7e3..f08ceb2 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
@@ -1,5 +1,8 @@
package com.doumee.service.business.impl;
+import com.doumee.core.annotation.excel.ExcelImporter;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -7,7 +10,9 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
+import com.doumee.dao.business.dto.WorktypeImport;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.MemberService;
@@ -21,7 +26,9 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -230,4 +237,48 @@
+ @Override
+ public List<MemberImport> importBatch(MultipartFile file){
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氫汉鍛樻棤娉曡繘琛岃鎿嶄綔");
+ }
+ List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(DispatchUnit::getName,Member::getDuName)
+ .selectAs(Worktype::getName,Member::getWorkTypeName)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .eq(Member::getCompanyId,loginUserInfo.getCompanyId())
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ );
+ ExcelImporter ie = null;
+ List<MemberImport> dataList =null;
+ try {
+ ie = new ExcelImporter(file,0,0);
+ dataList = ie.getDataList(MemberImport.class,null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
+ }
+ for(MemberImport model : dataList){
+ if(CollectionUtils.isNotEmpty(list)){
+ Member member = list.stream().filter(m->m.getIdcardNo().equals(model.getIdCard())).findAny().get();
+ if(!Objects.isNull(member)){
+ model.setWorkTypeId(member.getWorktypeId());
+ model.setWorkTypeName(member.getWorkTypeName());
+ model.setDuId(member.getDuId());
+ model.setDuName(member.getDuName());
+ model.setSex(member.getSex());
+ }else{
+ model.setSex(Constants.getSexByIdCard(model.getIdCard()));
+ }
+ }
+ }
+ return dataList;
+ }
+
+
}
--
Gitblit v1.9.3