新增在审批管理中增加一个审批查询的功能

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -313,6 +313,19 @@ public class SpmkController {
 	}
 	}
 
 
 	/**
 	/**
+	 * 查询列表-审批组-审批管理  新增查询
+	 */
+	@GetMapping(value = "/all_approval_g1")
+	@ApiOperation(value = "11.查询列表-审批组-审批管理", httpMethod = "GET", notes = "查询列表-审批组-审批管理")
+	@ApiOperationSupport(order = 11)
+	public Result<Object> selectListAgByAdmin1(@CurrentUser UserBean userBean,@RequestParam("eaaname")String eaaname){
+
+		List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
+		return ResultUtil.data(spmkApprovalGMapper.selectListAgInCaByAdmin1(userBean.getOrgCode(), userBean.getEmpNum(), depts,eaaname));
+
+	}
+
+	/**
 	 * 查询列表-审批组-个人审批
 	 * 查询列表-审批组-个人审批
 	 */
 	 */
 	@GetMapping(value = "/list_approval_g")
 	@GetMapping(value = "/list_approval_g")

src/main/java/cn/timer/api/dao/spmk/SpmkApprovalGMapper.java

@@ -23,4 +23,7 @@ public interface SpmkApprovalGMapper extends BaseMapper<SpmkApprovalG> {
 
 
 	List<SpmkApprovalG> selectListAgInCaByAdmin(@Param("org_code") Integer org_code, @Param("emp_num") Integer emp_num, @Param("deptIds") List<Integer> deptIds);
 	List<SpmkApprovalG> selectListAgInCaByAdmin(@Param("org_code") Integer org_code, @Param("emp_num") Integer emp_num, @Param("deptIds") List<Integer> deptIds);
 
 
+	List<SpmkApprovalG> selectListAgInCaByAdmin1(@Param("org_code") Integer org_code, @Param("emp_num") Integer emp_num, @Param("deptIds") List<Integer> deptIds,@Param("eaaname")String eaaname);
+
+
 }
 }

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -74,10 +74,22 @@
          
          
         LEFT JOIN spmk_custom_approval b 
         LEFT JOIN spmk_custom_approval b 
         ON a.id = b.approval_g_id 
         ON a.id = b.approval_g_id 
-        WHERE a.org_code = #{org_code}  
+        WHERE a.org_code = #{org_code}
         ORDER BY a.ranks, b.ranks,b.id DESC
         ORDER BY a.ranks, b.ranks,b.id DESC
-    </select> 
-    
+    </select>
+
+    <select id="selectListAgInCaByAdmin1" resultMap="BaseResultMapDto">
+        SELECT
+        <include refid="Base_Column_List_Alias_a" />,
+        <include refid="Base_Column_List_Alias_ca" />
+        FROM spmk_approval_g a
+
+        LEFT JOIN spmk_custom_approval b
+        ON a.id = b.approval_g_id
+        WHERE a.org_code = #{org_code}  and b.name like CONCAT('%',#{eaaname},'%')
+        ORDER BY a.ranks, b.ranks,b.id DESC
+    </select>
+
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
         SELECT 
         SELECT 
         	<include refid="Base_Column_List_Alias_a" />,
         	<include refid="Base_Column_List_Alias_a" />,