Merge remote-tracking branch 'origin/master'

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

@@ -59,8 +59,9 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
-		@RequestParam(value = "stage", required = false) String stage) {
-		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage);
+		@RequestParam(value = "stage", required = false) String stage,
+		@RequestParam(value = "deptId", required = false) String deptId) {
+		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage, deptId);
 		return R.ok().data(list);
 	}
 

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

@@ -1,7 +1,10 @@
 package com.ims.eval.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
@@ -56,8 +59,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
-		@RequestParam(value = "stage", required = false) String stage) {
-		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage);
+		@RequestParam(value = "stage", required = false) String stage,
+		@RequestParam(value = "deptId", required = false) String deptId) {
+		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage, deptId);
 		return R.ok().data(list);
 	}
 
@@ -81,6 +85,14 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	@PostMapping(value = "/save")
 	public R addAll(@RequestBody EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
 		try {
+			QueryWrapper<EvaluationDeptBusinessPlan> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(evaluationDeptBusinessPlan.getAppraisalYear())) {
+				qw.lambda().eq(EvaluationDeptBusinessPlan::getAppraisalYear, evaluationDeptBusinessPlan.getAppraisalYear());
+			}
+			EvaluationDeptBusinessPlan businessPlan = evaluationDeptBusinessPlanService.getOne(qw);
+			if (ObjectUtil.isNotNull(businessPlan)) {
+				return R.ok().message(evaluationDeptBusinessPlan.getAppraisalYear() + "年度业绩指标计划已存在！");
+			}
 			boolean b = evaluationDeptBusinessPlanService.save(evaluationDeptBusinessPlan);
 			if (b) {
 				return R.ok().data(b);
@@ -147,9 +159,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param id 业务主键
 	 * @return 结果
 	 */
-	@GetMapping(value = "/details/{id}")
-	public R details(@PathVariable("id") String id) {
-		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id);
+	@GetMapping(value = "/details/{id}/{deptId}")
+	public R details(@PathVariable("id") String id, @PathVariable("deptId") String deptId) {
+		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, deptId);
 		return R.ok().data(list);
 	}
 

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

@@ -1,15 +1,16 @@
 package com.ims.eval.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
-import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.EvaluationNotice;
+import com.ims.eval.entity.OrganizationStructure;
 import com.ims.eval.entity.custom.Path;
 import com.ims.eval.entity.dto.result.R;
-import com.ims.eval.service.IDataDictionaryService;
 import com.ims.eval.service.IEvaluationNoticeService;
+import com.ims.eval.service.IOrganizationStructureService;
 import com.ims.eval.util.FileUploadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +42,7 @@ public class NoticeManagementController {
 	private IEvaluationNoticeService evaluationNoticeService;
 
 	@Autowired
-	private IDataDictionaryService dataDictionaryService;
+	private IOrganizationStructureService organizationStructureService;
 
 	/**
 	 * 通告管理列表信息（分页）
@@ -63,8 +64,13 @@ public class NoticeManagementController {
 			if (!"".equals(obj.getSendToContent()) && null != obj.getSendToContent()) {
 				String[] strings = obj.getSendToContent().split(",");
 				for (String str : strings) {
-					DataDictionary dataDictionary = dataDictionaryService.getById(str);
-					names.append(dataDictionary.getKeyName()).append(",");
+					List<OrganizationStructure> deptList = organizationStructureService.getTree("23031001", 1, "140");
+					if (deptList.size() > 0) {
+						OrganizationStructure organizationStructure = deptList.stream().filter(item -> item.getId().equals(str)).findFirst().orElse(null);
+						if (ObjectUtil.isNotNull(organizationStructure)) {
+							names.append(organizationStructure.getName()).append(",");
+						}
+					}
 				}
 				obj.setDeptNames(names.toString().substring(0, names.toString().length() - 1));
 			}
@@ -228,7 +234,7 @@ public class NoticeManagementController {
 	 *
 	 * @param deptId      部门主键
 	 * @param noticeTitle 通告标题
-	 * @return
+	 * @return 结果
 	 */
 	@GetMapping(value = "/circularDisplay")
 	public R circularDisplay(@RequestParam(value = "deptId") String deptId,
@@ -242,6 +248,13 @@ public class NoticeManagementController {
 		List<EvaluationNotice> list = new ArrayList<>();
 		for (EvaluationNotice evaluationNotice : evaluationNoticeList) {
 			if ("所有单位".equals(evaluationNotice.getSendTo())) {
+				String[] noticeAnnexList = evaluationNotice.getNoticeAnnex().split(",");
+				String noticeAnnex = "";
+				for (String str : noticeAnnexList) {
+					if (str.contains("All")) {
+						noticeAnnex += str;
+					}
+				}
 				list.add(evaluationNotice);
 			} else if ("个别部门".equals(evaluationNotice.getSendTo())) {
 				String[] strings = evaluationNotice.getSendToContent().split(",");
@@ -252,8 +265,12 @@ public class NoticeManagementController {
 					}
 				}
 			} else if ("本部部门".equals(evaluationNotice.getSendTo())) {
-				if (deptId.equals(evaluationNotice.getReleaseDept())) {
-					list.add(evaluationNotice);
+				List<OrganizationStructure> deptList = organizationStructureService.getTree("23031001", 1, "140");
+				if (deptList.size() > 0) {
+					OrganizationStructure organizationStructure = deptList.stream().filter(item -> item.getId().equals(deptId)).findFirst().orElse(null);
+					if (ObjectUtil.isNotNull(organizationStructure)) {
+						list.add(evaluationNotice);
+					}
 				}
 			}
 		}

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

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface EvaluationDeptBusinessAssessmentMapper extends BaseMapper<EvaluationDeptBusinessAssessment> {
 
-	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
+	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage, @Param("deptId") String deptId);
 
 }

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(String businessPlanId);
+	List<EvaluationDeptBusinessContent> detailsList(@Param("businessPlanId") String businessPlanId, @Param("deptId") String deptId);
 
 	boolean removeByBusinessPlanId(String businessPlanId);
 

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

@@ -3,7 +3,6 @@ package com.ims.eval.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,5 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface EvaluationDeptBusinessPlanMapper extends BaseMapper<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
+	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage, @Param("deptId") String deptId);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessContent.java

@@ -1,6 +1,5 @@
 package com.ims.eval.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -79,7 +78,7 @@ public class EvaluationDeptBusinessContent extends Model {
 	private String evaluationScore;
 
 	/**
-	 * 审核状态
+	 * 审核状态(-1待审核、0已通过、-2未通过、1已批准)
 	 */
 	private String auditStatus;
 

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessAssessmentService extends IService<EvaluationDeptBusinessAssessment> {
 
-	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage);
+	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId);
 
 	boolean editState(String id, String state, String instId);
 

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

@@ -3,7 +3,6 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -13,7 +12,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessContentService extends IService<EvaluationDeptBusinessContent> {
 
-	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId);
+	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId);
 
 	boolean removeByBusinessPlanId(String businessPlanId);
 

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

@@ -3,7 +3,6 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -14,7 +13,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage);
+	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId);
 
 	boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan);
 

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

