[feat]

1、增加预警已完结接口、增加查询部门处置人员接口①

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

@@ -29,7 +29,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus<BusinessAlert, Busin
     @DataPermission(
         @DataColumn(key = "deptName", value = "t.dept_id")
     )
-    Page<BusinessAlert> pageAlertFinish(@Param("page") Page<BusinessAlert> page,@Param("ew") QueryWrapper<BusinessAlert> ew);
+    Page<BusinessAlert> pageBusinessAlertHandle(@Param("page") Page<BusinessAlert> page,@Param("ew") QueryWrapper<BusinessAlert> ew);
 
     /**
      * 处理中
@@ -47,6 +47,13 @@ public interface BusinessAlertMapper extends BaseMapperPlus<BusinessAlert, Busin
     )
     Page<BusinessAlert> pageBusinessAlertCancel(@Param("page") Page<BusinessAlert> page,@Param("ew") QueryWrapper<BusinessAlert> ew);
 
+
+    @DataPermission(
+        @DataColumn(key = "deptName", value = "t.dept_id")
+    )
+    Page<BusinessAlert> pageBusinessAlertFinish(Page<Object> build, QueryWrapper<BusinessAlert> wrapper);
+
+
     @DataPermission(
         @DataColumn(key = "deptName", value = "t.dept_id")
     )
@@ -107,4 +114,5 @@ public interface BusinessAlertMapper extends BaseMapperPlus<BusinessAlert, Busin
     List<Map<String, Object>> listOneDepartAlert(@Param("param") BusinessAlertBo businessAlertBo);
 
     List<Map<String, Object>> listOneDepartAlertStatus(@Param("param") BusinessAlertBo businessAlertBo);
+
 }

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

@@ -22,11 +22,13 @@ public interface IBusinessAlertService {
 
     TableDataInfo<BusinessAlert> pageBusinessAlertTodo(BusinessAlertBo bo, PageQuery pageQuery);
 
-    TableDataInfo<BusinessAlert> pageBusinessAlertFinish(BusinessAlertBo bo, PageQuery pageQuery);
+    TableDataInfo<BusinessAlert> pageBusinessAlertHandle(BusinessAlertBo bo, PageQuery pageQuery);
 
     TableDataInfo<BusinessAlert> pageBusinessAlertAll(BusinessAlertBo bo, PageQuery pageQuery);
 
     TableDataInfo<BusinessAlert> pageBusinessAlertCancel(BusinessAlertBo bo, PageQuery pageQuery);
+
+    TableDataInfo<BusinessAlert> pageBusinessAlertFinish(BusinessAlertBo bo, PageQuery pageQuery);
     /**
      * 新增预警任务
      *

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

@@ -284,11 +284,10 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
             return new TableDataInfo<>();
         }
 
-        wrapper.notIn("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus());
+        wrapper.eq("t.handle_type",BusinessStatusEnum.FINISH.getStatus());
 
-        wrapper.apply(" EXISTS(select * from dk_workflow.flow_his_task ht where ht.approver ='" + LoginHelper.getUserId() + "' and ht.instance_id = t.instanceId)");
 
-        Page<BusinessAlert> page = this.baseMapper.pageAlertFinish(pageQuery.build(), wrapper);
+        Page<BusinessAlert> page = this.baseMapper.pageBusinessAlertFinish(pageQuery.build(), wrapper);
 
         try {
             page.getRecords().forEach(businessAlertVo->{
@@ -360,6 +359,38 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo<BusinessAlert> pageBusinessAlertHandle(BusinessAlertBo bo, PageQuery pageQuery) {
+        QueryWrapper<BusinessAlert> wrapper = buildQueryWrapper(bo);
+
+        if (ObjectUtil.isEmpty(wrapper)){
+            return new TableDataInfo<>();
+        }
+
+        wrapper.notIn("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus());
+
+        wrapper.apply(" EXISTS(select * from dk_workflow.flow_his_task ht where ht.approver ='" + LoginHelper.getUserId() + "' and ht.instance_id = t.instanceId)");
+
+        Page<BusinessAlert> page = this.baseMapper.pageBusinessAlertHandle(pageQuery.build(), wrapper);
+
+        try {
+            page.getRecords().forEach(businessAlertVo->{
+                if (businessAlertVo.getBusinessType() == 2){
+                    businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600).toString());
+                }else {
+                    businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString());
+                    businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString());
+                    businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString());
+                    businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString());
+                }
+            });
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+        }
+
+        return TableDataInfo.build(page);
+    }
+
 
     /**
      * 构建wrapper

dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml

@@ -31,6 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="pageBusinessAlertFinish" resultType="org.dromara.business.domain.BusinessAlert">
+        select t.* from (select
+                             ba.*
+                         from dk_business.business_alert ba) t
+            ${ew.getCustomSqlSegment}
+    </select>
+
     <select id="pageBusinessAlertCancel" resultType="org.dromara.business.domain.BusinessAlert">
         select t.* from (
                           select
@@ -44,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${ew.getCustomSqlSegment}
     </select>
 
-    <select id="pageAlertFinish" resultType="org.dromara.business.domain.BusinessAlert">
+    <select id="pageBusinessAlertHandle" resultType="org.dromara.business.domain.BusinessAlert">
         select t.* from (
                             select
                                          ba.*,

dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java

@@ -1,6 +1,7 @@
 package org.dromara.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;
@@ -9,6 +10,8 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.bo.SysRoleBo;
@@ -226,5 +229,18 @@ public class SysRoleController extends BaseController {
         selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo()));
         return R.ok(selectVo);
     }
+
+    /**
+     * 获取对应角色部门树列表
+     *
+     */
+    @GetMapping(value = "/user/list")
+    public R<List<SysUser>> listRoleUser() {
+        String roleName = "dispose";
+
+       List<SysUser> userList =  roleService.getUserIno(roleName);
+
+        return R.ok(userList);
+    }
 }
 

