考评目标修订列表、修订

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

@@ -0,0 +1,96 @@
+package com.ims.eval.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.EvaluationRevision;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IEvaluationRevisionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 单位考评目标修订
+ *
+ * @author hlf
+ * @date 2023/5/23 9:54
+ * 文件说明：
+ */
+@Slf4j
+@RestController
+@RequestMapping("//evaluation-revision")
+public class EvaluationRevisionController {
+
+	@Autowired
+	private IEvaluationRevisionService evaluationRevisionService;
+
+	/**
+	 * 单位考评目标修订列表信息（分页）
+	 *
+	 * @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 结果
+	 */
+	@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 = "responsibilityCode", required = false) String responsibilityCode,
+				  @RequestParam(value = "cycleUnit", required = false) String cycleUnit,
+				  @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<EvaluationRevision> list = evaluationRevisionService.listPage(pageNum, pageSize, id, responsibilityCode, cycleUnit, checkCycle, beginDate, endDate, stage, createBy, year, month, des);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 单位考评目标修订信息
+	 *
+	 * @return 结果
+	 */
+	@GetMapping(value = "listAll")
+	public R listAll() {
+		List<EvaluationRevision> list = evaluationRevisionService.list();
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 考评修订
+	 *
+	 * @param id 考评目标主键
+	 * @return 结果
+	 */
+	@PostMapping(value = "/revise/{id}")
+	public R revise(@PathVariable String id) {
+		try {
+			boolean b = evaluationRevisionService.save(id);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+}

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

@@ -239,6 +239,10 @@ public class NoticeManagementController {
 					list.add(evaluationNotice);
 				}
 			}
+			DataDictionary dataDictionary = dataDictionaryService.getById(evaluationNotice.getReleaseDept());
+			if (null != dataDictionary) {
+				evaluationNotice.setReleaseDept(dataDictionary.getKeyName());
+			}
 		}
 		return R.ok().data(list);
 	}

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

@@ -0,0 +1,15 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.EvaluationRevision;
+
+/**
+ * @author hlf
+ * @date 2023/5/23 10:34
+ * 文件说明：
+ */
+public interface EvaluationRevisionMapper extends BaseMapper<EvaluationRevision> {
+
+
+
+}

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

@@ -0,0 +1,173 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author hlf
+ * @date 2023/5/23 10:31
+ * 文件说明：
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationRevision extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 考评目标主键
+	 */
+	private String deptResponsibilityId;
+
+	/**
+	 * 业务编码
+	 */
+	private String responsibilityCode;
+
+	/**
+	 * 部门ID
+	 */
+	private String organizationId;
+
+	/**
+	 * 部门name
+	 */
+	private String organizationName;
+
+
+	/**
+	 * 考评类别(单位、部门)
+	 */
+	private String organizationType;
+
+
+	/**
+	 * 周期单位
+	 */
+	private String cycleUnit;
+
+	/**
+	 * 周期
+	 */
+	private String checkCycle;
+
+	/**
+	 * 年
+	 */
+	private String year;
+	/**
+	 * 月
+	 */
+	private String month;
+
+	/**
+	 * 考评单位配置id
+	 */
+	private  String organizationEvaluationRuleId;
+
+	/**
+	 * 考核开始时间
+	 */
+	private Date beginDate;
+
+	/**
+	 * 考核截止时间
+	 */
+	private Date endDate;
+
+	/**
+	 * 审批状态
+	 */
+	private String stage;
+
+	/**
+	 * 描述
+	 */
+	private String des;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 创建者
+	 */
+	private String createBy;
+
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+
+	/**
+	 * 更新者
+	 */
+	private String updateBy;
+
+	/**
+	 * 创建者名称
+	 */
+	private String createName;
+
+	/**
+	 * 复审人
+	 */
+	private String reviewPeople;
+
+	/**
+	 * 复审时间
+	 */
+	private Date reviewPeopleTime;
+
+	/**
+	 * 复审意见
+	 */
+	private String reviewOpinion;
+
+	/**
+	 * 终审人
+	 */
+	private String finalReviewPeople;
+
+	/**
+	 * 终审时间
+	 */
+	private Date finalReviewPeopleTime;
+
+	/**
+	 * 终审意见
+	 */
+	private String finalReviewOpinion;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+	/**
+	 * 实例id
+	 */
+	private String instId;
+
+
+	/**
+	 * 创建人组织id
+	 */
+	private String  createOrgId;
+
+	/**
+	 * 创建人组织name
+	 */
+	private String createOrgName;
+
+}

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

@@ -0,0 +1,19 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationRevision;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/5/23 10:33
+ * 文件说明：
+ */
+public interface IEvaluationRevisionService extends IService<EvaluationRevision> {
+
+	IPage<EvaluationRevision> listPage(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);
+
+	boolean save(String id);
+}

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