@@ -21,13 +21,16 @@ import java.util.List;
 public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<EvaluationDeptBusinessAssessmentMapper, EvaluationDeptBusinessAssessment> implements IEvaluationDeptBusinessAssessmentService {
 
 	@Override
-	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage) {
+	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId) {
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessAssessment> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
+		if ("23031009".equals(deptId)){
+			deptId = "";
+		}
+		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage, deptId);
 	}
 
 	@Override

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

@@ -3,19 +3,14 @@ package com.ims.eval.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
-import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.EvaluationDeptBusinessContentMapper;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
-import com.ims.eval.entity.Myuser;
 import com.ims.eval.service.IDataDictionaryService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
-import com.ims.eval.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,8 +25,11 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 	private IDataDictionaryService dataDictionaryService;
 
 	@Override
-	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId) {
-		return baseMapper.detailsList(businessPlanId);
+	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId) {
+		if ("23031009".equals(deptId)){
+			deptId = "";
+		}
+		return baseMapper.detailsList(businessPlanId, deptId);
 	}
 
 	@Override

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

@@ -4,21 +4,21 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.EvaluationDeptBusinessPlanMapper;
-import com.ims.eval.entity.*;
-import com.ims.eval.service.*;
+import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
+import com.ims.eval.entity.EvaluationDeptBusinessPlan;
+import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
+import com.ims.eval.service.IEvaluationDeptBusinessContentService;
+import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,61 +36,36 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
 	@Override
-	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage) {
+	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId) {
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessPlan> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
+		if ("23031009".equals(deptId)){
+			deptId = "";
+		}
+		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage, deptId);
 	}
 
 	@Override
 	public boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
