审批配置-首页搜索完成

ruoyi-psa/src/main/java/com/ruoyi/controller/ApprovalConfigurationController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.domain.dto.ApprovalConfigurationDTO;
 import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
 import com.ruoyi.service.IApprovalConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +20,11 @@ public class ApprovalConfigurationController extends BaseController {
     private IApprovalConfigurationService approvalConfigurationService;
 
     //获取审批页面列表
+    @Anonymous
     @GetMapping("/getList")
-    public TableDataInfo getList(){
+    public TableDataInfo getList(ApprovalConfigurationDTO configurationDTO){
         startPage();
-        return getDataTable(approvalConfigurationService.getALLList());
+        return getDataTable(approvalConfigurationService.getALLList(configurationDTO));
     }
 
     //获取全部角色

ruoyi-psa/src/main/java/com/ruoyi/mapper/ApprovalConfigurationMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Mapper
 public interface ApprovalConfigurationMapper {
-    List<ApprovalConfigurationDTO> getALLList();
+    List<ApprovalConfigurationDTO> getALLList(ApprovalConfigurationDTO configurationDTO);
 
     //获取除了管理员的所有角色
     List<SysRole>  getAllRole();

ruoyi-psa/src/main/java/com/ruoyi/service/IApprovalConfigurationService.java

@@ -7,7 +7,7 @@ import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
 import java.util.List;
 
 public interface IApprovalConfigurationService {
-    List<ApprovalConfigurationDTO> getALLList();
+    List<ApprovalConfigurationDTO> getALLList (ApprovalConfigurationDTO configurationDTO);
 
     List<SysRole>  getAllRole();
 

ruoyi-psa/src/main/java/com/ruoyi/service/impl/IApprovalConfigurationServiceImpl.java

@@ -26,8 +26,8 @@ public class IApprovalConfigurationServiceImpl implements IApprovalConfiguration
 
 
     @Override
-    public List<ApprovalConfigurationDTO> getALLList() {
-        return configurationMapper.getALLList();
+    public List<ApprovalConfigurationDTO> getALLList(ApprovalConfigurationDTO configurationDTO) {
+        return configurationMapper.getALLList(configurationDTO);
     }
 
     @Override

ruoyi-psa/src/main/resources/mapper/ApprovalConfiguration/ApprovalConfigurationMapper.xml

@@ -41,8 +41,13 @@
     </delete>
 
 
-    <select id="getALLList" resultMap="listDTO">
+    <select id="getALLList" resultMap="listDTO" parameterType="com.ruoyi.domain.dto.ApprovalConfigurationDTO">
         select a.id,a.approval_number,a.approval_name,a.approve_type,a.create_by,(select r.role_name from sys_role r where r.role_id = (select ur.role_id from  sys_user_role ur where ur.user_id = (select u.user_id from sys_user u where u.user_name = a.create_by))) as createRoleName,a.create_time,a.update_time from approval_process a
+        <where>
+            <if test="approveType != null  and approveType != ''"> and a.approve_type = #{approveType}</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by LIKE CONCAT('%',#{createBy} , '%')</if>
+            <if test="approvalName != null  and approvalName != ''"> and a.approval_name LIKE CONCAT('%', #{approvalName}, '%')</if>
+        </where>
     </select>
     <select id="getAllRole" resultType="com.ruoyi.common.core.domain.entity.SysRole">
         select r.role_id as roleId,r.role_name as roleName from sys_role r where r.role_id not in (1,2)