dk-modules/system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java

@@ -8,6 +8,7 @@ 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.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysRoleVo;
 
 import java.util.List;
@@ -59,4 +60,8 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
      */
     List<SysRoleVo> selectRolesByUserId(Long userId);
 
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "su.dept_id"),
+    })
+    List<SysUser> getUserIno(@Param("roleName") String roleName);
 }

dk-modules/system/src/main/java/org/dromara/system/service/ISysRoleService.java

@@ -2,6 +2,8 @@ package org.dromara.system.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysRoleBo;
 import org.dromara.system.domain.vo.SysRoleVo;
@@ -197,4 +199,6 @@ public interface ISysRoleService {
 
     void cleanOnlineUserByRole(Long roleId);
 
+    List<SysUser> getUserIno(String roleName);
+
 }

dk-modules/system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java

@@ -22,10 +22,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.model.LoginUser;
-import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.*;
-import org.dromara.system.domain.SysRoleDept;
-import org.dromara.system.domain.SysRoleMenu;
-import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysRoleBo;
 import org.dromara.system.domain.vo.SysRoleVo;
 import org.dromara.system.mapper.SysRoleDeptMapper;
@@ -511,4 +508,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
             }
         });
     }
+
+    @Override
+    public List<SysUser> getUserIno(String roleName) {
+        return this.baseMapper.getUserIno(roleName);
+    }
 }

dk-modules/system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -56,4 +56,25 @@
         WHERE r.del_flag = '0' and r.role_id = #{roleId}
     </select>
 
+    <select id="getUserIno" resultType="org.dromara.system.domain.SysUser">
+        SELECT
+            su.*
+        FROM
+            sys_user su
+        WHERE
+            su.user_id IN (
+                SELECT
+                    sur.user_id
+                FROM
+                    sys_user_role sur
+                WHERE
+                    sur.role_id IN (
+                        SELECT
+                            role_id
+                        FROM
+                            sys_role sr
+                        WHERE
+                            sr.role_key = #{roleName}))
+    </select>
+
 </mapper>