@@ -0,0 +1,126 @@
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.dao.EvaluationRevisionMapper;
+import com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.entity.EvaluationRevision;
+import com.ims.eval.service.IDeptResponsibilityService;
+import com.ims.eval.service.IEvaluationRevisionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/5/23 10:34
+ * 文件说明：
+ */
+@Service
+public class EvaluationRevisionServiceImpl extends ServiceImpl<EvaluationRevisionMapper, EvaluationRevision> implements IEvaluationRevisionService {
+
+	@Autowired
+	private IDeptResponsibilityService deptResponsibilityService;
+
+	@Override
+	public IPage<EvaluationRevision> listPage(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<EvaluationRevision> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<EvaluationRevision> page = new Page<>(pageNum, pageSize);
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(EvaluationRevision::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(responsibilityCode)) {
+			qw.lambda().like(EvaluationRevision::getResponsibilityCode, responsibilityCode);
+		}
+
+		if (StringUtils.isNotEmpty(cycleUnit)) {
+			qw.lambda().eq(EvaluationRevision::getCycleUnit, cycleUnit);
+		}
+
+		if (StringUtils.isNotEmpty(checkCycle)) {
+			qw.lambda().in(EvaluationRevision::getCheckCycle, checkCycle);
+		}
+
+		if (StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate)) {
+			qw.lambda().ge(EvaluationRevision::getBeginDate, beginDate);
+			qw.lambda().le(EvaluationRevision::getEndDate, endDate);
+		}
+
+		if (StringUtils.isNotEmpty(stage)) {
+			qw.lambda().eq(EvaluationRevision::getStage, stage);
+		}
+
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(EvaluationRevision::getCreateBy, createBy);
+		}
+
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(EvaluationRevision::getCreateBy, createBy);
+		}
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(EvaluationRevision::getYear, year);
+		}
+		if (StringUtils.isNotEmpty(month)) {
+			qw.lambda().eq(EvaluationRevision::getMonth, month);
+		}
+
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().like(EvaluationRevision::getDes, des);
+		}
+
+		qw.lambda().orderByDesc(EvaluationRevision::getCreateTime);
+
+		IPage<EvaluationRevision> list = baseMapper.selectPage(page, qw);
+		return list;
+	}
+
+	@Override
+	public boolean save(String id) {
+		DeptResponsibility deptResponsibility = deptResponsibilityService.getById(id);
+		if (null != deptResponsibility) {
+			EvaluationRevision evaluationRevision = new EvaluationRevision();
+			evaluationRevision.setDeptResponsibilityId(deptResponsibility.getId());
+			String responsibilityCode = deptResponsibility.getResponsibilityCode();
+			int index = responsibilityCode.indexOf("_");
+			evaluationRevision.setResponsibilityCode("MBXD" + responsibilityCode.substring(index).toUpperCase());
+			evaluationRevision.setOrganizationId(deptResponsibility.getOrganizationId());
+			evaluationRevision.setOrganizationName(deptResponsibility.getOrganizationName());
+			evaluationRevision.setOrganizationType(deptResponsibility.getOrganizationType());
+			evaluationRevision.setCycleUnit(deptResponsibility.getCycleUnit());
+			evaluationRevision.setCheckCycle(deptResponsibility.getCheckCycle());
+			evaluationRevision.setYear(deptResponsibility.getYear());
+			evaluationRevision.setMonth(deptResponsibility.getMonth());
+			evaluationRevision.setOrganizationEvaluationRuleId(deptResponsibility.getOrganizationEvaluationRuleId());
+			evaluationRevision.setBeginDate(deptResponsibility.getBeginDate());
+			evaluationRevision.setEndDate(deptResponsibility.getEndDate());
+			evaluationRevision.setStage("流程未启动");
+			evaluationRevision.setDes(deptResponsibility.getDes());
+			evaluationRevision.setCreateTime(new Date());
+			evaluationRevision.setReviewPeople(deptResponsibility.getReviewPeople());
+			evaluationRevision.setReviewPeopleTime(deptResponsibility.getReviewPeopleTime());
+			evaluationRevision.setReviewOpinion(deptResponsibility.getReviewOpinion());
+			evaluationRevision.setFinalReviewPeople(deptResponsibility.getFinalReviewPeople());
+			evaluationRevision.setFinalReviewPeopleTime(deptResponsibility.getFinalReviewPeopleTime());
+			evaluationRevision.setFinalReviewOpinion(deptResponsibility.getFinalReviewOpinion());
+			evaluationRevision.setRemark(deptResponsibility.getRemark());
+			evaluationRevision.setCreateOrgId(deptResponsibility.getCreateOrgId());
+			evaluationRevision.setCreateOrgName(deptResponsibility.getCreateOrgName());
+			return super.save(evaluationRevision);
+		}
+		return false;
+	}
+
+}