Merge branch 'master' of http://124.70.43.205:3000/wangchangsheng/evaluation

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

@@ -0,0 +1,19 @@
+package com.ims.eval.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 部门业绩指标计划
+ *
+ * @author hlf
+ * @date 2023/4/26 14:15
+ * 文件说明：
+ */
+@RestController
+@RequestMapping("//evaluation-dept-plan")
+public class DepartmentalPerformanceIndicatorPlanController {
+
+
+
+}

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

@@ -1,23 +1,37 @@
 package com.ims.eval.controller;
 
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.IdUtil;
+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.EvaluationDeptIndicator;
+import com.ims.eval.entity.EvaluationDeptIndicatorItem;
+import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.EvaluationDept;
+import com.ims.eval.service.IEvaluationDeptIndicatorItemService;
+import com.ims.eval.service.IEvaluationDeptIndicatorService;
 import com.ims.eval.service.IEvaluationDeptService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toCollection;
 
 /**
- * <p>
- * 考评部门 前端控制器
- * </p>
+ * 考评部门配置
  *
- * @author wang
- * @since 2023-03-06
+ * @author hlf
+ * @date 2023/4/25 9:34
+ * 文件说明：
  */
 @RestController
 @RequestMapping("//evaluation-dept")
@@ -26,39 +40,215 @@ public class EvaluationDeptController {
 	@Autowired
 	private IEvaluationDeptService evaluationDeptService;
 
+	@Autowired
+	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
+
+	@Autowired
+	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
+
+	/**
+	 * 考评部门配置列表信息（分页）
+	 *
+	 * @param pageNum  当前记录起始索引
+	 * @param pageSize 每页显示记录数
+	 * @param deptName 部门名称
+	 * @param annual   年度
+	 * @param monthly  月度
+	 * @return 结果
+	 */
+	//@ImsPreAuth("eval:evaluationDept:view")
+	@GetMapping(value = "list")
+	public R list(
+		@RequestParam(value = "pageNum") Integer pageNum,
+		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "deptName", required = false) String deptName,
+		@RequestParam(value = "annual", required = false) String annual,
+		@RequestParam(value = "monthly", required = false) String monthly) {
+		IPage<EvaluationDept> list = evaluationDeptService.listPage(pageNum, pageSize, deptName, annual, monthly);
+		List<EvaluationDept> evaluationDeptList = list.getRecords();
+		for (EvaluationDept evaluationDept : evaluationDeptList) {
+			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
+			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
+				List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicator.getId());
+				evaluationDeptIndicator.setEvaluationDeptIndicatorItemList(evaluationDeptIndicatorItemList);
+			}
+			evaluationDept.setEvaluationDeptIndicatorList(evaluationDeptIndicatorList);
+		}
+		return R.ok().data(list);
+	}
 
+	/**
+	 * 考评部门配置信息
+	 *
+	 * @param deptId  部门主键
+	 * @param annual  年度
+	 * @param monthly 月度
+	 * @return 结果
+	 */
 	//@ImsPreAuth("eval:evaluationDept:view")
 	@GetMapping(value = "listAll")
 	public R listAll(
-		@RequestParam(value = "id", required = false) String id,
-		@RequestParam(value = "enable", required = false) boolean enable) {
-		List<EvaluationDept> list = evaluationDeptService.listAll(id, enable);
+		@RequestParam(value = "deptId", required = false) String deptId,
+		@RequestParam(value = "annual", required = false) String annual,
+		@RequestParam(value = "monthly", required = false) String monthly) {
+		List<EvaluationDept> list = evaluationDeptService.listAll(deptId, annual, monthly);
+		for (EvaluationDept evaluationDept : list) {
+			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
+			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
+				List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicator.getId());
+				evaluationDeptIndicator.setEvaluationDeptIndicatorItemList(evaluationDeptIndicatorItemList);
+			}
+			evaluationDept.setEvaluationDeptIndicatorList(evaluationDeptIndicatorList);
+		}
 		return R.ok().data(list);
 	}
 
-
 	/**
-	 * 添加
+	 * 新增考评部门配置信息
 	 *
-	 * @param dept
-	 * @return
+	 * @param dept 考评部门实体
+	 * @return 结果
 	 */
-
-	//@ImsPreAuth("eval:dataDictionary:edit")
+	//@ImsPreAuth("eval:evaluationDept:edit")
 	@PostMapping(value = "/save")
 	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
