优化

MrShi

2025-09-22 ad054c369ed1ee164024f47d38b10824d41f9a9c

 serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java

@@ -1072,6 +1072,7 @@
        queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
        queryWrapper.leftJoin(ProjectLabel.class, ProjectLabel::getId, Declares::getDiagnoseTypeId);
        queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
        queryWrapper.ne(Declares::getStatus, Constants.ZERO);
        queryWrapper.eq(Declares::getProjectId, param.getProjectId());
        queryWrapper.apply(param.getAreaId()!=null,"t2.area_id =" +param.getAreaId());
        queryWrapper.groupBy(Declares::getDiagnoseTypeId);
@@ -1237,6 +1238,7 @@
        queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
        queryWrapper.leftJoin(Areas.class, Areas::getId, Company::getAreaId);
        queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
        queryWrapper.ne(Declares::getStatus, Constants.ZERO);
        queryWrapper.eq(Declares::getProjectId, param.getProjectId());
        queryWrapper.eq(param.getDiagnoseType()!=null,Declares::getDiagnoseTypeId, param.getDiagnoseTypeId());
        queryWrapper.apply(param.getAreaId()!=null,"t1.area_id =" +param.getAreaId());
@@ -2590,6 +2592,7 @@
                    .leftJoin(DeclareService.class,DeclareService::getDeclareId,Declares::getId)
                    .eq(Declares::getSoId,soId)
                    .eq(DeclareService::getIsdeleted,Constants.ZERO)
                    .ne(DeclareService::getStatus,Constants.ZERO)
                    .groupBy(DeclareService::getDeclareId);
            List<Map<String, Object>> maps =
                    declareServiceMapper.selectMaps(declareServiceQuery);