-		boolean b;
-		QueryWrapper<EvaluationDeptBusinessPlan> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(evaluationDeptBusinessPlan.getAppraisalYear())) {
-			qw.lambda().eq(EvaluationDeptBusinessPlan::getAppraisalYear, evaluationDeptBusinessPlan.getAppraisalYear());
-		}
-		EvaluationDeptBusinessPlan businessPlan = baseMapper.selectOne(qw);
-		if (ObjectUtil.isNotNull(businessPlan)) {
-			return false;
-		}
-		String id = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
-		evaluationDeptBusinessPlan.setId(id);
-		evaluationDeptBusinessPlan.setResponsibilityCode("BMKP_" + evaluationDeptBusinessPlan.getBusinessClass() + "_" + evaluationDeptBusinessPlan.getAppraisalYear());
+		evaluationDeptBusinessPlan.setId(Convert.toStr(IdUtil.getSnowflake(1, 1).nextId()));
+		evaluationDeptBusinessPlan.setResponsibilityCode("YJZB_GDDL_BMKP_" + evaluationDeptBusinessPlan.getAppraisalYear());
 		evaluationDeptBusinessPlan.setDocumentStatus("有效");
 		evaluationDeptBusinessPlan.setStage("流程未启动");
 		evaluationDeptBusinessPlan.setCreateTime(DateUtil.date());
-		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = new ArrayList<>();
 		JSONArray array = JSONUtil.parseArray(evaluationDeptBusinessPlan.getDeptData());
 		List<Dict> deptList = JSONUtil.toList(array, Dict.class);
 		StringBuilder deptIds = new StringBuilder();
 		StringBuilder deptNames = new StringBuilder();
-		StringBuilder deptCodes = new StringBuilder();
 		for (Dict dict : deptList) {
-			String deptId = dict.get("id").toString();
-			String deptName = dict.get("keyName").toString();
-			String deptCode = dict.get("dataKey").toString();
-			EvaluationDeptBusinessContent evaluationDeptBusinessContent = new EvaluationDeptBusinessContent();
-			evaluationDeptBusinessContent.setBusinessPlanId(id);
-			evaluationDeptBusinessContent.setDeptId(deptId);
-			evaluationDeptBusinessContent.setDeptName(deptName);
-			evaluationDeptBusinessContent.setDeptCode(deptCode);
-			evaluationDeptBusinessContent.setSerialNumber("1");
-			evaluationDeptBusinessContent.setAuditStatus("-1");
-			evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
-			evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
-			deptIds.append(deptId).append(",");
-			deptNames.append(deptName).append(",");
-			deptCodes.append(deptCode).append(",");
+			deptIds.append(dict.get("id").toString()).append(",");
+			deptNames.append(dict.get("keyName").toString()).append(",");
 		}
-		b = evaluationDeptBusinessContentService.saveBatch(evaluationDeptBusinessContentList);
 		evaluationDeptBusinessPlan.setDeptId(deptIds.toString().substring(0, deptIds.toString().length() - 1));
 		evaluationDeptBusinessPlan.setDeptName(deptNames.toString().substring(0, deptNames.toString().length() - 1));
-		evaluationDeptBusinessPlan.setDeptCode(deptCodes.toString().substring(0, deptCodes.toString().length() - 1));
-		b = super.save(evaluationDeptBusinessPlan);
-		return b;
+		return super.save(evaluationDeptBusinessPlan);
 	}
 
 	@Override

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

@@ -62,6 +62,9 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessAssessment">
         <include refid="selectEvaluationDeptBusinessAssessmentVo"/>
         <where>
+            <if test="deptId != null and deptId != ''">
+                AND dept_id like CONCAT('%',#{deptId},'%')
+            </if>
             <if test="responsibilityCode != null and responsibilityCode != ''">
                 AND responsibility_code like CONCAT('%',#{responsibilityCode},'%')
             </if>

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

@@ -51,7 +51,11 @@
 
     <select id="detailsList" resultType="com.ims.eval.entity.EvaluationDeptBusinessContent">
         <include refid="selectEvaluationDeptBusinessContentVo"/>
-        where business_plan_id = #{businessPlanId} order by dept_name asc, serial_number asc
+        where
+        <if test="deptId != null and deptId != ''">
+            AND dept_id = #{deptId}
+        </if>
+        business_plan_id = #{businessPlanId} order by dept_name asc, serial_number asc
     </select>
 
     <select id="selectEvaluationDeptBusinessContentListByBusinessPlanId" resultType="com.ims.eval.entity.EvaluationDeptBusinessContent">

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

@@ -62,6 +62,9 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessPlan">
         <include refid="selectEvaluationDeptBusinessPlanVo"/>
         <where>
+            <if test="deptId != null and deptId != ''">
+                AND dept_id like CONCAT('%',#{deptId},'%')
+            </if>
             <if test="responsibilityCode != null and responsibilityCode != ''">
                 AND responsibility_code like CONCAT('%',#{responsibilityCode},'%')
             </if>