Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

jiangping

2024-10-22 2d528d024b179b6b06d1d2702e72f6caa5f67149

Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

 server/company/src/main/java/com/doumee/api/common/PublicController.java

@@ -47,12 +47,6 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @ApiOperation("测试")
    @PostMapping("/testPdf")
    public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
        ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
        return JSONObject.toJSONString(req);
    }

    @ApiOperation(value = "上传", notes = "上传", httpMethod = "POST", position = 6)
    @ApiImplicitParams({

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

@@ -1981,6 +1981,15 @@
                applyDetail.setEndTime(insuranceApply.getApplyEndTime());
                applyDetail.setSortnum(i);
                applyDetail.setApplyId(insuranceApply.getId());

                //根据员工身份证进行判断年龄
                long age = Constants.getAgeByIdCard(applyDetail.getIdcardNo());
                if(Objects.isNull(age)
                        || age > solutions.getMaxAge()
                        || age < solutions.getMinAge()){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+applyDetail.getMemberName()+"】员工年龄超出方案配置,方案配置【"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"】！");
                }

                Member member = null;
                if(Objects.isNull(applyDetail.getMemberId())){
                    if(CollectionUtils.isNotEmpty(memberList)){
@@ -2011,13 +2020,7 @@
                    memberMapper.updateById(member);
                }

                //根据员工身份证进行判断年龄
                long age = Constants.getAgeByIdCard(member.getIdcardNo());
                if(Objects.isNull(age)
                    || age > solutions.getMaxAge()
                    || age < solutions.getMinAge()){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+applyDetail.getMemberName()+"】员工年龄超出方案配置,方案配置【"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"】！");
                }

                applyDetail.setMemberId(member.getId());
                applyDetail.setIdcardNo(member.getIdcardNo());
                applyDetail.setSex(member.getSex());