Merge remote-tracking branch 'origin/master'

dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java

@@ -1,17 +1,14 @@
 package org.dromara.business.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
 import org.dromara.business.domain.BusinessAlert;
 import org.dromara.business.domain.bo.BusinessAlertBo;
 import org.dromara.business.domain.vo.BusinessAlertVo;
 import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -24,14 +21,14 @@ import java.util.Map;
  */
 public interface BusinessAlertMapper extends BaseMapperPlus<BusinessAlert, BusinessAlertVo> {
 
-//    @DataPermission(
-//        @DataColumn(key = "deptName", value = "t.dept_id")
-//    )
+    @DataPermission(
+        @DataColumn(key = "deptName", value = "t.dept_id")
+    )
     Page<BusinessAlert> pageBusinessAlert(Page<BusinessAlert> page, QueryWrapper<BusinessAlert> ew);
 
-    //    @DataPermission(
-//        @DataColumn(key = "deptName", value = "t.dept_id")
-//    )
+        @DataPermission(
+        @DataColumn(key = "deptName", value = "t.dept_id")
+    )
     Page<BusinessAlert> pageAlertFinish(Page<BusinessAlert> page, QueryWrapper<BusinessAlert> ew);
 
     /**
@@ -40,14 +37,14 @@ public interface BusinessAlertMapper extends BaseMapperPlus<BusinessAlert, Busin
      * @param ew
      * @return
      */
-//    @DataPermission(
-//        @DataColumn(key = "deptName", value = "t.dept_id")
-//    )
+    @DataPermission(
+        @DataColumn(key = "deptName", value = "t.dept_id")
+    )
     Page<BusinessAlert> pageAlertTodo(Page<BusinessAlert> page, QueryWrapper<BusinessAlert> ew);
 
-    //    @DataPermission(
-//        @DataColumn(key = "deptName", value = "t.dept_id")
-//    )
+        @DataPermission(
+        @DataColumn(key = "deptName", value = "t.dept_id")
+    )
     Page<BusinessAlert> pageBusinessAlertCancel(Page<BusinessAlert> build, QueryWrapper<BusinessAlert> ew);
 
 

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java

@@ -20,6 +20,7 @@ import org.dromara.business.utils.MinioUntil;
 import org.dromara.business.utils.constants.MinIOConstants;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -73,6 +74,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
     public BusinessAlert addBusinessAlert(BusinessAlertVo param) {
         BusinessAlert alert = MapstructUtils.convert(param, BusinessAlert.class);
         alert.setCreateTime(new Date());
+        alert.setJobName(alert.getDeptName()+alert.getLabelCn()+ DateUtils.getTime());
         this.baseMapper.insert(alert);
         return alert;
     }