git ch

k94314517

2024-04-12 e63e56a1b45bc2025147f7f91d248f93a43deb7a

git ch

 server/company/src/main/resources/application.yml

@@ -12,7 +12,7 @@
#  application:git
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/platform/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java

@@ -1431,7 +1431,7 @@
            header2.createCell(5).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getStartTime()));
            header2.createCell(6).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getEndTime()));
            header2.createCell(7).setCellValue(data.getApplyChagneDetailList().stream().filter(i->i.getType().equals(Constants.TWO)).collect(Collectors.toList()).size());
            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getApplyStartTime()));
            header2.createCell(8).setCellValue(com.doumee.core.utils.DateUtil.getPlusTime2(data.getValidTime()));
//            sheet.addMergedRegion(new CellRangeAddress(2  ,2,1,3));

            sheet.addMergedRegion(new CellRangeAddress(2  ,2,0,1));

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

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "身份证号码")
    private String idcardNo;

    @ApiModelProperty(value = "派遣单位主键")
    private Integer duId;


 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java

@@ -151,6 +151,10 @@
    @TableField(exist = false)
    private Integer changeNum;

    @ApiModelProperty(value = "最后一次加减保/换厂日期")
    @TableField(exist = false)
    private Date lastChangeDate;

    @ApiModelProperty(value = "提交日期开始 yyyy-MM-dd ")
    @TableField(exist = false)
    private String createDateS;

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

@@ -104,11 +104,11 @@
        queryWrapper.selectAs(Member::getSex,ApplyChagneDetail::getSex);
        queryWrapper.selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo);
        queryWrapper.leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId);
        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId);
        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId);
        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getOldDuId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.exists(!Objects.isNull(applyDetailPageDTO.getApplyId()),
                " select 1 from apply_change ac where ac.isdeleted = 0 and ac.status in (1,2)  and ac.apply_id = "+applyDetailPageDTO.getApplyId()+" and ac.id = t.apply_change_id  ");
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyChagneDetail::getDuId,applyDetailPageDTO.getDuId());

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

@@ -167,12 +167,14 @@
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
                insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
//        notices.setParam1(insuranceApply.getId().toString());
        noticesMapper.insert(notices);

        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
        String info =applyLogType.getInfo();
        info = info.replace("${param}", update.getCheckInfo());
        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        ApplyLog log = new ApplyLog(update,applyLogType.getName(),
                info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);
        return  1;

@@ -240,6 +242,15 @@
//        if(1==1){
//            throw new BusinessException(ResponseStatus.DATA_EMPTY);
//        }


        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
        if(model.getType().equals(Constants.ONE)){
            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
        }
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));


        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
        String info = "";
@@ -940,6 +951,11 @@
        ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
        applyLogMapper.insert(log);

        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
        if(applyChange.getType().equals(Constants.ONE)){
            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
        }
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));

        return applyChange.getId();
    }
@@ -1770,6 +1786,7 @@
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
                .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
                .select(" ( select max(ac.APPLY_START_TIME) from apply_change ac  where ac.apply_id = t.apply_id and ac.status = 2 ) as lastChangeDate")
                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -2234,9 +2251,8 @@
        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), null, null);
        applyLogMapper.insert(log);


        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
        if(Constants.equalsInteger(applyChange.getType(),Constants.ONE)){
        if(Constants.equalsInteger(model.getType(),Constants.ONE)){
            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
        }
        //删除全部待办

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

@@ -816,7 +816,7 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {

        }else{
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){

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

@@ -388,6 +388,11 @@
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Constants.ApplyLogType applyLogType = null;
        String info = "";
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
        //处理退回申请通知
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                .eq(Notices::getObjId,insuranceApply.getId()));
        InsuranceApply update = new InsuranceApply();
        if(insuranceApply.getDealBackApply() ==1){
            //如果是驳回,只能可驳回已签章状态下的退回申请状态进行操作
@@ -419,6 +424,15 @@
            }
            applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
            update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());


            //通知企业 已退回
            Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
            if(Objects.nonNull(solutions)){
                Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
                        insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
                noticesMapper.insert(notices);
            }
        }
        update.setEditDate(new Date());
        update.setEditor(user.getId());
@@ -427,6 +441,7 @@
        update.setCheckUserId(user.getId());
        update.setId(model.getId());
        insuranceApplyMapper.updateById(update);


        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);
@@ -492,6 +507,8 @@
        update.setId(model.getId());
        update.setEditor(user.getId());
        update.setEditDate(new Date());
        update.setCheckUserId(user.getId());
        update.setCheckDate(new Date());
        update.setSignApplyNo(applyNo);
        insuranceApplyMapper.updateById(update);
        return  link;
@@ -583,11 +600,9 @@
    public Multifile   uploadFAQRSSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
        InsuranceApply update = new InsuranceApply();
        update.setEditDate(new Date());
        update.setEditor(model.getCreator());
        update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo("企业完成签署方案确认书");
        update.setCheckUserId(model.getCreator());
        update.setId(model.getId());
        insuranceApplyMapper.updateById(update);

