代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DepartmentalPerformanceIndicatorPlanController.java

@@ -181,9 +181,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param id 业务主键
 	 * @return 结果
 	 */
-	@GetMapping(value = "/details/{id}/{deptId}")
-	public R details(@PathVariable("id") String id, @PathVariable("deptId") String deptId) {
-		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, deptId);
+	@GetMapping(value = "/details/{id}/{deptId}/{deptName}")
+	public R details(@PathVariable("id") String id, @PathVariable("deptId") String deptId, @PathVariable("deptName") String deptName) {
+		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, deptId, deptName);
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : list) {
 			if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
 				evaluationDeptBusinessContent.setDataPermission("1");

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationDeptBusinessContentMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface EvaluationDeptBusinessContentMapper extends BaseMapper<EvaluationDeptBusinessContent> {
 
-	List<EvaluationDeptBusinessContent> detailsList(@Param("businessPlanId") String businessPlanId, @Param("deptId") String deptId);
+	List<EvaluationDeptBusinessContent> detailsList(@Param("businessPlanId") String businessPlanId, @Param("deptId") String deptId, @Param("deptName") String deptName);
 
 	boolean removeByBusinessPlanId(String businessPlanId);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationDeptBusinessContentService.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessContentService extends IService<EvaluationDeptBusinessContent> {
 
-	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId);
+	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId, String deptName);
 
 	boolean removeByBusinessPlanId(String businessPlanId);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationDeptBusinessContentServiceImpl.java

@@ -27,11 +27,11 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 	private IOrganizationStructureService organizationStructureService;
 
 	@Override
-	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId) {
+	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId, String deptName) {
 		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}
-		return baseMapper.detailsList(businessPlanId, deptId);
+		return baseMapper.detailsList(businessPlanId, deptId, deptName);
 	}
 
 	@Override

ims-service/ims-eval/src/main/resources/mappers/EvaluationDeptBusinessContentMapper.xml

@@ -55,11 +55,14 @@
         select edbc.* from evaluation_dept_business_content edbc
         left join evaluation_dept ed on ed.dept_id = edbc.dept_id
         <where>
+            <if test="businessPlanId != null and businessPlanId != ''">
+                AND edbc.business_plan_id = #{businessPlanId}
+            </if>
             <if test="deptId != null and deptId != ''">
                 AND edbc.dept_id = #{deptId}
             </if>
-            <if test="businessPlanId != null and businessPlanId != ''">
-                AND edbc.business_plan_id = #{businessPlanId}
+            <if test="deptName != null and deptName != ''">
+                AND edbc.dept_name like CONCAT('%',#{deptName},'%')
             </if>
         </where>
         order by ed.serial_number asc, edbc.serial_number asc