删除事件同时删除ic_event_category

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventCategoryDao.java

@@ -15,6 +15,4 @@ import org.apache.ibatis.annotations.Param;
 public interface IcEventCategoryDao extends BaseDao<IcEventCategoryEntity> {
 
     IcEventCategoryEntity selectByEventId(@Param("icEventId") String icEventId);
-
-    int deleteByIcEventId(@Param("icEventId") String icEventId);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java

@@ -83,5 +83,11 @@ public interface IcEventCategoryService extends BaseService<IcEventCategoryEntit
      */
     IcEventCategoryEntity getByEventId(String eventId);
 
+    /**
+     * 先删除ic_event_category
+     * 再插入
+     * @param icEventId
+     * @param categoryEntities
+     */
     void delInsert(String icEventId, List<IcEventCategoryEntity> categoryEntities);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java

@@ -1,20 +1,26 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcEventCategoryDao;
 import com.epmet.dto.IcEventCategoryDTO;
 import com.epmet.entity.IcEventCategoryEntity;
 import com.epmet.service.IcEventCategoryService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +32,8 @@ import java.util.Map;
  */
 @Service
 public class IcEventCategoryServiceImpl extends BaseServiceImpl<IcEventCategoryDao, IcEventCategoryEntity> implements IcEventCategoryService {
-
+    @Autowired
+    private LoginUserUtil loginUserUtil;
 
     @Override
     public PageData<IcEventCategoryDTO> page(Map<String, Object> params) {
@@ -88,8 +95,15 @@ public class IcEventCategoryServiceImpl extends BaseServiceImpl<IcEventCategoryD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delInsert(String icEventId, List<IcEventCategoryEntity> categoryEntities) {
-        baseDao.deleteByIcEventId(icEventId);
-        this.insertBatch(categoryEntities);
+        LambdaUpdateWrapper<IcEventCategoryEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(IcEventCategoryEntity::getIcEventId,icEventId)
+                .set(IcEventCategoryEntity::getUpdatedTime,new Date())
+                .set(IcEventCategoryEntity::getUpdatedBy,loginUserUtil.getLoginUserId())
+                .set(IcEventCategoryEntity::getDelFlag, NumConstant.ONE_STR);
+        baseDao.update(null,wrapper);
+        if(CollectionUtils.isNotEmpty(categoryEntities)){
+            this.insertBatch(categoryEntities);
+        }
     }
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -448,6 +448,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         updateById(entity);
     }
 
+    /**
+     * 事件管理-批量删除事件
+     * @param ids
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -455,7 +459,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         for (String id : ids) {
             IcEventEntity entity = baseDao.selectById(id);
             if (null == entity){
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"数据不存在","数据不存在");
+                // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"数据不存在","数据不存在");
+                continue;
             }
             //1:已转项目  2:已转需求
             if (NumConstant.ONE_STR.equals(entity.getOperationType())){
@@ -471,9 +476,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             }
             LambdaUpdateWrapper<IcEventEntity> wrapper = new LambdaUpdateWrapper();
             wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date())
-                    .set(IcEventEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+                    .set(IcEventEntity::getUpdatedBy,loginUserUtil.getLoginUserId())
                     .set(IcEventEntity::getDelFlag,NumConstant.ONE_STR);
             baseDao.update(null,wrapper);
+            //把事件分类ic_event_category也删除了吧,以免后面数据分析用到这个表
+            icEventCategoryService.delInsert(id,null);
         }
     }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3621,7 +3621,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		wrapper.eq(ProjectEntity::getOriginId, originId)
 				.eq(ProjectEntity::getOrigin,origin)
 				.set(ProjectEntity::getUpdatedTime,new Date())
-				.set(ProjectEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+				.set(ProjectEntity::getUpdatedBy,loginUserUtil.getLoginUserId())
 				.set(ProjectEntity::getDelFlag,NumConstant.ONE_STR);
 		return baseDao.update(null, wrapper);
 	}

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventCategoryDao.xml

@@ -17,7 +17,4 @@
             del_flag = '0'
         AND ic_event_id = #{icEventId}
     </select>
-    <delete id="deleteByIcEventId" parameterType="map">
-        delete  from ic_event_category where ic_event_id = #{icEventId}
-    </delete>
 </mapper>