-	public R addAll(@RequestBody List<EvaluationDept> dept) {
-
+	public R addAll(@RequestBody EvaluationDept dept) {
 		try {
-			boolean b = evaluationDeptService.saveBatch(dept);
+			boolean b;
+			if (StringUtils.isEmpty(dept.getId())) {
+				String edId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+				dept.setId(edId);
+				//默认启用
+				dept.setEnable(true);
+				//新增部门配置信息
+				b = evaluationDeptService.save(dept);
+				for (EvaluationDeptIndicator evaluationDeptIndicator : dept.getEvaluationDeptIndicatorList()) {
+					if (evaluationDeptIndicator.getEvaluationDeptIndicatorItemList().size() > 0) {
+						String ediId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+						evaluationDeptIndicator.setId(ediId);
+						evaluationDeptIndicator.setEvaluationDeptId(edId);
+						//新增部门指标信息
+						b = evaluationDeptIndicatorService.save(evaluationDeptIndicator);
+						for (EvaluationDeptIndicatorItem evaluationDeptIndicatorItem : evaluationDeptIndicator.getEvaluationDeptIndicatorItemList()) {
+							String ediiId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+							evaluationDeptIndicatorItem.setId(ediiId);
+							evaluationDeptIndicatorItem.setEvaluationDeptId(edId);
+							evaluationDeptIndicatorItem.setEvaluationDeptIndicatorId(ediId);
+							evaluationDeptIndicatorItem.setIndicatorName(evaluationDeptIndicator.getIndicatorName());
+							evaluationDeptIndicatorItem.setIndicatorCode(evaluationDeptIndicator.getIndicatorCode());
+							//新增部门指标项信息
+							b = evaluationDeptIndicatorItemService.save(evaluationDeptIndicatorItem);
+						}
+					}
+				}
+			} else {
+				//默认启用
+				dept.setEnable(true);
+				b = evaluationDeptService.updateById(dept);
+				Iterator<EvaluationDeptIndicator> iterator = dept.getEvaluationDeptIndicatorList().iterator();
+				while (iterator.hasNext()) {
+					EvaluationDeptIndicator evaluationDeptIndicator = iterator.next();
+					//是否有指标项
+					if (evaluationDeptIndicator.getEvaluationDeptIndicatorItemList().size() > 0) {
+						//是否有主键
+						if (StringUtils.isEmpty(evaluationDeptIndicator.getId())) {
+							String ediId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+							evaluationDeptIndicator.setId(ediId);
+							evaluationDeptIndicator.setEvaluationDeptId(dept.getId());
+							//新增部门指标信息
+							b = evaluationDeptIndicatorService.save(evaluationDeptIndicator);
+							for (EvaluationDeptIndicatorItem evaluationDeptIndicatorItem : evaluationDeptIndicator.getEvaluationDeptIndicatorItemList()) {
+								String ediiId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+								evaluationDeptIndicatorItem.setId(ediiId);
+								evaluationDeptIndicatorItem.setEvaluationDeptId(dept.getId());
+								evaluationDeptIndicatorItem.setEvaluationDeptIndicatorId(ediId);
+								evaluationDeptIndicatorItem.setIndicatorName(evaluationDeptIndicator.getIndicatorName());
+								evaluationDeptIndicatorItem.setIndicatorCode(evaluationDeptIndicator.getIndicatorCode());
+								//新增部门指标项信息
+								b = evaluationDeptIndicatorItemService.save(evaluationDeptIndicatorItem);
+							}
+						} else {
+							b = evaluationDeptIndicatorService.updateById(evaluationDeptIndicator);
+							for (EvaluationDeptIndicatorItem evaluationDeptIndicatorItem : evaluationDeptIndicator.getEvaluationDeptIndicatorItemList()) {
+								if (StringUtils.isEmpty(evaluationDeptIndicatorItem.getId())) {
+									String ediiId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+									evaluationDeptIndicatorItem.setId(ediiId);
+									evaluationDeptIndicatorItem.setEvaluationDeptId(dept.getId());
+									evaluationDeptIndicatorItem.setEvaluationDeptIndicatorId(evaluationDeptIndicator.getId());
+									evaluationDeptIndicatorItem.setIndicatorName(evaluationDeptIndicator.getIndicatorName());
+									evaluationDeptIndicatorItem.setIndicatorCode(evaluationDeptIndicator.getIndicatorCode());
+									//新增部门指标信息
+									b = evaluationDeptIndicatorItemService.save(evaluationDeptIndicatorItem);
+								} else {
+									b = evaluationDeptIndicatorItemService.updateById(evaluationDeptIndicatorItem);
+								}
+							}
+						}
+					} else {
+						boolean flag = evaluationDeptIndicatorService.removeById(evaluationDeptIndicator.getId());
+						if (flag) {
+							iterator.remove();
+						}
+					}
+				}
+			}
 			if (b) {
 				return R.ok().data(b);
 			} else {
 				return R.error().data("保存失败！");
 			}
-		} catch (CustomException e){
+		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
 		}
 	}
 
+	/**
+	 * 批量删除考评部门配置信息
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:evaluationDept:remove")
+	@PostMapping(value = "/removeAll/{ids}")
+	@ApiOperation(value = "批量删除", notes = "批量删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b;
+		b = evaluationDeptService.removeByIds(Arrays.asList(strings));
+		for (String id : strings) {
+			QueryWrapper<EvaluationDeptIndicator> qw1 = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(id)) {
+				qw1.lambda().eq(EvaluationDeptIndicator::getEvaluationDeptId, id);
+			}
+			b = evaluationDeptIndicatorService.remove(qw1);
+			QueryWrapper<EvaluationDeptIndicatorItem> qw2 = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(id)) {
+				qw2.lambda().eq(EvaluationDeptIndicatorItem::getEvaluationDeptId, id);
+			}
+			b = evaluationDeptIndicatorItemService.remove(qw2);
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+	/**
+	 * 删除考评部门指标项信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:evaluationDept:remove")
+	@PostMapping(value = "/remove/{id}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R delete(@PathVariable("id") String id) {
+		boolean b = evaluationDeptIndicatorItemService.removeById(id);
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
 }

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.EvaluationDeptIndicatorItem;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 17:22
+ * 文件说明：
+ */
+public interface EvaluationDeptIndicatorItemMapper extends BaseMapper<EvaluationDeptIndicatorItem> {
+
+	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId);
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.EvaluationDeptIndicator;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 10:40
+ * 文件说明：
+ */
+public interface EvaluationDeptIndicatorMapper extends BaseMapper<EvaluationDeptIndicator> {
+
+	List<EvaluationDeptIndicator> selectEvaluationDeptIndicatorListByEvaluationDeptId(String evaluationDeptId);
+}

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

@@ -1,7 +1,12 @@
 package com.ims.eval.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.EvaluationDept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EvaluationDeptMapper extends BaseMapper<EvaluationDept> {
 
+	List<EvaluationDept> selectListAll(@Param("deptName") String deptName, @Param("annual") String annual, @Param("monthly") String monthly);
+
+    IPage<EvaluationDept> selectListPage(Page<EvaluationDept> page, @Param("deptName") String deptName, @Param("annual") String annual, @Param("monthly") String monthly);
 }

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

@@ -1,7 +1,10 @@
 package com.ims.eval.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -54,10 +57,30 @@ public class EvaluationDept extends Model {
      */
     private String shortDeptName;
 
+	/**
+	 * 考评类别
+	 */
+	private String evaluationCategory;
+
     /**
-     * 是否考核
+     * 年度
      */
-    private Boolean enable;
+    private String annual;
+
+	/**
+	 * 月度
+	 */
+	private String monthly;
+
+	/**
+	 * 是否启用
+	 */
+	private boolean enable;
+
+	/**
+	 * 描述
+	 */
+	private String des;
 
     /**
      * 创建时间
@@ -79,5 +102,9 @@ public class EvaluationDept extends Model {
      */
     private String updateBy;
 
-
+	/**
+	 * 指标组
+	 */
+	@TableField(exist = false)
+	private List<EvaluationDeptIndicator> evaluationDeptIndicatorList;
 }

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

@@ -0,0 +1,36 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hlf
+ * @date 2023/4/26 17:32
+ * 文件说明：考评部门业务指标
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptBusinessPlan extends Model {
+
+	private String id;
+	private String responsibility_code;
+	private String dept_id;
+	private String dept_name;
+	private String appraisal_year;
+	private String evaluation_category;
+	private String stage;
+	private String des;
+	private String review_people;
+	private String review_people_time;
+	private String review_opinion;
+	private String final_review_people;
+	private String final_review_people_time;
+	private String final_review_opinion;
+	private String create_time;
+	private String create_by;
+	private String update_time;
+	private String update_by;
+	private String remark;
+
+}

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

@@ -0,0 +1,46 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 9:34
+ * 文件说明：考评部门指标
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptIndicator extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 考评部门主键
+	 */
+	private String evaluationDeptId;
+
+	/**
+	 * 指标名称
+	 */
+	private String indicatorName;
+
+	/**
+	 * 指标编码
+	 */
+	private String indicatorCode;
+
+	/**
+	 * 指标项组
+	 */
+	@TableField(exist = false)
+	private List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList;
+}

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

