From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 c263aac..3a29e32 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
@@ -46,10 +46,13 @@
 
     @Autowired
     private HiddenDangerMapper hiddenDangerMapper;
+
     @Autowired
     private MultifileMapper multifileMapper;
+
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
+
     @Autowired
     private MemberMapper memberMapper;
 
@@ -84,6 +87,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(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
@@ -143,7 +147,7 @@
         createNotices.setSendacopy(Constants.ZERO);
         createNotices.setParam2("0");
         createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
-        createNotices.setInfo("澶勭悊涓�");
+        createNotices.setInfo("寰�"+member.getName()+"澶勭悊");
         noticesJoinMapper.insert(createNotices);
 
         //瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -162,6 +166,7 @@
         notices.setStatus(Constants.ZERO);
         notices.setSendacopy(Constants.ZERO);
         notices.setReaded(Constants.ZERO);
+        notices.setInfo("寰�"+member.getName()+"澶勭悊");
         noticesJoinMapper.insert(notices);
 
 
@@ -317,6 +322,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()))
@@ -367,6 +373,7 @@
                 .set(Notices::getReaded,Constants.ONE)
                 .set(Notices::getStatus,Constants.ONE)
                 .set(Notices::getParam2,hiddenDanger.getStatus())
+                .set(Notices::getParam4,hiddenDanger.getLoginUserInfo().getMemberId())
                 .eq(Notices::getObjId,hiddenDanger.getId())
                 .eq(Notices::getObjType,Constants.THREE)
                 .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
@@ -443,12 +450,12 @@
                     isTrue = true;
                 }
             }
-            if(isTrue){
+            if(!isTrue){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
             }
         }
         if(fileList.size()>0){
-            multifileMapper.insertBatchSomeColumn(fileList);
+            multifileMapper.insert(fileList);
         }
     }
 
@@ -509,12 +516,15 @@
             BeanUtils.copyProperties(notices,newNotices);
             newNotices.setId(null);
             newNotices.setCreateDate(new Date());
-            newNotices.setParam2("3");
+            newNotices.setParam2("0");
             newNotices.setUserId(hiddenDanger.getCheckUserId());
+            newNotices.setInfo("寰�"+member.getName()+"澶勭悊");
             noticesJoinMapper.insert(newNotices);
             notices.setStatus(Constants.ONE);
+            notices.setParam2("3");
             notices.setEditDate(new Date());
             notices.setReaded(Constants.ONE);
+            notices.setInfo("寰�"+member.getName()+"澶勭悊");
             noticesJoinMapper.updateById(notices);
         }
     }

--
Gitblit v1.9.3