From ef98af1814dff13ab8cbeb2a00bd0f2be04ae701 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 03 七月 2025 16:42:43 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) 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 d35604c..dae7e3b 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 @@ -213,13 +213,12 @@ notices.setInfo("寰�"+member.getName()+"澶勭悊"); noticesJoinMapper.insert(notices); - if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){ //鍙戦�佺煭淇¢�氱煡 SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(), SmsConstants.hiddenDangerContent.hiddenDangerDealUser, - Arrays.asList(member.getPhone().split(",")) + Arrays.asList(member.getPhone().split(",")),hiddenDangerCate.getName() ); } @@ -493,6 +492,7 @@ .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName()) .like(pageWrap.getModel().getDutyCompanyName() != null,"t5.company_name_path",pageWrap.getModel().getDutyCompanyName()) + .eq(pageWrap.getModel().getCheckTypeId() != null, HiddenDanger::getCheckTypeId, pageWrap.getModel().getCheckTypeId()) .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) .or().like(Member::getPhone,pageWrap.getModel().getMemberName())) .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime()) @@ -573,7 +573,7 @@ SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(), SmsConstants.hiddenDangerContent.hiddenDangerDealOver, - Arrays.asList(memberUser.getMobile().split(",")) + Arrays.asList(memberUser.getMobile().split(",")),hiddenDangerCate.getName() ); } } @@ -781,7 +781,7 @@ SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz, emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(), SmsConstants.hiddenDangerContent.hiddenDangerDealUser, - Arrays.asList(checkUser.getMobile().split(",")) + Arrays.asList(checkUser.getMobile().split(",")),hiddenDangerCate.getName() ); } @@ -915,7 +915,7 @@ List<Map<String,Object>> mapList = hiddenDangerMapper.selectJoinMaps(new MPJLambdaWrapper<HiddenDanger>() .select(" t1.name as cateName,t2.name as companyName , count(1) total ") - .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) + .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId) .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId) .eq(HiddenDanger::getIsdeleted,Constants.ZERO) .apply(" DATE_FORMAT(t.CREATE_DATE, '%Y%M') = DATE_FORMAT(now(), '%Y%M') ") -- Gitblit v1.9.3