git ch

k94314517

2025-05-19 cdd6551b190b981b807a3b95e9635c559ccc769d

 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.excel.Reflections;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -34,6 +35,8 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
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;
@@ -734,7 +737,7 @@
            }
            //查询人员信息是否存在相同的方案下是否存在 冲突数据
            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                    member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
                    member.getId(),member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
                    applyDetailJoinMapper);

            //查询加保人员是否存在 冲突的 保单明细数据
@@ -1140,9 +1143,12 @@
        }
    }

    private static Logger logger = LoggerFactory.getLogger(ApplyChangeServiceImpl.class);

    public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply
            ,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
        Long start = System.currentTimeMillis();
        logger.error("处理加减保保单数据开始时间:=========================>"+start);
        if(Constants.equalsInteger(applyChange.getType(),Constants.ZERO)){
            if(Objects.nonNull(solutions.getDelOnlyReplace())&& solutions.getDelOnlyReplace().equals(Constants.ONE)){
                if(applyChange.getDelDetailList().size() > applyChange.getAddDetailList().size()){
@@ -1194,6 +1200,14 @@
        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
        //加保数据
        List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        
        if(CollectionUtils.isEmpty(delDetailList)
        && CollectionUtils.isEmpty(addDetailList)
                && CollectionUtils.isEmpty(changeDetailList)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未添加人员数据无法进行提交");
        }

        if (CollectionUtils.isNotEmpty(addDetailList)) {
            if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
@@ -1231,10 +1245,7 @@
            fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
        }

       

        //换厂业务
        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
        if (CollectionUtils.isNotEmpty(changeDetailList)) {
            if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "该保险方案无法进行换厂操作");
@@ -1248,6 +1259,8 @@

            this.changeDetail(applyChange,changeDetailList,duSolutionList,loginUserInfo,solutions,worktypeIdList);
        }
        Long end = System.currentTimeMillis();
        logger.error("处理加减保保单数据结束时间:=========================>"+end +";单条耗时：====》"+(end-start));
        return fee;
    }

@@ -1352,6 +1365,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                            .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
//                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
@@ -1434,10 +1448,6 @@
            ) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "加保人员【" + applyChagneDetail.getMemberName() + "】必填项缺失");
            }
            //查询人员信息是否存在相同的方案下是否存在 冲突数据
            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                    applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
                    applyDetailJoinMapper);

            //查询加保人员是否存在 冲突的 保单明细数据
            if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
@@ -1488,17 +1498,14 @@
                    member.setApplyId(insuranceApply.getId());
                    member.setDuId(applyChagneDetail.getDuId());
                    member.setWorktypeId(applyChagneDetail.getWorktypeId());
//                    member.setStartTime(applyChagneDetail.getStartTime());
//                    member.setEndTime(applyChagneDetail.getEndTime());
                    memberMapper.insert(member);
                }else{
                    member.setApplyId(insuranceApply.getId());
                    member.setDuId(applyChagneDetail.getDuId());
                    member.setWorktypeId(applyChagneDetail.getWorktypeId());
//                    member.setStartTime(applyChagneDetail.getStartTime());
//                    member.setEndTime(applyChagneDetail.getEndTime());
                    memberMapper.updateById(member);
                }
                applyChagneDetail.setMemberId(member.getId());
            }else{
                member = memberMapper.selectById(applyChagneDetail.getMemberId());
                if(Objects.isNull(member)){
@@ -1511,6 +1518,11 @@
                member.setEndTime(applyChagneDetail.getEndTime());
                memberMapper.updateById(member);
            }

            //查询人员信息是否存在相同的方案下是否存在 冲突数据
            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
                    applyChagneDetail.getMemberId(),applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
                    applyDetailJoinMapper);

            //根据员工身份证进行判断年龄
            long age = Constants.getAgeByIdCard(member.getIdcardNo());
@@ -1612,6 +1624,7 @@
            }
            //查询员工是在主单下 是否存在生效中的数据
            List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
                    .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))