@@ -605,7 +620,7 @@
        multifileMapper.insert(f);

        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);
        return  f;
@@ -659,7 +674,6 @@
    public Multifile   uploadApplyMemberListSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
        InsuranceApply update = new InsuranceApply();
        update.setEditDate(new Date());
        update.setEditor(model.getCreator());
        update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey());
        update.setCheckDate(update.getEditDate());
        update.setCheckInfo("企业完成签署人员名单");
@@ -684,7 +698,7 @@

        //数据日志
        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
        applyLogMapper.insert(log);

@@ -1974,6 +1988,9 @@
            }
            queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.eq(InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getSolutionId() != null) {
            queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
        }
@@ -2033,7 +2050,8 @@

    public void    initApplyStatus(InsuranceApply apply){
        apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
        if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
        if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
        || Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
            //如果已完成
            if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
                apply.setStatusCollect(Constants.THREE);//已过期
@@ -2407,25 +2425,24 @@
            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
                            .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
                    .eq(Notices::getObjId,insuranceApply.getId()));
            if(!loginUserInfo.getCompanyId().equals(insuranceApply.getCompanyId())){
                Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                        insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
                noticesMapper.insert(notices);

            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                    insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
            noticesMapper.insert(notices);


            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
                    .eq(CompanySolution::getSolutionId,solutions.getId())
                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
                    .last("limit 1")
            );
            //商户待办
            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
                        insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE);
                noticesMapper.insert(shopNotices);
            }


//            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
//                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
//                    .eq(CompanySolution::getSolutionId,solutions.getId())
//                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
//                    .last("limit 1")
//            );
//            //商户待办
//            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
//                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
//                        insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE);
//                noticesMapper.insert(shopNotices);
//            }




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

@@ -238,6 +238,7 @@
//                .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
                .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
                .like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard())
                .like(StringUtils.isNotBlank(memberQueryDTO.getIdcardNo()),Member::getIdcardNo, memberQueryDTO.getIdcardNo())
                .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
                .eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
                .eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getBaseId, memberQueryDTO.getSolutionsId())

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

@@ -593,6 +593,10 @@
        if(CollectionUtils.isNotEmpty(uploadMultifileDTO.getMultifileList())){
            List<Multifile> multifileList = uploadMultifileDTO.getMultifileList();
            for (Multifile multifile:multifileList) {
                if(StringUtils.isBlank(multifile.getName())
                || StringUtils.isBlank(multifile.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(multifile.getObjId())
                    ||Objects.isNull(multifile.getName())
                    ||Objects.isNull(multifile.getFileurl())){

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

@@ -365,7 +365,7 @@
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(saveUnionChangeDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        }
@@ -648,7 +648,7 @@
        }
        //判断批单日期 合并单的批单生效期在为 保单起期的次日 到保单止期
        //获取开始日期次日
        if(unionChangeBXDDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
        if(unionChangeBXDDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
                || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"合并单的批单生效期错误");
        }
@@ -685,6 +685,10 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"批单明细记录存在非本合并单数据");
            };
            for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
                if(StringUtils.isBlank(m.getName())
                        || StringUtils.isBlank(m.getFileurl()) ){
                    continue;
                }
                if(Objects.isNull(m.getObjId())
                        ||StringUtils.isBlank(m.getFileurl())
                        ||StringUtils.isBlank(m.getName())
@@ -998,7 +1002,7 @@

            //修改 员工投保明细记录 历史数据
            memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
                    .set(MemberInsurance::getEndTime,applyStartTime)
                    .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
                    .set(MemberInsurance::getFee,oldFee)
                    .eq(MemberInsurance::getRelationId,oldModel.getId())
            );
@@ -1028,7 +1032,7 @@
            add.setFromId(detail.getId());
            applyDetailJoinMapper.insert(add);

            MemberInsurance memberInsurance = new MemberInsurance(oldModel,applyChange.getId());
            MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
            memberInsurance.setSolutionId(detail.getSolutionId());
            memberInsurance.setWorktypeName(detail.getWorkTypeName());
            memberInsurance.setDuName(detail.getDuName());

 server/service/src/main/resources/application-pro.yml

@@ -13,9 +13,9 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/yunyibao?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: doumee
    password: rtjgfEr@&0c0m
    url: jdbc:mysql://rm-bp12tny4ir5b7l65xno.mysql.rds.aliyuncs.com:3306/yyb?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
    username: yyb
    password: Yyb123456
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  mail:

 server/service/src/main/resources/mappers/SystemRoleMapper.xml

@@ -33,6 +33,9 @@
      <if test="dto.type != null">
        AND role.type = #{dto.type}
      </if>
      <if test="dto.companyId != null">
        AND role.COMPANY_ID = #{dto.companyId}
      </if>
    </where>
    ${orderByClause}
  </select>

 server/shop/src/main/resources/application.yml

@@ -12,7 +12,7 @@
#  application:git
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson: