年度月度考评功能

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

@@ -34,17 +34,19 @@ public class DeptResponsibilityController {
 	/**
 	 * 分页查询
 	 *
-	 * @param pageNum    当前页数
-	 * @param pageSize   当前页大小
-	 * @param id         主键
-	 * @param cycleUnit  周期单位
-	 * @param checkCycle 周期
-	 * @param beginDate  考核开始时间
-	 * @param endDate    考核截止时间
-	 * @param stage      审批状态
-	 * @param createBy   创建者
-	 * @param year       年
-	 * @param month      月
+	 * @param pageNum            当前页数
+	 * @param pageSize           当前页大小
+	 * @param id                 主键
+	 * @param responsibilityCode 业务编码
+	 * @param cycleUnit          周期单位
+	 * @param checkCycle         周期
+	 * @param beginDate          考核开始时间
+	 * @param endDate            考核截止时间
+	 * @param stage              审批状态
+	 * @param createBy           创建者
+	 * @param year               年
+	 * @param month              月
+	 * @param des                描述
 	 * @return
 	 */
 	//@ImsPreAuth("eval:deptResponsibility:view")
@@ -52,15 +54,17 @@ public class DeptResponsibilityController {
 	public R list(@RequestParam(value = "pageNum") Integer pageNum,
 				  @RequestParam(value = "pageSize") Integer pageSize,
 				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
 				  @RequestParam(value = "cycleUnit", required = false) String cycleUnit,
-				  @RequestParam(value = "checkCycle", required = false) String checkCycle,
+				  @RequestParam(value = "checkCycle", required = false) List<String> checkCycle,
 				  @RequestParam(value = "beginDate", required = false) String beginDate,
 				  @RequestParam(value = "endDate", required = false) String endDate,
 				  @RequestParam(value = "stage", required = false) String stage,
 				  @RequestParam(value = "createBy", required = false) String createBy,
 				  @RequestParam(value = "year", required = false) String year,
-				  @RequestParam(value = "month", required = false) String month) {
-		IPage<DeptResponsibility> list = deptResponsibilityService.list(pageNum, pageSize, id, cycleUnit, checkCycle, beginDate, endDate, stage, createBy, year, month);
+				  @RequestParam(value = "month", required = false) String month,
+				  @RequestParam(value = "des", required = false) String des) {
+		IPage<DeptResponsibility> list = deptResponsibilityService.list(pageNum, pageSize, id, responsibilityCode, cycleUnit, checkCycle, beginDate, endDate, stage, createBy, year, month, des);
 		return R.ok().data(list);
 	}
 

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

@@ -0,0 +1,175 @@
+package com.ims.eval.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.OrganizationEvaluation;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 单位/部门考评记录 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@RestController
+@RequestMapping("//organization-evaluation")
+public class OrganizationEvaluationController {
+
+
+	@Autowired
+	private IOrganizationEvaluationService organizationEvaluationService;
+
+
+	/**
+	 * 分页查询
+	 *
+	 * @param pageNum            当前页数
+	 * @param pageSize           当前页大小
+	 * @param id                 主键
+	 * @param organizationEvaluationCode 业务编码
+	 * @param checkCycle         周期
+	 * @param beginDate          考核开始时间
+	 * @param endDate            考核截止时间
+	 * @param stage              审批状态
+	 * @param createBy           创建者
+	 * @param year               年
+	 * @param month              月
+	 * @param des                描述
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "organizationEvaluationCode", required = false) String organizationEvaluationCode,
+				  @RequestParam(value = "checkCycle", required = false) List<String> checkCycle,
+				  @RequestParam(value = "beginDate", required = false) String beginDate,
+				  @RequestParam(value = "endDate", required = false) String endDate,
+				  @RequestParam(value = "stage", required = false) String stage,
+				  @RequestParam(value = "createBy", required = false) String createBy,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "month", required = false) String month,
+				  @RequestParam(value = "des", required = false) String des) {
+		IPage<OrganizationEvaluation> list = organizationEvaluationService.list(pageNum, pageSize, id, organizationEvaluationCode,  checkCycle, beginDate, endDate, stage, createBy, year, month, des);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 *
+	 * @param organizationEvaluation
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:organizationEvaluation:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R add(@RequestBody OrganizationEvaluation organizationEvaluation) {
+
+		try {
+			boolean b = organizationEvaluationService.saveOrUpdate(organizationEvaluation);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+	/**
+	 * 生成单位考评年度明细记录
+	 *
+	 * @param evaluationIds 考评ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:edit")
+	@PostMapping(value = "/generateUnitEvaluation")
+	@ApiOperation(value = "生成单位考评明细", notes = "生成单位考评明细")
+	public R generateUnitYearEvaluation(@RequestParam(value = "evaluationIds", required = true) String evaluationIds) {
+
+		try {
+			List<String> orgEvalRuleIdList = Arrays.asList(evaluationIds.split(","));
+			boolean b = false;
+
+			b = organizationEvaluationService.generateUnitEvaluationInfo(orgEvalRuleIdList);
+			if (!b) {
+				return R.error().data("保存失败！");
+			}
+
+			return R.ok().data(b);
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+
+	/**
+	 * 生成单位考评月度明细记录
+	 *
+	 * @param evaluationIds 考评ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:edit")
+	@PostMapping(value = "/generateUnitMonthEvaluation")
+	@ApiOperation(value = "生成部门考评明细", notes = "生成部门考评明细")
+	public R generateUnitMonthEvaluation(@RequestParam(value = "evaluationIds", required = true) String evaluationIds) {
+
+		try {
+			List<String> orgEvalRuleIdList = Arrays.asList(evaluationIds.split(","));
+			boolean b = false;
+			for (String id : orgEvalRuleIdList) {
+				b = organizationEvaluationService.generateUnitMonthEvaluation(orgEvalRuleIdList);
+				if (!b) {
+					return R.error().data("保存失败！");
+				}
+			}
+			return R.ok().data(b);
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+	/**
+	 * 生成部门考评季度明细记录
+	 *
+	 * @param evaluationIds 考评ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:edit")
+	@PostMapping(value = "/generateUnitSeasonEvaluation")
+	@ApiOperation(value = "生成部门考评明细", notes = "生成部门考评明细")
+	public R generateUnitSeasonEvaluation(@RequestParam(value = "evaluationIds", required = true) String evaluationIds) {
+
+		try {
+			List<String> orgEvalRuleIdList = Arrays.asList(evaluationIds.split(","));
+			boolean b = false;
+			for (String id : orgEvalRuleIdList) {
+				b = organizationEvaluationService.generateUnitSeasonEvaluation(orgEvalRuleIdList);
+				if (!b) {
+					return R.error().data("保存失败！");
+				}
+			}
+			return R.ok().data(b);
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 考评指标明细
+
+ 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@RestController
+@RequestMapping("//organization-evaluation-info")
+public class OrganizationEvaluationInfoController {
+
+}

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

@@ -0,0 +1,18 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.OrganizationEvaluationInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评指标明细
+
+ Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+public interface OrganizationEvaluationInfoMapper extends BaseMapper<OrganizationEvaluationInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.OrganizationEvaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 单位/部门考评记录 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+public interface OrganizationEvaluationMapper extends BaseMapper<OrganizationEvaluation> {
+
+}

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

@@ -0,0 +1,146 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 单位/部门考评记录
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrganizationEvaluation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 考评记录编码
+     */
+    private String organizationEvaluationCode;
+
+    /**
+     * 考评组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 考评组织ID
+     */
+    private String organizationId;
+
+    /**
+     * 考评类别(单位、部门)
+     */
+    private String organizationType;
+
+    /**
+     * 周期
+     */
+    private String checkCycle;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 考评单位配置id
+     */
+    private String organizationEvaluationRuleId;
+
+    /**
+     * 考核开始时间
+     */
+    private LocalDate beginDate;
+
+    /**
+     * 考核截止时间
+     */
+    private LocalDate endDate;
+
+    /**
+     * 审批状态
+     */
+    private String stage;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 复审人
+     */
+    private String reviewPeople;
+
+    /**
+     * 复审时间
+     */
+    private Date reviewPeopleTime;
+
+    /**
+     * 复审意见
+     */
+    private String reviewOpinion;
+
+    /**
+     * 终审人
+     */
+    private String finalReviewPeople;
+
+    /**
+     * 终审时间
+     */
+    private Date finalReviewPeopleTime;
+
+    /**
+     * 终审意见
+     */
+    private String finalReviewOpinion;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,93 @@
+package com.ims.eval.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评指标明细
+
+
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrganizationEvaluationInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 责任书id
+     */
+    private String organizationEvaluationId;
+
+    /**
+     * 指标ID
+     */
+    private String indicatorId;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorDictionaryId;
+
+    /**
+     * 选项编码
+     */
+    private String optionCode;
+
+    /**
+     * 能否量化
+     */
+    private String isQuantified;
+
+    /**
+     * 量化值
+     */
+    private double quantifiedValue;
+
+    /**
+     * 非量化值
+     */
+    private String nonQuantifiedValue;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IDeptResponsibilityService extends IService<DeptResponsibility> {
 
-	IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String cycleUnit, String checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month);
+	IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode,String cycleUnit,  List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month,String des);
 
 	List<DeptResponsibility> list(String organizationId, String checkCycle, String year, String month);
 

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

@@ -28,6 +28,8 @@ public interface IIndicatorService extends IService<Indicator> {
 
 	Indicator selectByCode(String indicatorCode);
 
+	List<Indicator> selectByIds(List<String> ids);
+
 	List<IndicatorResDTO> listByIds(List<String> indicatorIds);
 
 }

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

@@ -0,0 +1,18 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.OrganizationEvaluationInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 考评指标明细
+
+ 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+public interface IOrganizationEvaluationInfoService extends IService<OrganizationEvaluationInfo> {
+
+}

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

@@ -0,0 +1,37 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.OrganizationEvaluation;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 单位/部门考评记录 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+public interface IOrganizationEvaluationService extends IService<OrganizationEvaluation> {
+
+	IPage<OrganizationEvaluation> list(Integer pageNum, Integer pageSize, String id, String organizationEvaluationCode, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des);
+
+
+	@Transactional
+	boolean generateUnitEvaluationInfo(List<String> ids);
+
+
+	@Transactional
+	boolean generateUnitMonthEvaluation(List<String> ids);
+
+	@Transactional
+	boolean generateUnitSeasonEvaluation(List<String> ids);
+
+
+	List<OrganizationEvaluation> list(String organizationId, String checkCycle, String year, String month);
+
+
+}

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

@@ -30,4 +30,7 @@ public interface IResponsibilityIndicatorInfoService extends IService<Responsibi
 
 	boolean saveBatchDto(List<ResponsibilityIndicatorInfoUpdateDTO> infoUpdateDTOs);
 
+	Map<String ,Object> getResponsibilityIdMap(String deptResponsibilityId);
+
+
 }

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

@@ -74,7 +74,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 	private IResponsibilityIndicatorInfoService responsibilityIndicatorInfoService;
 
 	@Override
-	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String cycleUnit, String checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month) {
+	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String responsibilityCode,String cycleUnit,  List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month,String des) {
 
 		QueryWrapper<DeptResponsibility> qw = new QueryWrapper<>();
 		if (null == pageNum || null == pageSize) {
@@ -87,12 +87,16 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			qw.lambda().eq(DeptResponsibility::getId, id);
 		}
 
+		if (StringUtils.isNotEmpty(responsibilityCode)) {
+			qw.lambda().like(DeptResponsibility::getResponsibilityCode, responsibilityCode);
+		}
+
 		if (StringUtils.isNotEmpty(cycleUnit)) {
-			qw.lambda().like(DeptResponsibility::getCycleUnit, cycleUnit);
+			qw.lambda().eq(DeptResponsibility::getCycleUnit, cycleUnit);
 		}
 
 		if (StringUtils.isNotEmpty(checkCycle)) {
-			qw.lambda().like(DeptResponsibility::getCheckCycle, checkCycle);
+			qw.lambda().in(DeptResponsibility::getCheckCycle, checkCycle);
 		}
 
 		if (StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate)) {
@@ -118,6 +122,10 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			qw.lambda().eq(DeptResponsibility::getMonth, month);
 		}
 
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().like(DeptResponsibility::getDes, des);
+		}
+
 		qw.lambda().orderByDesc(DeptResponsibility::getCreateTime);
 
 		IPage<DeptResponsibility> list = baseMapper.selectPage(page, qw);
@@ -167,10 +175,32 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			if (null == ruleInfos || ruleInfos.size() <= 0) {
 				throw new CustomException("规则明细配置为空");
 			}
+
+
 			//获取考评规则中的指标id
 			List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
+
+			//获取指标对象
+			List<Indicator>  indicators = iIndicatorService.selectByIds(indicatorIds);
+
+			/***   目标目标责任书默认生成目标值 ZRMB     ***/
+			indicators.stream().forEach(i -> {
+				ResponsibilityIndicatorInfo info = new ResponsibilityIndicatorInfo();
+				info.setDeptResponsibilityId(oriResponsibility.getId());
+				info.setIndicatorId(i.getId());
+				info.setIndicatorDictionaryId(null);
+				info.setOptionCode("ZRMB");
+				info.setIsQuantified(i.getIsQuantified());
+				info.setCreateTime(new Date());
+				boolean b2 = responsibilityIndicatorInfoService.saveOrUpdate(info);
+				if (!b2) {
+					throw new CustomException("初始化目标责任书明细失败");
+				}
+			});
+
+
 			//通过指标id获取指标明细项
-			List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
+/*			List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
 			if (null == resDTOS || resDTOS.size() <= 0) {
 				throw new CustomException("指标规则明细项为空");
 			}
@@ -188,7 +218,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 				if (!b2) {
 					throw new CustomException("初始化目标责任书明细失败");
 				}
-			});
+			});*/
 		}
 
 		return true;
