feat: 支持按名称条件查询

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysEnterpriseRelationController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -37,8 +38,9 @@ public class SysEnterpriseRelationController {
 	 * @return 分页
 	 */
 	@GetMapping(value = "/page")
-	public R<Page<SysEnterpriseRelationVO>> pageEntRels(Page<SysEnterpriseRelationVO> page) {
-		return R.ok(enterpriseRelationService.pageEntRels(page));
+	public R<Page<SysEnterpriseRelationVO>> pageEntRels(Page<SysEnterpriseRelationVO> page,
+														@RequestParam(value = "entName", required = false) String entName) {
+		return R.ok(enterpriseRelationService.pageEntRels(page, entName));
 	}
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptMapper.java

@@ -91,8 +91,9 @@ public interface SysDeptMapper extends DataScopeMapper<SysDept> {
 	/**
 	 * 获取企业关系分页
 	 *
-	 * @param page 分页信息
+	 * @param entName 企业名称
+	 * @param page    分页信息
 	 * @return 分页结果
 	 */
-	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page);
+	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page, @Param("entName") String entName);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysDeptService.java

@@ -106,7 +106,7 @@ public interface SysDeptService extends IService<SysDept> {
 	/**
 	 * 分页查询药企和CSO代理商
 	 *
-	 * @param page 分页参数
+	 * @param page     分页参数
 	 * @param deptName 部门名称
 	 * @return
 	 */
@@ -115,8 +115,9 @@ public interface SysDeptService extends IService<SysDept> {
 	/**
 	 * 获取分页
 	 *
-	 * @param page 分页参数
+	 * @param entName 企业名称
+	 * @param page    分页参数
 	 * @return 翻页结果
 	 */
-	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page);
+	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page, String entName);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysEnterpriseRelationService.java

@@ -19,10 +19,11 @@ public interface SysEnterpriseRelationService extends IService<SysEnterpriseRela
 	/**
 	 * 获取分页
 	 *
-	 * @param page 分页参数
+	 * @param entName 企业名称
+	 * @param page    分页参数
 	 * @return 翻页结果
 	 */
-	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page);
+	Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page, String entName);
 
 	/**
 	 * 更新企业关系信息

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptServiceImpl.java

@@ -464,7 +464,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 	/**
 	 * 分页查询药企和CSO代理商
 	 *
-	 * @param page 分页参数
+	 * @param page     分页参数
 	 * @param deptName 部门名称
 	 * @return
 	 */
@@ -494,7 +494,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 		if (StringUtils.isNotBlank(deptName)) {
 			csoWrapper.like(SysDept::getName, deptName);
 		}
-		Page<SysDept> csoPage = this.page(page, csoWrapper);List<Map<String, Object>> csoMapList = csoPage.getRecords().stream().map(sysDept -> {
+		Page<SysDept> csoPage = this.page(page, csoWrapper);
+		List<Map<String, Object>> csoMapList = csoPage.getRecords().stream().map(sysDept -> {
 			Map<String, Object> deptMap = MapUtil.newHashMap(2);
 			deptMap.put("deptId", sysDept.getDeptId());
 			deptMap.put("name", sysDept.getName());
@@ -512,11 +513,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 	/**
 	 * 获取分页
 	 *
-	 * @param page 分页参数
+	 * @param entName 企业名称
+	 * @param page    分页参数
 	 * @return 翻页结果
 	 */
 	@Override
-	public Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page) {
-		return this.baseMapper.pageEntRels(page);
+	public Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page, String entName) {
+		return this.baseMapper.pageEntRels(page, entName);
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysEnterpriseRelationServiceImpl.java

@@ -46,8 +46,8 @@ public class SysEnterpriseRelationServiceImpl extends ServiceImpl<SysEnterpriseR
 	 * @return 翻页结果
 	 */
 	@Override
-	public Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page) {
-		return deptService.pageEntRels(page);
+	public Page<SysEnterpriseRelationVO> pageEntRels(Page<SysEnterpriseRelationVO> page, String entName) {
+		return deptService.pageEntRels(page, entName);
 	}
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -56,7 +56,8 @@
 		<result property="productLine" column="product_line"/>
 		<result property="entLevel" column="ent_level"/>
 		<collection property="serviceCharges" ofType="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO"
-					select="com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper.listSysEnterpriseServiceCharge" column="ent_id"/>
+					select="com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper.listSysEnterpriseServiceCharge"
+					column="ent_id"/>
 	</resultMap>
 
 	<select id="selectDistinctDeptId" resultMap="sysDeptMap">
@@ -64,7 +65,8 @@
 						level
 		FROM sys_dept
 		WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
-		ORDER BY level limit 1
+		ORDER BY level
+		LIMIT 1
 	</select>
 
 	<select id="selectDeptList" resultMap="sysDeptMap">
@@ -238,16 +240,21 @@
 
 	<select id="pageEntRels" resultMap="sysEntRelMap">
 		SELECT el.rel_id,
-			   d.dept_id   AS `ent_id`,
-			   d.name      AS `ent_name`,
-			   d1.dept_id  AS `root_id`,
-			   d1.name     AS `root_name`,
-			   el.e_type   AS `ent_type`,
-			   el.pro_line AS `product_line`,
-			   el.e_level  AS `ent_level`
+		d.dept_id AS `ent_id`,
+		d.name AS `ent_name`,
+		d1.dept_id AS `root_id`,
+		d1.name AS `root_name`,
+		el.e_type AS `ent_type`,
+		el.pro_line AS `product_line`,
+		el.e_level AS `ent_level`
 		FROM sys_dept d
-				 LEFT JOIN sys_ent_rel el ON el.ent_id = d.dept_id
-				 LEFT JOIN sys_dept d1 ON el.root_id = d1.dept_id
-		WHERE d.del_flag = 0
+		LEFT JOIN sys_ent_rel el ON el.ent_id = d.dept_id
+		LEFT JOIN sys_dept d1 ON el.root_id = d1.dept_id
+		<where>
+			d.del_flag = 0
+			<if test="entName != null and entName != ''">
+				AND d.ent_name like CONCAT('%', #{entName},'%')
+			</if>
+		</where>
 	</select>
 </mapper>