@@ -0,0 +1,62 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 17:18
+ * 文件说明：考评部门指标项
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptIndicatorItem extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 考评部门主键
+	 */
+	private String evaluationDeptId;
+
+	/**
+	 * 考评部门指标主键
+	 */
+	private String evaluationDeptIndicatorId;
+
+	/**
+	 * 指标名称
+	 */
+	private String indicatorName;
+
+	/**
+	 * 指标编码
+	 */
+	private String indicatorCode;
+
+	/**
+	 * 指标项名称
+	 */
+	private String indicatorItemName;
+
+	/**
+	 * 指标项编码
+	 */
+	private String indicatorItemCode;
+
+	/**
+	 * 指标类别
+	 */
+	private String indicatorCategory;
+
+	/**
+	 * 描述
+	 */
+	private String des;
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationDeptIndicatorItem;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 17:20
+ * 文件说明：
+ */
+public interface IEvaluationDeptIndicatorItemService extends IService<EvaluationDeptIndicatorItem> {
+
+	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId);
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationDeptIndicator;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 10:38
+ * 文件说明：
+ */
+public interface IEvaluationDeptIndicatorService extends IService<EvaluationDeptIndicator> {
+
+	List<EvaluationDeptIndicator> selectEvaluationDeptIndicatorListByEvaluationDeptId(String evaluationDeptId);
+}

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

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluationDept;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,7 +16,8 @@ import java.util.List;
  */
 public interface IEvaluationDeptService extends IService<EvaluationDept> {
 
-	List<EvaluationDept> listAll(String  id, boolean enable);
+	List<EvaluationDept> listAll(String deptId, String annual, String monthly);
 
+	IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual, String monthly);
 
 }

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

