From 3927f2ad0d143a03c44114c2949a60a3bb160613 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 07 五月 2025 14:40:58 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 4 ++-- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 2 ++ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 6 +++--- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 7 ++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java index 9e85f70..fe24fd8 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java @@ -259,8 +259,8 @@ String hkToken = DESUtil.generateTokenToHk(loginUserInfo.getUsername(),Integer.valueOf( systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_TOKEN_VALIDITY).getCode() ),redisTemplate); - String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() + - systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() + String url = (type==6?"":(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() + + systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode())) + HKService.getMenuUrl(type,hkToken); try { if(redisTemplate!=null&& jwtProperties!=null){ diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java index 3f52538..d1d59d9 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java @@ -801,9 +801,9 @@ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId) //闅愭偅鍖哄煙 .eq(HiddenDanger::getIsdeleted,Constants.ZERO) .eq(Objects.nonNull(hiddenDanger.getStatus()),HiddenDanger::getStatus,hiddenDanger.getStatus()) - .apply(" ( DATE_FORMAT(t.CREATE_DATE, '%Y') = DATE_FORMAT(now(), '%Y') ) ") - .ge(Objects.nonNull(hiddenDanger.getQueryStartTime()), HiddenDanger::getCreateDate,hiddenDanger.getQueryStartTime()) - .le(Objects.nonNull(hiddenDanger.getQueryEndTime()),HiddenDanger::getCreateDate,hiddenDanger.getQueryEndTime()) +// .apply(" ( DATE_FORMAT(t.CREATE_DATE, '%Y') = DATE_FORMAT(now(), '%Y') ) ") +// .ge(Objects.nonNull(hiddenDanger.getQueryStartTime()), HiddenDanger::getCreateDate,hiddenDanger.getQueryStartTime()) +// .le(Objects.nonNull(hiddenDanger.getQueryEndTime()),HiddenDanger::getCreateDate,hiddenDanger.getQueryEndTime()) ); List<GeneralDataVO> yearDataList = new ArrayList<>(); if(CollectionUtils.isEmpty(hiddenDangerAllList)){ diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java index 855db4f..7ea1135 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java @@ -309,7 +309,8 @@ .selectAs(Company::getName,Retention::getCompanyName) .selectAs(Company::getType,Retention::getCompanyType) .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName "); - queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO) + queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO) + .eq(Company::getIsdeleted,Constants.ZERO) .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{ w.like( Retention::getPhone,pageWrap.getModel().getKeyWords()) .or().like( Retention::getName,pageWrap.getModel().getKeyWords()); }) @@ -319,9 +320,9 @@ .isNull(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO), Retention::getCompanyId) .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE), - Company::getType,Constants.ZERO) + Retention::getType,Constants.FOUR) .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO), - Company::getType,Constants.ONE) + Retention::getType,Constants.TWO) //杩囨护杞﹁締鏁版嵁 .ne(Retention::getType,3) .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index 498d6c2..761adea 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -1943,6 +1943,7 @@ List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Retention> retentionList = retentionMapper.selectList( new QueryWrapper<Retention>().lambda() + .eq(Retention::getIsdeleted,Constants.ZERO) .eq(Retention::getType,Constants.FOUR) .in(Retention::getCompanyId,lwCompanyIds) ); @@ -1962,6 +1963,7 @@ List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Retention> retentionList = retentionMapper.selectList( new QueryWrapper<Retention>().lambda() + .eq(Retention::getIsdeleted,Constants.ZERO) .eq(Retention::getType,Constants.TWO) .in(Retention::getCompanyId,internalCompanyIds) ); -- Gitblit v1.9.3