From ca133ed72b297141f906810f81413e15d3d66333 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 03 七月 2024 18:24:37 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 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 63afab9..87dfe19 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 @@ -76,6 +76,7 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + hiddenDanger.setMemberId(hiddenDanger.getLoginUserInfo().getMemberId()); hiddenDanger.setIsdeleted(Constants.ZERO); hiddenDanger.setCreateDate(new Date()); hiddenDanger.setEditDate(new Date()); @@ -83,6 +84,7 @@ if(Objects.isNull(hiddenDangerParam)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鍖哄煙"); } + HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(hiddenDanger.getCateId()); if(Objects.isNull(hiddenDangerCate)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷"); @@ -109,7 +111,7 @@ hiddenDangerLog.setObjType(Constants.ZERO); hiddenDangerLogMapper.insert(hiddenDangerLog); - List<Multifile> multifiles = hiddenDanger.getMultifileList(); + List<Multifile> multifiles = hiddenDanger.getSubmitFileList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)){ for (int i = 0; i < multifiles.size(); i++) { Multifile multifile = multifiles.get(i); @@ -122,11 +124,11 @@ multifileMapper.insert(multifile); } } - String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname(); + String title = "銆愰殣鎮i殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname(); //json鏁版嵁 Map<String,Object> jsonMap = new HashMap<>(); - jsonMap.put("name", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName()); - jsonMap.put("name", "闅愭偅绫诲瀷:" + hiddenDangerCate.getName()); + jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName()); + jsonMap.put("cate", "闅愭偅绫诲瀷:" + hiddenDangerCate.getName()); jsonMap.put("sTime", "鍙戠幇鏃堕棿:" + DateUtil.DateToStr(hiddenDanger.getSubmitTime() , "yyyy-MM-dd HH:mm")); //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢� Notices createNotices = new Notices(); @@ -316,6 +318,7 @@ .eq(pageWrap.getModel().getCheckInfo() != null, HiddenDanger::getCheckInfo, pageWrap.getModel().getCheckInfo()) .eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId()) .eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName()) + .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName()) .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) .or().like(Member::getPhone,pageWrap.getModel().getMemberName())) @@ -442,12 +445,12 @@ isTrue = true; } } - if(isTrue){ + if(!isTrue){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁"); } } if(fileList.size()>0){ - multifileMapper.insertBatchSomeColumn(fileList); + multifileMapper.insert(fileList); } } -- Gitblit v1.9.3