@@ -208,7 +238,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		List<String> evaluationRuleIds = list.stream().map(OrganizationEvaluationRule::getId).collect(Collectors.toList());
 
 		StringBuilder responsibilityCode = new StringBuilder();
-		responsibilityCode.append(entity.getOrganizationType()).append("_");
+		responsibilityCode.append("mbzr_");
 		responsibilityCode.append(entity.getCheckCycle()).append("_");
 
 		//判断该是否存在目标责任书

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

@@ -143,6 +143,14 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
+	public List<Indicator> selectByIds(List<String> ids) {
+		QueryWrapper<Indicator> qw = new QueryWrapper<>();
+		qw.lambda().in(Indicator::getId, ids);
+		List<Indicator> list = baseMapper.selectList(qw);
+		return list;
+	}
+
+	@Override
 	public List<IndicatorResDTO> listByIds(List<String> indicatorIds) {
 		List<IndicatorResDTO> list = baseMapper.selectListByIds(indicatorIds);
 		return list;

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

@@ -0,0 +1,22 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.OrganizationEvaluationInfo;
+import com.ims.eval.dao.OrganizationEvaluationInfoMapper;
+import com.ims.eval.service.IOrganizationEvaluationInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评指标明细
+
+ 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@Service
+public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<OrganizationEvaluationInfoMapper, OrganizationEvaluationInfo> implements IOrganizationEvaluationInfoService {
+
+}

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

@@ -0,0 +1,464 @@
+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.DateUtils;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
+import com.ims.eval.entity.*;
+import com.ims.eval.dao.OrganizationEvaluationMapper;
+import com.ims.eval.entity.dto.response.IndicatorResDTO;
+import com.ims.eval.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 单位/部门考评记录 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-16
+ */
+@Service
+public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationEvaluationMapper, OrganizationEvaluation> implements IOrganizationEvaluationService {
+
+
+	/**
+	 * 指标主业务类
+	 */
+	@Autowired
+	private IIndicatorService iIndicatorService;
+
+	/**
+	 * 指标子业务类
+	 */
+	@Autowired
+	private IIndicatorDictionaryService indicatorDictionaryService;
+
+
+	/**
+	 * 单位/部门考评配置业务类
+	 */
+	@Autowired
+	private IOrganizationEvaluationRuleService organizationEvaluationRuleService;
+
+	/**
+	 * 考评规则业务类
+	 */
+	@Autowired
+	private IEvaluateRuleService evaluateRuleService;
+
+	/**
+	 * 考评规则明细业务类
+	 */
+	@Autowired
+	private IEvaluateRuleInfoService evaluateRuleInfoService;
+
+
+	@Resource
+	private ResponsibilityIndicatorInfoMapper responsibilityIndicatorInfoMapper;
+
+	@Resource
+	private IOrganizationEvaluationInfoService organizationEvaluationInfoService;
+
+
+	@Resource
+	private IDeptResponsibilityService deptResponsibilityService;
+
+	@Resource
+	private IResponsibilityIndicatorInfoService responsibilityIndicatorInfoService;
+
+
+	@Override
+	public IPage<OrganizationEvaluation> list(Integer pageNum, Integer pageSize, String id, String organizationEvaluationCode, List<String> checkCycle, String beginDate, String endDate, String stage, String createBy, String year, String month, String des) {
+		QueryWrapper<OrganizationEvaluation> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<OrganizationEvaluation> page = new Page<>(pageNum, pageSize);
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(OrganizationEvaluation::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(organizationEvaluationCode)) {
+			qw.lambda().like(OrganizationEvaluation::getOrganizationEvaluationCode, organizationEvaluationCode);
+		}
+
+		if (StringUtils.isNotEmpty(checkCycle)) {
+			qw.lambda().in(OrganizationEvaluation::getCheckCycle, checkCycle);
+		}
+
+		if (StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate)) {
+			qw.lambda().ge(OrganizationEvaluation::getBeginDate, beginDate);
+			qw.lambda().le(OrganizationEvaluation::getEndDate, endDate);
+		}
+
+		if (StringUtils.isNotEmpty(stage)) {
+			qw.lambda().eq(OrganizationEvaluation::getStage, stage);
+		}
+
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(OrganizationEvaluation::getCreateBy, createBy);
+		}
+
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(OrganizationEvaluation::getCreateBy, createBy);
+		}
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(OrganizationEvaluation::getYear, year);
+		}
+		if (StringUtils.isNotEmpty(month)) {
+			qw.lambda().eq(OrganizationEvaluation::getMonth, month);
+		}
+
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().like(OrganizationEvaluation::getDes, des);
+		}
+
+		qw.lambda().orderByDesc(OrganizationEvaluation::getCreateTime);
+
+		IPage<OrganizationEvaluation> list = baseMapper.selectPage(page, qw);
+
+		return list;
+	}
+
+
+	@Override
+	public boolean saveOrUpdate(OrganizationEvaluation entity) {
+		//获取指定部门的规则
+		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listByIsCheck(entity.getOrganizationType(), entity.getCheckCycle(), true, false);
+		if (!"YDKP".equals(entity.getCheckCycle()) && (null == list || list.size() <= 0)) {
+			throw new CustomException("不存在单位权重配置");
+		}
+		//获取组织id;
+		List<String> organizationIds = list.stream().map(OrganizationEvaluationRule::getOrganizationId).collect(Collectors.toList());
+		List<String> organizationNames = list.stream().map(OrganizationEvaluationRule::getOrganizationName).collect(Collectors.toList());
+		List<String> evaluationRuleIds = list.stream().map(OrganizationEvaluationRule::getId).collect(Collectors.toList());
+
+		StringBuilder responsibilityCode = new StringBuilder();
+		responsibilityCode.append(entity.getOrganizationType()).append("_");
+		responsibilityCode.append(entity.getCheckCycle()).append("_");
+
+		//判断该是否存在目标责任书
+		List<OrganizationEvaluation> oriList = new ArrayList<>();
+		if ("NDKP".equals(entity.getCheckCycle())) {
+			oriList = list("", entity.getCheckCycle(), entity.getYear(), "");
+			responsibilityCode.append(entity.getYear()).append("_");
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(oriList.size()+1), 4, "l"));
+		}
+		if ("JDKP".equals(entity.getCheckCycle())) {
+			Date newDate = DateUtils.toDate(entity.getYear() + "-" + entity.getMonth() + "-01");
+			String season = String.valueOf(DateUtils.getSeason(newDate));//获取季度
+			String month = String.valueOf(Integer.valueOf(entity.getMonth()) * Integer.valueOf(season));//季度考评
+			oriList = list("", entity.getCheckCycle(), entity.getYear(), month);
+			List<OrganizationEvaluation> count = list("", entity.getCheckCycle(), entity.getYear(), "");
+			responsibilityCode.append(entity.getYear()).append("_").append(month).append("_");
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size()+1), 4, "l"));
+		}
+		if ("YDKP".equals(entity.getCheckCycle())) {
+			oriList = list("", entity.getCheckCycle(), entity.getYear(), entity.getMonth());
+			responsibilityCode.append(entity.getYear()).append("_").append(entity.getMonth()).append("_");
+			List<OrganizationEvaluation> count = list("", entity.getCheckCycle(), entity.getYear(), "");
+			responsibilityCode.append(StringUtils.addZeroForStr(String.valueOf(count.size()+1), 4, "l"));
+		}
+
+
+		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
+			if (null != oriList && oriList.size() > 0) {
+				throw new CustomException("此单位在该阶段已存在目标责任书");
+			}
+			//保存目标责任书
+			entity.setOrganizationEvaluationCode(responsibilityCode.toString().toLowerCase());
+
+			entity.setOrganizationId(String.join(",", organizationIds));//考评组织ID
+			entity.setOrganizationName(String.join(",", organizationNames));
+			entity.setOrganizationEvaluationRuleId(String.join(",", evaluationRuleIds));
+			entity.setStage("流程未启动");
+			entity.setCreateTime(new Date());
+		} else {
+			OrganizationEvaluation update = baseMapper.selectById(entity.getId());
+			if (null != oriList && oriList.size() > 1 && !update.getId().equals(oriList.get(0).getId())) {
+				throw new CustomException("编辑记录未找到");
+			}
+			if (!"流程未启动".equals(update.getStage())) {
+				throw new CustomException("流程已启动不允许修改");
+			}
+			entity.setOrganizationId(String.join(",", organizationIds));//考评组织ID
+			entity.setOrganizationName(String.join(",", organizationNames));
+			entity.setOrganizationEvaluationRuleId(String.join(",", evaluationRuleIds));
+			entity.setUpdateTime(new Date());
+		}
+		boolean b = super.saveOrUpdate(entity);
+		return b;
+	}
+
+	//	@Transactional
+	@Override
+	public boolean generateUnitEvaluationInfo(List<String> ids) {
+
+		for (String id :ids) {
+			OrganizationEvaluation organizationEvaluation = baseMapper.selectById(id);
+			if (null == organizationEvaluation) {
+				throw new CustomException("不存在考评记录");
+			}
+
+			//查询对应年度的目标责任书
+			List<DeptResponsibility> responsibilities = deptResponsibilityService.list("", organizationEvaluation.getCheckCycle(), organizationEvaluation.getYear(), "");
+			if (null == responsibilities || responsibilities.size() <= 0) {
+				throw new CustomException("该年度的目标责任书不存在");
+			}
+			DeptResponsibility deptResponsibility = responsibilities.get(0);
+
+			//检查是否已经启动考评
+			QueryWrapper<OrganizationEvaluationInfo> infoqw = new QueryWrapper<>();
+			infoqw.lambda().eq(OrganizationEvaluationInfo::getOrganizationEvaluationId, id);
+			int infcount = organizationEvaluationInfoService.count(infoqw);
+			if (infcount > 0) {
+				throw new CustomException("编号" + organizationEvaluation.getOrganizationEvaluationCode() + "的考评已启动;不允许重复操作");
+			}
+
+			organizationEvaluation.setStage("流程启动");
+			baseMapper.updateById(organizationEvaluation);
+
+			List<String> evaluationRuleIds = Arrays.asList(organizationEvaluation.getOrganizationEvaluationRuleId().split(","));
+
+			for (String ruleId : evaluationRuleIds) {
+
+				//获取指定部门的规则
+				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
+				if (null == evaluationRule) {
+					throw new CustomException("不存在此单位规则权重配置");
+				}
+				//获取对应的考评规（至少存在一条）
+				List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));
+				List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
+				if (null == evaluateRuleList || evaluateRuleList.size() <= 0) {
+					throw new CustomException("未获取到配置的规则");
+				}
+				//获取考评规则的id
+				List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
+				//通过规则id获取对应的规则明细
+				List<EvaluateRuleInfo> ruleInfos = evaluateRuleInfoService.list(ruleIds);
+				if (null == ruleInfos || ruleInfos.size() <= 0) {
+					throw new CustomException("规则明细配置为空");
+				}
+				//获取考评规则中的指标id
+				List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
+
+				//获取指标对象
+				List<Indicator> indicators = iIndicatorService.selectByIds(indicatorIds);
+				//通过指标id获取指标明细项
+				List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
+				if (null == resDTOS || resDTOS.size() <= 0) {
+					throw new CustomException("指标规则明细项为空");
+				}
+
+				//对应指标的目标值
+				Map<String, Object> objectMap = responsibilityIndicatorInfoService.getResponsibilityIdMap(deptResponsibility.getId());
+
+				resDTOS.stream().forEach(r -> {
+					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
+					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setIndicatorId(r.getId());
+					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
+					info.setOptionCode(r.getOptionCode());
+					info.setIsQuantified(r.getIsQuantified());
+					//
+					if ("JHZ".equals(r.getOptionCode()) || "MBZ".equals(r.getOptionCode()) || "DBZ".equals(r.getOptionCode())) {
+						if(null != objectMap.get(r.getId())){
+							if ("是".equals(r.getIsQuantified())) {
+								info.setQuantifiedValue(null == objectMap.get(r.getId()) ? null :Double.valueOf(objectMap.get(r.getId()).toString()));
+							} else {
+								info.setNonQuantifiedValue(null == objectMap.get(r.getId()) ?null :objectMap.get(r.getId()).toString());
+							}
+						}
+					}
+					info.setCreateTime(new Date());
+					boolean b2 = organizationEvaluationInfoService.saveOrUpdate(info);
+					if (!b2) {
+						throw new CustomException("初始化目标责任书明细失败");
+					}
+				});
+			}
+		}
+
+		return true;
+	}
+
+	@Transactional
+	@Override
+	public boolean generateUnitMonthEvaluation(List<String> ids) {
+
+		for (String id :ids) {
+			OrganizationEvaluation organizationEvaluation = baseMapper.selectById(id);
+			if (null == organizationEvaluation) {
+				throw new CustomException("不存在考评记录");
+			}
+
+			//检查是否已经启动考评
+			QueryWrapper<OrganizationEvaluationInfo> infoqw = new QueryWrapper<>();
+			infoqw.lambda().eq(OrganizationEvaluationInfo::getOrganizationEvaluationId, id);
+			int infcount = organizationEvaluationInfoService.count(infoqw);
+			if (infcount > 0) {
+				throw new CustomException("编号" + organizationEvaluation.getOrganizationEvaluationCode() + "的考评已启动;不允许重复操作");
+			}
+
+			organizationEvaluation.setStage("流程启动");
+			baseMapper.updateById(organizationEvaluation);
+
+			List<String> evaluationRuleIds = Arrays.asList(organizationEvaluation.getOrganizationEvaluationRuleId().split(","));
+
+			for (String ruleId : evaluationRuleIds) {
+
+				//获取指定部门的规则
+				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
+				if (null == evaluationRule) {
+					throw new CustomException("不存在此单位规则权重配置");
+				}
+				//获取对应的考评规（至少存在一条）
+				List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));
+				List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
+				if (null == evaluateRuleList || evaluateRuleList.size() <= 0) {
+					throw new CustomException("未获取到配置的规则");
+				}
+				//获取考评规则的id
+				List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
+				//通过规则id获取对应的规则明细
+				List<EvaluateRuleInfo> ruleInfos = evaluateRuleInfoService.list(ruleIds);
+				if (null == ruleInfos || ruleInfos.size() <= 0) {
+					throw new CustomException("规则明细配置为空");
+				}
+				//获取考评规则中的指标id
+				List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
+
+				//通过指标id获取指标明细项
+				List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
+				if (null == resDTOS || resDTOS.size() <= 0) {
+					throw new CustomException("指标规则明细项为空");
+				}
+
+				resDTOS.stream().forEach(r -> {
+					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
+					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setIndicatorId(r.getId());
+					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
+					info.setOptionCode(r.getOptionCode());
+					info.setIsQuantified(r.getIsQuantified());
+					info.setCreateTime(new Date());
+					boolean b2 = organizationEvaluationInfoService.saveOrUpdate(info);
+					if (!b2) {
+						throw new CustomException("初始化目标责任书明细失败");
+					}
+				});
+			}
+		}
+
+		return true;
+	}
+
+	@Transactional
+	@Override
+	public boolean generateUnitSeasonEvaluation(List<String> ids) {
+
+
+		for (String id :ids) {
+			OrganizationEvaluation organizationEvaluation = baseMapper.selectById(id);
+			if (null == organizationEvaluation) {
+				throw new CustomException("不存在考评记录");
+			}
+
+			//检查是否已经启动改考评
+			QueryWrapper<OrganizationEvaluationInfo> infoqw = new QueryWrapper<>();
+			infoqw.lambda().eq(OrganizationEvaluationInfo::getOrganizationEvaluationId, id);
+			int infcount = organizationEvaluationInfoService.count(infoqw);
+			if (infcount > 0) {
+				throw new CustomException("编号" + organizationEvaluation.getOrganizationEvaluationCode() + "的考评已启动;不允许重复操作");
+			}
+
+			organizationEvaluation.setStage("流程启动");
+			baseMapper.updateById(organizationEvaluation);
+
+			List<String> evaluationRuleIds = Arrays.asList(organizationEvaluation.getOrganizationEvaluationRuleId().split(","));
+
+			for (String ruleId : evaluationRuleIds) {
+
+				//获取指定部门的规则
+				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
+				if (null == evaluationRule) {
+					throw new CustomException("不存在此单位规则权重配置");
+				}
+				//获取对应的考评规（至少存在一条）
+				List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));
+				List<EvaluateRule> evaluateRuleList = evaluateRuleService.listAll(evaluateRuleIds);
+				if (null == evaluateRuleList || evaluateRuleList.size() <= 0) {
+					throw new CustomException("未获取到配置的规则");
+				}
+				//获取考评规则的id
+				List<String> ruleIds = evaluateRuleList.stream().map(EvaluateRule::getId).collect(Collectors.toList());
+				//通过规则id获取对应的规则明细
+				List<EvaluateRuleInfo> ruleInfos = evaluateRuleInfoService.list(ruleIds);
+				if (null == ruleInfos || ruleInfos.size() <= 0) {
+					throw new CustomException("规则明细配置为空");
+				}
+				//获取考评规则中的指标id
+				List<String> indicatorIds = ruleInfos.stream().map(EvaluateRuleInfo::getIndicatorId).collect(Collectors.toList());
+
+
+				//通过指标id获取指标明细项
+				List<IndicatorResDTO> resDTOS = iIndicatorService.listByIds(indicatorIds);
+				if (null == resDTOS || resDTOS.size() <= 0) {
+					throw new CustomException("指标规则明细项为空");
+				}
+
+				resDTOS.stream().forEach(r -> {
+					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
+					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setIndicatorId(r.getId());
+					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
+					info.setOptionCode(r.getOptionCode());
+					info.setIsQuantified(r.getIsQuantified());
+					info.setCreateTime(new Date());
+					boolean b2 = organizationEvaluationInfoService.saveOrUpdate(info);
+					if (!b2) {
+						throw new CustomException("初始化目标责任书明细失败");
+					}
+				});
+			}
+		}
+
+		return true;
+	}
+
+
+
+	@Override
+	public List<OrganizationEvaluation> list(String organizationId, String checkCycle, String year, String month) {
+		QueryWrapper<OrganizationEvaluation> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(organizationId)) {
+			qw.lambda().eq(OrganizationEvaluation::getOrganizationId, organizationId);
+		}
+
+		if (StringUtils.isNotEmpty(checkCycle)) {
+			qw.lambda().eq(OrganizationEvaluation::getCheckCycle, checkCycle);
+		}
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(OrganizationEvaluation::getYear, year);
+		}
+		if (StringUtils.isNotEmpty(month)) {
+			qw.lambda().in(OrganizationEvaluation::getMonth, month);
+		}
+		List<OrganizationEvaluation> list = baseMapper.selectList(qw);
+		return list;
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.ResponsibilityIndicatorInfo;
@@ -32,7 +33,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 
 	@Override
 	public Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept) {
-		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.listByresponsibilityId(deptResponsibilityIds,dept,"JHZ");
+		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.listByresponsibilityId(deptResponsibilityIds,dept,"ZRMB");//默认获取指定的怎目标
 
 		Map<String  ,List<ResponsibilityIndicatorInfoResDTO>> map  = list.stream().collect(Collectors.groupingBy(ResponsibilityIndicatorInfoResDTO::getIsQuantified));
 		map.put("quantifiedList", map.remove("是"));
@@ -82,5 +83,17 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 		return true;
 	}
 