@@ -0,0 +1,23 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.EvaluationDeptIndicatorItemMapper;
+import com.ims.eval.entity.EvaluationDeptIndicatorItem;
+import com.ims.eval.service.IEvaluationDeptIndicatorItemService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 17:21
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptIndicatorItemServiceImpl extends ServiceImpl<EvaluationDeptIndicatorItemMapper, EvaluationDeptIndicatorItem> implements IEvaluationDeptIndicatorItemService {
+
+	@Override
+	public List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId) {
+		return baseMapper.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicatorId);
+	}
+}

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

@@ -0,0 +1,23 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.EvaluationDeptIndicatorMapper;
+import com.ims.eval.entity.EvaluationDeptIndicator;
+import com.ims.eval.service.IEvaluationDeptIndicatorService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/25 10:39
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptIndicatorServiceImpl extends ServiceImpl<EvaluationDeptIndicatorMapper, EvaluationDeptIndicator> implements IEvaluationDeptIndicatorService {
+
+	@Override
+	public List<EvaluationDeptIndicator> selectEvaluationDeptIndicatorListByEvaluationDeptId(String evaluationDeptId) {
+		return baseMapper.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDeptId);
+	}
+}

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

@@ -1,7 +1,10 @@
 package com.ims.eval.service.impl;
 
 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.ims.common.utils.StringUtils;
+import com.ims.eval.entity.EvaluateRule;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.dao.EvaluationDeptMapper;
 import com.ims.eval.service.IEvaluationDeptService;
