git ch

k94314517

2025-06-16 2670a6234eb153078e7b34ef3dd4a50fb5a8cd41

git ch

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

@@ -161,8 +161,8 @@
                .selectAs(Solutions::getTimeUnit,UnionApply::getTimeUnit)
                .selectAs(Solutions::getOrtherInfo,UnionApply::getOrtherInfo)
                .selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
                .selectAs(Company::getName,UnionApply::getCompanyName)
                .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
                .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo)
                .select(" (select c.NAME from insurance_apply i left join company c on i.COMPANY_ID = c.id where i.UNION_APPLY_ID = t.id limit 1 ) ",UnionApply::getCompanyName);
        queryWrapper.select("(select count(distinct(b.MEMBER_ID)) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
        queryWrapper.select(" ( select count(DISTINCT(b.MEMBER_ID)) from apply_detail b inner join insurance_apply a on b.apply_id = a.id  and a.status in ( 5 , 27 )  where b.union_apply_id=t.id and b.END_TIME > now() ) as guaranteeNum");

@@ -181,8 +181,7 @@
            queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id  where b.union_apply_id=t.id " +
                    "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1  ) as changeApplyNum ");
        }
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
        queryWrapper.leftJoin(Company.class,Company::getId,UnionApply::getCompanyId);
        queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId); 
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(user.getType(),Constants.TWO)){
            queryWrapper.eq(UnionApply::getCompanyId, user.getCompanyId());

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

@@ -248,8 +248,8 @@
        queryWrapper.selectAll(UnionChange.class);
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.selectAs(UnionApply::getCode,UnionChange::getApplyCode);
        queryWrapper.selectAs(Solutions::getName,UnionChange::getSolutionsName)
                .selectAs(Company::getName,UnionChange::getCompanyName)
        queryWrapper.selectAs(Solutions::getName,UnionChange::getSolutionsName)  
            .select(" (select c.NAME from insurance_apply i left join company c on i.COMPANY_ID = c.id where i.UNION_APPLY_ID = t.UNION_APPLY_ID limit 1 ) ",UnionApply::getCompanyName)
        .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0  )",UnionChange::getAddNum)
        .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1  )",UnionChange::getDelNum)
        .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2  )",UnionChange::getChangeNum);