+	@Override
+	public Map<String, Object> getResponsibilityIdMap(String deptResponsibilityId) {
+		Map<String, Object> map = new HashMap<>();
+		QueryWrapper<ResponsibilityIndicatorInfo> qw = new QueryWrapper<>();
+		qw.lambda().eq(ResponsibilityIndicatorInfo::getDeptResponsibilityId,deptResponsibilityId);
+		List<ResponsibilityIndicatorInfo> list = baseMapper.selectList(qw);
+		list.stream().forEach(i->{
+			map.put(i.getId(),i.getIsQuantified().equals("是")?i.getQuantifiedValue():i.getQuantifiedValue());
+		});
+		return map;
+	}
+
 
 }

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationInfoMapper.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.OrganizationEvaluationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.OrganizationEvaluationInfo">
+        <id column="id" property="id" />
+        <result column="organization_evaluation_id" property="organizationEvaluationId" />
+        <result column="indicator_id" property="indicatorId" />
+        <result column="indicator_dictionary_id" property="indicatorDictionaryId" />
+        <result column="option_code" property="optionCode" />
+        <result column="is_quantified" property="isQuantified" />
+        <result column="quantified_value" property="quantifiedValue" />
+        <result column="non_quantified_value" property="nonQuantifiedValue" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, organization_evaluation_id, indicator_id, indicator_dictionary_id, option_code, is_quantified, quantified_value, non_quantified_value, create_time, create_by, update_time, update_by, remark
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?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.OrganizationEvaluationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.OrganizationEvaluation">
+        <id column="id" property="id" />
+        <result column="organization_evaluation_code" property="organizationEvaluationCode" />
+        <result column="organization_name" property="organizationName" />
+        <result column="organization_id" property="organizationId" />
+        <result column="organization_type" property="organizationType" />
+        <result column="check_cycle" property="checkCycle" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="organization_evaluation_rule_id" property="organizationEvaluationRuleId" />
+        <result column="begin_date" property="beginDate" />
+        <result column="end_date" property="endDate" />
+        <result column="stage" property="stage" />
+        <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" />
+        <result column="review_people" property="reviewPeople" />
+        <result column="review_people_time" property="reviewPeopleTime" />
+        <result column="review_opinion" property="reviewOpinion" />
+        <result column="final_review_people" property="finalReviewPeople" />
+        <result column="final_review_people_time" property="finalReviewPeopleTime" />
+        <result column="final_review_opinion" property="finalReviewOpinion" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, organization_evaluation_code, organization_name, organization_id, organization_type, check_cycle, year, month, organization_evaluation_rule_id, begin_date, end_date, stage, des, create_time, create_by, update_time, update_by, review_people, review_people_time, review_opinion, final_review_people, final_review_people_time, final_review_opinion, remark
+    </sql>
+
+</mapper>