@@ -23,7 +26,6 @@ import java.util.List;
 @Service
 public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper, EvaluationDept> implements IEvaluationDeptService {
 
-
 	@Transactional
 	@Override
 	public boolean saveOrUpdate(EvaluationDept entity) {
@@ -34,29 +36,25 @@ public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper,
 		return b;
 	}
 
-
 	@Override
-	public List<EvaluationDept> listAll(String id, boolean enable) {
+	public List<EvaluationDept> listAll(String deptId, String annual, String monthly) {
+		return baseMapper.selectListAll(deptId, annual, monthly);
+	}
 
-		QueryWrapper<EvaluationDept> qw = new QueryWrapper();
-		if (StringUtils.isNotEmpty(id)) {
-			qw.lambda().eq(EvaluationDept::getId, id);
+	@Override
+	public IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual, String monthly) {
+		if (null == pageNum || null == pageSize) {
+			throw new RuntimeException("分页参数为空");
 		}
-
-		qw.lambda().like(EvaluationDept::getEnable, enable);
-
-
-		List<EvaluationDept> list = baseMapper.selectList(qw);
-
-		return list;
+		//构造分页构造器
+		Page<EvaluationDept> page = new Page<>(pageNum, pageSize);
+		return baseMapper.selectListPage(page, deptName, annual, monthly);
 	}
 
-
-
 	@Transactional
 	@Override
 	public boolean saveBatch(Collection<EvaluationDept> entityList) {
-		boolean b  = super.saveBatch(entityList);
+		boolean b = super.saveBatch(entityList);
 		return b;
 	}
 }

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluationDeptIndicatorItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptIndicatorItem">
+        <id column="id" property="id"/>
+        <result column="evaluation_dept_id" property="evaluationDeptId"/>
+        <result column="evaluation_dept_indicator_id" property="evaluationDeptIndicatorId"/>
+        <result column="indicator_name" property="indicatorName"/>
+        <result column="indicator_code" property="indicatorCode"/>
+        <result column="indicator_item_name" property="indicatorItemName"/>
+        <result column="indicator_item_code" property="indicatorItemCode"/>
+        <result column="indicator_category" property="indicatorCategory"/>
+        <result column="des" property="des"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="selectEvaluationDeptIndicatorItemVo">
+        select id,
+               evaluation_dept_id,
+               evaluation_dept_indicator_id,
+               indicator_name,
+               indicator_code,
+               indicator_item_name,
+               indicator_item_code,
+               indicator_category,
+               des
+        from evaluation_dept_indicator_item
+    </sql>
+
+    <select id="selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId" resultType="com.ims.eval.entity.EvaluationDeptIndicatorItem">
+        <include refid="selectEvaluationDeptIndicatorItemVo"/>
+        where evaluation_dept_indicator_id = #{evaluationDeptIndicatorId}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluationDeptIndicatorMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptIndicator">
+        <id column="id" property="id"/>
+        <result column="evaluation_dept_id" property="evaluationDeptId"/>
+        <result column="indicator_name" property="indicatorName"/>
+        <result column="indicator_code" property="indicatorCode"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="selectEvaluationDeptIndicatorVo">
+        select id,
+               evaluation_dept_id,
+               indicator_name,
+               indicator_code
+        from evaluation_dept_indicator
+    </sql>
+
+    <select id="selectEvaluationDeptIndicatorListByEvaluationDeptId" resultType="com.ims.eval.entity.EvaluationDeptIndicator">
+        <include refid="selectEvaluationDeptIndicatorVo"/>
+        where evaluation_dept_id = #{evaluationDeptId}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluationDeptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDept">
+        <id column="id" property="id"/>
+        <result column="company_id" property="companyId"/>
+        <result column="company_name" property="companyName"/>
+        <result column="short_company_name" property="shortCompanyName"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="short_dept_name" property="shortDeptName"/>
+        <result column="evaluation_category" property="evaluationCategory"/>
+        <result column="annual" property="annual"/>
+        <result column="monthly" property="monthly"/>
+        <result column="enable" property="enable"/>
+        <result column="des" property="des"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_by" property="updateBy"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="selectEvaluationDeptVo">
+        select id,
+               company_id,
+               company_name,
+               short_company_name,
+               dept_id,
+               dept_name,
+               short_dept_name,
+               evaluation_category,
+               annual,
+               monthly,
+               enable,
+               des,
+               create_time,
+               create_by,
+               update_time,
+               update_by
+        from evaluation_dept
+    </sql>
+
+    <select id="selectListAll" resultType="com.ims.eval.entity.EvaluationDept">
+        <include refid="selectEvaluationDeptVo"/>
+        <where>
+            enable = true
+            <if test="deptName != null and deptName != ''">
+                AND dept_name like CONCAT('%',#{deptName},'%')
+            </if>
+            <if test="annual != null and annual != ''">
+                AND annual = #{annual}
+            </if>
+            <if test="monthly != null and monthly != ''">
+                AND monthly = #{monthly}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDept">
+        <include refid="selectEvaluationDeptVo"/>
+        <where>
+            enable = true
+            <if test="deptName != null and deptName != ''">
+                AND dept_name like CONCAT('%',#{deptName},'%')
+            </if>
+            <if test="annual != null and annual != ''">
+                AND annual = #{annual}
+            </if>
+            <if test="monthly != null and monthly != ''">
+                AND monthly = #{monthly}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+</mapper>

pom.xml

@@ -217,7 +217,7 @@
         <repository>
             <id>localrepo</id>
             <name>Local Repository</name>
-            <url>file://D:\java\maven\repository-gddl</url>
+            <url>file://E:\资料\信控开发平台\maven</url>
         </repository>
         <repository>
             <id>aliyun-repos</id>