From 14f37814a441d795ae7a15dfe4b7be05aa49f96f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 23 一月 2025 16:30:28 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 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 2054ba1..e12e744 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
@@ -8,9 +8,9 @@
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.SmsConstants;
@@ -238,6 +238,43 @@
     @Override
     public void deleteById(Integer id) {
         hiddenDangerMapper.deleteById(id);
+    }
+    @Override
+    public void deleteById(Integer id,LoginUserInfo user) {
+        if( Objects.isNull(id)   ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,new MPJLambdaWrapper<HiddenDanger>()
+                .selectAll(HiddenDanger.class)
+                .selectAs(Member::getName,HiddenDanger::getCheckorName)
+                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
+                .eq(HiddenDanger::getId,id)
+                .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
+        );
+        if(Objects.isNull(model)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
+        }
+        if (!Constants.equalsInteger(model.getStatus(),Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆,璇峰埛鏂版煡鐪�!");
+        }
+        HiddenDanger hiddenDanger  = new HiddenDanger();
+        hiddenDanger.setIsdeleted(Constants.ONE);
+        hiddenDanger.setId(id);
+        hiddenDanger.setEditor(user.getId());
+
+        hiddenDanger.setEditDate(new Date());
+        hiddenDangerMapper.updateById(hiddenDanger);
+        //瀛樺偍 鎿嶄綔鏃ュ織
+        HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
+        hiddenDangerLog.setIsdeleted(Constants.ZERO);
+        hiddenDangerLog.setCreateDate(new Date());
+        hiddenDangerLog.setCreator(hiddenDanger.getEditor());
+        hiddenDangerLog.setEditDate(hiddenDangerLog.getCreateDate());
+        hiddenDangerLog.setEditor(hiddenDanger.getCreator());
+        hiddenDangerLog.setTitle("鐢便��"+user.getRealname()+"銆戝垹闄よ褰�");
+        hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
+        hiddenDangerLog.setObjType(Constants.FIVE);
+        hiddenDangerLogMapper.insert(hiddenDangerLog);
     }
 
     @Override
@@ -525,6 +562,7 @@
                 if(StringUtils.isBlank(multifile.getFileurl())){
                     continue;
                 }
+                multifile.setId(null);
                 multifile.setCreateDate(new Date());
                 multifile.setCreator(hiddenDanger.getEditor());
                 multifile.setIsdeleted(Constants.ZERO);
@@ -538,6 +576,11 @@
             if(hiddenDanger.getStatus().equals(Constants.ONE) && !isTrue){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
             }
+            multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+                    .set(Multifile::getIsdeleted,Constants.ONE )
+                    .eq(Multifile::getObjType,Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey())
+                    .set(Multifile::getObjId,hiddenDanger.getId())
+            );
         }
         if(hiddenDanger.getStatus().equals(Constants.ONE)){
             boolean isTrue = false;
@@ -548,6 +591,7 @@
                     if(StringUtils.isBlank(multifile.getFileurl())){
                         continue;
                     }
+                    multifile.setId(null);
                     multifile.setCreateDate(new Date());
                     multifile.setCreator(hiddenDanger.getEditor());
                     multifile.setIsdeleted(Constants.ZERO);

--
Gitblit v1.9.3