git ch

k94314517

2024-05-23 6b0f7aff57bc66733d8488741a71a1ad38fe8d2b

git ch

 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) {

 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("企业签署保单")

 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;

 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>
      <!--本地的jacob.jar的路径-->
      &lt;!&ndash;本地的jacob.jar的路径&ndash;&gt;
      <systemPath>${project.basedir}/lib/jacob.jar</systemPath>
    </dependency>
    </dependency>-->
    <!-- Spring Boot -->
    <dependency>
      <groupId>org.springframework.boot</groupId>

 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("保单号");

 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;

 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

 server/service/src/main/java/com/doumee/dao/business/dto/MemberImport.java

@@ -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 = "性别")

 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);
}

 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());

 server/service/src/main/resources/lib/jacob.jar

Binary files differ