From 6b0f7aff57bc66733d8488741a71a1ad38fe8d2b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 11:45:47 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java | 10 +++--
server/service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java | 3 +
server/company/src/main/java/com/doumee/api/business/SmsEmailController.java | 1
server/pom.xml | 6 +-
server/service/src/main/resources/lib/jacob.jar | 0
server/service/src/main/java/com/doumee/core/utils/Constants.java | 5 +-
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 73 +++++++++++++++++++++++-------------
server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 12 ------
server/service/src/main/java/com/doumee/dao/business/MemberMapper.java | 3 +
server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java | 2
server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java | 4 +-
11 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 5b31c4e..094e276 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -135,7 +135,7 @@
return ApiResponse.success("鎿嶄綔鎴愬姛",applyChangeService.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO));
}
- @ApiOperation("鎶曚繚纭涔︾绔犱笟鍔�")
+ @ApiOperation("濮旀墭淇濅汉鍛樺悕鍗曠缃�")
@PostMapping("/getChangeMemberListOnlineSignLink")
@RequiresPermissions("business:applychange:query")
public ApiResponse<String> getChangeMemberListOnlineSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
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 b0d569d..6850e74 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
@@ -88,11 +88,6 @@
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
PageData<InsuranceApply> pageData = insuranceApplyService.findPage(pageWrap);
- pageData.getRecords().forEach(i->{
- if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- i.setFee(null);
- }
- });
return ApiResponse.success(pageData);
}
@@ -115,10 +110,6 @@
@RequiresPermissions("business:insuranceapply:exportExcel")
public void exportDetailExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
InsuranceApply insuranceApply = insuranceApplyService.findDetailForExport(model);
- if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)
- &&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- insuranceApply.setFee(null);
- }
ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApply, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -126,9 +117,6 @@
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
InsuranceApply insuranceApply = insuranceApplyService.findDetail(id);
- if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)&&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- insuranceApply.setFee(null);
- }
return ApiResponse.success(insuranceApply);
}
@ApiOperation("浼佷笟绛剧讲淇濆崟")
diff --git a/server/company/src/main/java/com/doumee/api/business/SmsEmailController.java b/server/company/src/main/java/com/doumee/api/business/SmsEmailController.java
index c89f032..9b438b6 100644
--- a/server/company/src/main/java/com/doumee/api/business/SmsEmailController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SmsEmailController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.service.business.SmsEmailService;
import io.swagger.annotations.Api;
diff --git a/server/pom.xml b/server/pom.xml
index 1179c76..669526e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -44,14 +44,14 @@
</properties>
<dependencies>
- <dependency>
+ <!--<dependency>
<groupId>com.jacob</groupId>
<artifactId>jacob</artifactId>
<version>1.19</version>
<scope>system</scope>
- <!--鏈湴鐨刯acob.jar鐨勮矾寰�-->
+ <!–鏈湴鐨刯acob.jar鐨勮矾寰�–>
<systemPath>${project.basedir}/lib/jacob.jar</systemPath>
- </dependency>
+ </dependency>-->
<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index 5d1254d..4b4ed9b 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -783,7 +783,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(0).setCellValue(cellValue);
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
@@ -1056,7 +1056,7 @@
configTitleCell(sxssfWorkbook,title.getCell(i));
}
Row header1 = sheet.createRow(1);
- header1.createCell(0).setCellValue("鎶曚繚浼佷笟");
+ header1.createCell(0).setCellValue(cellValue);
header1.createCell(1).setCellValue("");
header1.createCell(2).setCellValue("淇濋櫓鏂规");
header1.createCell(3).setCellValue("淇濆崟鍙�");
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 ccb4265..a418f86 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
@@ -783,7 +783,8 @@
WTBYTH(24, "宸查��鍥�"),
WTBYGB(25, "宸插叧闂�"),
//2024骞�4鏈�25鏃�15:17:13 淇敼 鎶曚繚涓� = 銆� 鎵规敼鐢宠涓�
- WTBTBZ(26, "鎵规敼鐢宠涓�"),
+ //2024-5-21 14:04:10 淇敼 鎵规敼鐢宠涓�= 銆嬫姇淇濅腑
+ WTBTBZ(26, "鎶曚繚涓�"),
WTBBZZ(27, "淇濋殰涓�"),
;
// 鎴愬憳鍙橀噺
@@ -1567,7 +1568,7 @@
CLOSE(6, "宸插叧闂�"),
CHECHED_PASSED(7, "瀹℃牳閫氳繃"),
PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
- WTB_TOUBAOING(9, "鎶曚繚涓�"),
+ WTB_TOUBAOING(9, "鎵规敼鐢宠涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
diff --git a/server/service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/service/src/main/java/com/doumee/dao/business/MemberMapper.java
index 2b7dc23..cdc0981 100644
--- a/server/service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -1,8 +1,11 @@
package com.doumee.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.ApplyDetail;
import com.doumee.dao.business.model.Member;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2024/01/16 10:03
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
index caf1c85..4e56900 100644
--- 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
@@ -15,13 +15,13 @@
@ApiModel("鍛樺伐淇℃伅瀵煎叆")
public class MemberImport {
- @ExcelColumn(name="搴忓彿",value = "sn")
+ @ExcelColumn(name="搴忓彿",value = "sn" )
private Integer sn;
- @ExcelColumn(name="濮撳悕",value = "name")
+ @ExcelColumn(name="濮撳悕",value = "name" )
private String name;
- @ExcelColumn(name="韬唤璇佸彿",value = "idCard")
+ @ExcelColumn(name="韬唤璇佸彿",value = "idCard" )
private String idCard;
@ExcelColumn(name="娲鹃仯鍗曚綅" , value = "duName")
@@ -30,8 +30,10 @@
@ExcelColumn(name="宸ョ" , value = "workTypeName")
private String workTypeName;
+ @ExcelColumn(name="澶囨敞",value = "澶囨敞")
+ private String remark;
- @ExcelColumn(name="骞撮緞",value = "age")
+ @ApiModelProperty(name="骞撮緞",value = "age")
private Integer age;
@ApiModelProperty(value = "鎬у埆")
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
index dee7f4e..930eaa3 100644
--- a/server/service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
@@ -4,10 +4,13 @@
import com.doumee.dao.business.model.Member;
import com.github.yulichang.base.mapper.MPJJoinMapper;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2024/01/16 10:03
*/
public interface MemberJoinMapper extends MPJJoinMapper<Member> {
+ void insertBatchSomeColumn(List<Member> addList);
}
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 07136ac..acc71d5 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
@@ -94,6 +94,8 @@
@Autowired
private MemberMapper memberMapper;
@Autowired
+ private MemberJoinMapper memberJoinMapper;
+ @Autowired
private DuSolutionMapper duSolutionMapper;
@Autowired
private DuSolutionJoinMapper duSolutionJoinMapper;
@@ -1776,6 +1778,44 @@
}
if(CollectionUtils.isNotEmpty(applyDetailList)){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getCompanyId,insuranceApply.getCompanyId())
+ .eq(Member::getIsdeleted,Constants.ZERO));
+
+ List<Member> addMemberList = new ArrayList<>();
+ for (int i = 0; i < applyDetailList.size(); i++) {
+ ApplyDetail applyDetail = applyDetailList.get(i);
+ Member member = new Member();
+ if(CollectionUtils.isNotEmpty(memberList)){
+ Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+ if(optional.isPresent()){
+ member = optional.get();
+ }
+ }
+ if(Objects.isNull(member)){
+ member = new Member();
+ member.setCreateDate(new Date());
+ member.setCreator(loginUserInfo.getId());
+ member.setIsdeleted(Constants.ZERO);
+ member.setName(applyDetail.getMemberName());
+ member.setCompanyId(insuranceApply.getCompanyId());
+ member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
+ if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+ }
+ member.setIdcardNo(applyDetail.getIdcardNo());
+ member.setApplyId(insuranceApply.getId());
+ member.setStartTime(applyDetail.getStartTime());
+ member.setEndTime(applyDetail.getEndTime());
+ member.setDuId(applyDetail.getDuId());
+ member.setWorktypeId(applyDetail.getWorktypeId());
+ addMemberList.add(member);
+ }
+ }
+ if(CollectionUtils.isNotEmpty(addMemberList)){
+ memberJoinMapper.insertBatchSomeColumn(addMemberList);
+ }
+ memberList.addAll(addMemberList);
for (int i = 0; i < applyDetailList.size(); i++) {
ApplyDetail applyDetail = applyDetailList.get(i);
if(Objects.isNull(applyDetail)
@@ -1795,33 +1835,14 @@
applyDetail.setApplyId(insuranceApply.getId());
Member member = new Member();
if(Objects.isNull(applyDetail.getMemberId())){
- //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
- member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getCompanyId,insuranceApply.getCompanyId())
- .eq(Member::getIsdeleted,Constants.ZERO)
- .eq(Member::getIdcardNo,applyDetail.getIdcardNo())
- .last(" limit 1")
- );
- if(Objects.isNull(member)){
- member = new Member();
- member.setCreateDate(new Date());
- member.setCreator(loginUserInfo.getId());
- member.setIsdeleted(Constants.ZERO);
- member.setName(applyDetail.getMemberName());
- member.setCompanyId(insuranceApply.getCompanyId());
- member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
- if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+ if(CollectionUtils.isNotEmpty(memberList)){
+ Optional<Member> optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+ if(optional.isPresent()){
+ member = optional.get();
}
- member.setIdcardNo(applyDetail.getIdcardNo());
- member.setApplyId(insuranceApply.getId());
- member.setStartTime(applyDetail.getStartTime());
- member.setEndTime(applyDetail.getEndTime());
- member.setDuId(applyDetail.getDuId());
- member.setWorktypeId(applyDetail.getWorktypeId());
-
- memberMapper.insert(member);
- }else{
+ }
+ //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
+ if(!Objects.isNull(member)){
member.setApplyId(insuranceApply.getId());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
diff --git a/server/service/src/main/resources/lib/jacob.jar b/server/service/src/main/resources/lib/jacob.jar
new file mode 100644
index 0000000..35ce4fa
--- /dev/null
+++ b/server/service/src/main/resources/lib/jacob.jar
Binary files differ
--
Gitblit v1.9.3