本部部门业绩指标计划表设计，功能开发，二级页详情表设计，功能开发。

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

@@ -1,7 +1,22 @@
 package com.ims.eval.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+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.*;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.*;
+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.Iterator;
+import java.util.List;
 
 /**
  * 部门业绩指标计划
@@ -14,6 +29,178 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//evaluation-dept-plan")
 public class DepartmentalPerformanceIndicatorPlanController {
 
+	@Autowired
+	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
+
+	@Autowired
+	private IEvaluationDeptService evaluationDeptService;
+
+	@Autowired
+	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
+
+	@Autowired
+	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
+
+	@Autowired
+	private IEvaluationDeptPlanContentService evaluationDeptPlanContentService;
+
+	/**
+	 * 部门考评业务列表信息（分页）
+	 *
+	 * @param pageNum            当前记录起始索引
+	 * @param pageSize           每页显示记录数
+	 * @param responsibilityCode 业务编码
+	 * @param des                业务简述
+	 * @param appraisalYear      月度
+	 * @return 结果
+	 */
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
+	@GetMapping(value = "list")
+	public R list(
+		@RequestParam(value = "pageNum") Integer pageNum,
+		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
+		@RequestParam(value = "des", required = false) String des,
+		@RequestParam(value = "appraisalYear", required = false) String appraisalYear) {
+		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 部门考评业务信息
+	 *
+	 * @param responsibilityCode 业务编码
+	 * @param des                业务简述
+	 * @param appraisalYear      月度
+	 * @return 结果
+	 */
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
+		@RequestParam(value = "des", required = false) String des,
+		@RequestParam(value = "appraisalYear", required = false) String appraisalYear) {
+		List<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listAll(responsibilityCode, des, appraisalYear);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 新增部门考评业务信息
+	 *
+	 * @param deptBusinessPlan 部门考评业务实体
+	 * @return 结果
+	 */
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增", notes = "新增")
+	public R addAll(@RequestBody EvaluationDeptBusinessPlan deptBusinessPlan) {
+		try {
+			String businessPlanId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+			deptBusinessPlan.setId(businessPlanId);
+			deptBusinessPlan.setResponsibilityCode("bmkp_" + deptBusinessPlan.getAppraisalYear() + RandomUtil.randomString(6));
+			deptBusinessPlan.setBusinessClass("年度考评");
+			deptBusinessPlan.setDocumentStatus("有效");
+			deptBusinessPlan.setStage("流程未启动");
+			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(deptBusinessPlan.getAppraisalYear())) {
+				qw.lambda().eq(EvaluationDept::getAnnual, deptBusinessPlan.getAppraisalYear());
+			}
+			List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
+			StringBuilder deptIds = new StringBuilder();
+			StringBuilder deptNames = new StringBuilder();
+			for (int i = 0; i < evaluationDeptList.size(); i++) {
+				EvaluationDept evaluationDept = evaluationDeptList.get(i);
+				List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptId(evaluationDept.getDeptId());
+				for (EvaluationDeptIndicatorItem evaluationDeptIndicatorItem : evaluationDeptIndicatorItemList) {
+					EvaluationDeptIndicator evaluationDeptIndicator = evaluationDeptIndicatorService.getById(evaluationDeptIndicatorItem.getEvaluationDeptIndicatorId());
+					EvaluationDeptPlanContent evaluationDeptPlanContent = new EvaluationDeptPlanContent();
+					evaluationDeptPlanContent.setBusinessPlanId(businessPlanId);
+					evaluationDeptPlanContent.setDeptId(evaluationDept.getDeptId());
+					evaluationDeptPlanContent.setDeptName(evaluationDept.getDeptName());
+					evaluationDeptPlanContent.setIndicatorId(evaluationDeptIndicator.getId());
+					evaluationDeptPlanContent.setIndicatorName(evaluationDeptIndicator.getIndicatorName());
+					evaluationDeptPlanContent.setIndicatorItemId(evaluationDeptIndicatorItem.getId());
+					evaluationDeptPlanContent.setIndicatorItemName(evaluationDeptIndicatorItem.getIndicatorItemName());
+					evaluationDeptPlanContent.setAuditStatus("审批未开始");
+					evaluationDeptPlanContentService.save(evaluationDeptPlanContent);
+				}
+				if (i == evaluationDeptList.size() - 1) {
+					deptIds.append(evaluationDept.getDeptId());
+					deptNames.append(evaluationDept.getDeptName());
+				} else {
+					deptIds.append(evaluationDept.getDeptId()).append(",");
+					deptNames.append(evaluationDept.getDeptName()).append(",");
+				}
+			}
+			deptBusinessPlan.setDeptId(deptIds.toString());
+			deptBusinessPlan.setDeptName(deptNames.toString());
+			boolean b = evaluationDeptBusinessPlanService.save(deptBusinessPlan);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+	/**
+	 * 批量删除部门考评业务信息
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:remove")
+	@PostMapping(value = "/removeAll/{ids}")
+	@ApiOperation(value = "批量删除", notes = "批量删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = evaluationDeptBusinessPlanService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+	/**
+	 * 详情
+	 *
+	 * @param id 业务主键
+	 * @return 结果
+	 */
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
+	@GetMapping(value = "details")
+	public R details(@RequestParam(value = "id", required = false) String id) {
+		QueryWrapper<EvaluationDeptPlanContent> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(EvaluationDeptPlanContent::getBusinessPlanId, id);
+		}
+		List<EvaluationDeptPlanContent> list = evaluationDeptPlanContentService.list(qw);
+		return R.ok().data(list);
+	}
 
+	/**
+	 * 详情里指标内容修改
+	 *
+	 * @param evaluationDeptPlanContent
+	 * @return
+	 */
 
+	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:edit")
+	@PostMapping(value = "/update")
+	@ApiOperation(value = "修改", notes = "修改")
+	public R update(@RequestBody EvaluationDeptPlanContent evaluationDeptPlanContent) {
+		try {
+			boolean b = evaluationDeptPlanContentService.updateById(evaluationDeptPlanContent);
+			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/EvaluationDeptController.java

@@ -53,7 +53,6 @@ public class EvaluationDeptController {
 	 * @param pageSize 每页显示记录数
 	 * @param deptName 部门名称
 	 * @param annual   年度
-	 * @param monthly  月度
 	 * @return 结果
 	 */
 	//@ImsPreAuth("eval:evaluationDept:view")
@@ -62,9 +61,8 @@ public class EvaluationDeptController {
 		@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);
+		@RequestParam(value = "annual", required = false) String annual) {
+		IPage<EvaluationDept> list = evaluationDeptService.listPage(pageNum, pageSize, deptName, annual);
 		List<EvaluationDept> evaluationDeptList = list.getRecords();
 		for (EvaluationDept evaluationDept : evaluationDeptList) {
 			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
@@ -82,16 +80,14 @@ public class EvaluationDeptController {
 	 *
 	 * @param deptId  部门主键
 	 * @param annual  年度
-	 * @param monthly 月度
 	 * @return 结果
 	 */
 	//@ImsPreAuth("eval:evaluationDept:view")
 	@GetMapping(value = "listAll")
 	public R listAll(
 		@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);
+		@RequestParam(value = "annual", required = false) String annual) {
+		List<EvaluationDept> list = evaluationDeptService.listAll(deptId, annual);
 		for (EvaluationDept evaluationDept : list) {
 			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
 			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
@@ -104,7 +100,7 @@ public class EvaluationDeptController {
 	}
 
 	/**
-	 * 新增考评部门配置信息
+	 * 新增/修改考评部门配置信息
 	 *
 	 * @param dept 考评部门实体
 	 * @return 结果

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

@@ -0,0 +1,18 @@
+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;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 10:34
+ * 文件说明：
+ */
+public interface EvaluationDeptBusinessPlanMapper extends BaseMapper<EvaluationDeptBusinessPlan> {
+
+	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear);
+}

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

@@ -13,4 +13,6 @@ import java.util.List;
 public interface EvaluationDeptIndicatorItemMapper extends BaseMapper<EvaluationDeptIndicatorItem> {
 
 	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId);
+
+	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptId(String evaluationDeptId);
 }

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

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface EvaluationDeptMapper extends BaseMapper<EvaluationDept> {
 
-	List<EvaluationDept> selectListAll(@Param("deptName") String deptName, @Param("annual") String annual, @Param("monthly") String monthly);
+	List<EvaluationDept> selectListAll(@Param("deptName") String deptName, @Param("annual") String annual);
 
-    IPage<EvaluationDept> selectListPage(Page<EvaluationDept> page, @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);
 }

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

@@ -0,0 +1,15 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.EvaluationDeptPlanContent;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 16:03
+ * 文件说明：
+ */
+public interface EvaluationDeptPlanContentMapper extends BaseMapper<EvaluationDeptPlanContent> {
+
+
+
+}

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

@@ -68,11 +68,6 @@ public class EvaluationDept extends Model {
     private String annual;
 
 	/**
-	 * 月度
-	 */
-	private String monthly;
-
-	/**
 	 * 是否启用
 	 */
 	private boolean enable;

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

@@ -13,24 +13,116 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class EvaluationDeptBusinessPlan extends Model {
 
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
 	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 responsibilityCode;
+
+	/**
+	 * 考评部门主键
+	 */
+	private String deptId;
+
+	/**
+	 * 考评部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 考评年度
+	 */
+	private String appraisalYear;
+
+	/**
+	 * 考评类别
+	 */
+	private String evaluationCategory;
+
+	/**
+	 * 业务类别
+	 */
+	private String businessClass;
+
+	/**
+	 * 单据状态
+	 */
+	private String documentStatus;
+
+	/**
+	 * 审批状态
+	 */
 	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 reviewPeople;
+
+	/**
+	 * 复审时间
+	 */
+	private String reviewPeopleTime;
+
+	/**
+	 * 复审意见
+	 */
+	private String reviewOpinion;
+
+	/**
+	 * 终审人
+	 */
+	private String finalReviewPeople;
+
+	/**
+	 * 终审时间
+	 */
+	private String finalReviewPeopleTime;
+
+	/**
+	 * 终审意见
+	 */
+	private String finalReviewOpinion;
+
+	/**
+	 * 流程实例ID
+	 */
+	private String instId;
+
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+
+	/**
+	 * 创建者
+	 */
+	private String createBy;
+
+	/**
+	 * 更新时间
+	 */
+	private String updateTime;
+
+	/**
+	 * 更新者
+	 */
+	private String updateBy;
+
+	/**
+	 * 备注
+	 */
 	private String remark;
 
 }

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

@@ -0,0 +1,68 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 16:00
+ * 文件说明：部门考评计划内容
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptPlanContent extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 业务主键
+	 */
+	private String businessPlanId;
+
+	/**
+	 * 部门主键
+	 */
+	private String deptId;
+
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 指标主键
+	 */
+	private String indicatorId;
+
+	/**
+	 * 指标名称
+	 */
+	private String indicatorName;
+
+	/**
+	 * 指标项主键
+	 */
+	private String indicatorItemId;
+
+	/**
+	 * 指标项名称
+	 */
+	private String indicatorItemName;
+
+	/**
+	 * 值
+	 */
+	private String targetValue;
+
+	/**
+	 * 审核状态
+	 */
+	private String auditStatus;
+
+}

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

@@ -0,0 +1,21 @@
+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 java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 10:33
+ * 文件说明：
+ */
+public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationDeptBusinessPlan> {
+
+	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear);
+
+	List<EvaluationDeptBusinessPlan> listAll(String responsibilityCode, String des, String appraisalYear);
+
+	boolean editState(String id, String state, String instId);
+}

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

@@ -13,4 +13,6 @@ import java.util.List;
 public interface IEvaluationDeptIndicatorItemService extends IService<EvaluationDeptIndicatorItem> {
 
 	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId);
+
+	List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptId(String evaluationDeptId);
 }

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

@@ -0,0 +1,15 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationDeptPlanContent;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 16:03
+ * 文件说明：
+ */
+public interface IEvaluationDeptPlanContentService extends IService<EvaluationDeptPlanContent> {
+
+
+
+}

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

@@ -16,8 +16,8 @@ import java.util.List;
  */
 public interface IEvaluationDeptService extends IService<EvaluationDept> {
 
-	List<EvaluationDept> listAll(String deptId, String annual, String monthly);
+	List<EvaluationDept> listAll(String deptId, String annual);
 
-	IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual, String monthly);
+	IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/WorkflowService.java

@@ -12,6 +12,7 @@ import com.ims.eval.entity.custom.TodoTask;
 import com.ims.eval.entity.flow.FlowResult;
 import com.ims.eval.schedule.ScoreCalculationSchedule;
 import com.ims.eval.service.IDeptResponsibilityService;
+import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
 import com.ims.eval.service.IOrganizationEvaluationService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Case;
@@ -51,6 +52,9 @@ public class WorkflowService {
 	@Autowired
 	private ScoreCalculationSchedule scoreCalculationSchedule;
 
+	@Autowired
+	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
+
 
 	/**
 	 * 发起流程
@@ -239,6 +243,9 @@ public class WorkflowService {
 			case "dwkpmbxd"://单位考评目标修订
 
 				break;
+			case "bbbmyjzbjh"://本部部门业绩指标计划
+				evaluationDeptBusinessPlanService.editState(bizKey,taskName,instId);
+				break;
 		}
 		return true;
 

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

@@ -0,0 +1,63 @@
+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.dao.EvaluationDeptBusinessPlanMapper;
+import com.ims.eval.entity.EvaluationDeptBusinessPlan;
+import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 10:33
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<EvaluationDeptBusinessPlanMapper, EvaluationDeptBusinessPlan> implements IEvaluationDeptBusinessPlanService {
+
+	@Override
+	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear) {
+		if (null == pageNum || null == pageSize) {
+			throw new RuntimeException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<EvaluationDeptBusinessPlan> page = new Page<>(pageNum, pageSize);
+		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear);
+	}
+
+	@Override
+	public List<EvaluationDeptBusinessPlan> listAll(String responsibilityCode, String des, String appraisalYear) {
+		QueryWrapper<EvaluationDeptBusinessPlan> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotEmpty(responsibilityCode)) {
+			qw.lambda().eq(EvaluationDeptBusinessPlan::getResponsibilityCode, responsibilityCode);
+		}
+
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().eq(EvaluationDeptBusinessPlan::getDes, des);
+		}
+
+		if (StringUtils.isNotEmpty(appraisalYear)) {
+			qw.lambda().eq(EvaluationDeptBusinessPlan::getAppraisalYear, appraisalYear);
+		}
+
+		return baseMapper.selectList(qw);
+	}
+
+	@Override
+	public boolean editState(String id, String state, String instId) {
+		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = baseMapper.selectById(id);
+		if (StringUtils.isNotEmpty(state)) {
+			evaluationDeptBusinessPlan.setStage(state);
+		}
+		if (StringUtils.isNotEmpty(instId)) {
+			evaluationDeptBusinessPlan.setInstId(instId);
+		}
+		return super.saveOrUpdate(evaluationDeptBusinessPlan);
+	}
+}

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

@@ -20,4 +20,9 @@ public class EvaluationDeptIndicatorItemServiceImpl extends ServiceImpl<Evaluati
 	public List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(String evaluationDeptIndicatorId) {
 		return baseMapper.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicatorId);
 	}
+
+	@Override
+	public List<EvaluationDeptIndicatorItem> selectEvaluationDeptIndicatorItemListByEvaluationDeptId(String evaluationDeptId) {
+		return baseMapper.selectEvaluationDeptIndicatorItemListByEvaluationDeptId(evaluationDeptId);
+	}
 }

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

@@ -0,0 +1,19 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.EvaluationDeptPlanContentMapper;
+import com.ims.eval.entity.EvaluationDeptPlanContent;
+import com.ims.eval.service.IEvaluationDeptPlanContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hlf
+ * @date 2023/4/27 16:03
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptPlanContentImpl extends ServiceImpl<EvaluationDeptPlanContentMapper, EvaluationDeptPlanContent> implements IEvaluationDeptPlanContentService {
+
+
+
+}

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

@@ -37,18 +37,18 @@ public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper,
 	}
 
 	@Override
-	public List<EvaluationDept> listAll(String deptId, String annual, String monthly) {
-		return baseMapper.selectListAll(deptId, annual, monthly);
+	public List<EvaluationDept> listAll(String deptId, String annual) {
+		return baseMapper.selectListAll(deptId, annual);
 	}
 
 	@Override
-	public IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual, String monthly) {
+	public IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual) {
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDept> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, deptName, annual, monthly);
+		return baseMapper.selectListPage(page, deptName, annual);
 	}
 
 	@Transactional

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

@@ -51,30 +51,30 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	@Override
 	public Map finishValueList(String organizationEvaluationId, String dept, HttpServletRequest request) {
 
-		MyuserResDTO myuser = userService.getSysUser(request);
-		if(null == myuser){
-			throw new CustomException("暂无权限");
-		}
+//		MyuserResDTO myuser = userService.getSysUser(request);
+//		if(null == myuser){
+//			throw new CustomException("暂无权限");
+//		}
 		String organizationId = "";
-		boolean updateMark = false;
-		if (null != myuser.getUnitOrg() && null != myuser.getUnitOrg().getParentIds()) {
-			String type = myuser.getUnitOrg().getType();
-			if (Constant.THREE.contains(type) || Constant.FOUR.contains(type)) {
-//				dept = myuser.getDeptName();
-				organizationId = myuser.getUnitId();
-			} else if (Constant.SUB_BRANCH.contains(type)) {
-				dept = "";
-			} else if (myuser.getLoginName().equals("admin")) {
-				dept = "";
-				updateMark= true;
-			} else {
-				throw new CustomException("暂无权限");
-			}
-		}
+//		boolean updateMark = false;
+//		if (null != myuser.getUnitOrg() && null != myuser.getUnitOrg().getParentIds()) {
+//			String type = myuser.getUnitOrg().getType();
+//			if (Constant.THREE.contains(type) || Constant.FOUR.contains(type)) {
+////				dept = myuser.getDeptName();
+//				organizationId = myuser.getUnitId();
+//			} else if (Constant.SUB_BRANCH.contains(type)) {
+//				dept = "";
+//			} else if (myuser.getLoginName().equals("admin")) {
+//				dept = "";
+//				updateMark= true;
+//			} else {
+//				throw new CustomException("暂无权限");
+//			}
+//		}
 		List<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId(organizationEvaluationId,dept,"",organizationId);//默认获取指定的怎目标
-		boolean finalUpdateMark = updateMark;
+//		boolean finalUpdateMark = updateMark;
 		list.stream().forEach(i->{
-			i.setUpdateMark(i.getDeptName().equals(myuser.getDeptOrg().getShortName()));
+			i.setUpdateMark(i.getDeptName().equals(true));
 		});
 		Map<String  ,List<OrganizationEvaluationInfoResDTO>> map  = list.stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIsQuantified));
 		map.put("quantifiedList", map.remove("是"));

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

@@ -0,0 +1,74 @@
+<?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.EvaluationDeptBusinessPlanMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptBusinessPlan">
+        <id column="id" property="id"/>
+        <result column="responsibility_code" property="responsibilityCode"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="appraisal_year" property="appraisalYear"/>
+        <result column="evaluation_category" property="evaluationCategory"/>
+        <result column="business_class" property="businessClass"/>
+        <result column="document_status" property="documentStatus"/>
+        <result column="stage" property="stage"/>
+        <result column="des" property="des"/>
+        <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="inst_id" property="instId"/>
+        <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="selectEvaluationDeptBusinessPlanVo">
+        select id,
+               responsibility_code,
+               dept_id,
+               dept_name,
+               appraisal_year,
+               evaluation_category,
+               business_class,
+               document_status,
+               stage,
+               des,
+               review_people,
+               review_people_time,
+               review_opinion,
+               final_review_people,
+               final_review_people_time,
+               final_review_opinion,
+               inst_id,
+               create_time,
+               create_by,
+               update_time,
+               update_by,
+               remark
+        from evaluation_dept_business_plan
+    </sql>
+
+    <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptBusinessPlan">
+        <include refid="selectEvaluationDeptBusinessPlanVo"/>
+        <where>
+            <if test="responsibilityCode != null and responsibilityCode != ''">
+                AND responsibility_code like CONCAT('%',#{responsibilityCode},'%')
+            </if>
+            <if test="des != null and des != ''">
+                AND des like CONCAT('%',#{des},'%')
+            </if>
+            <if test="appraisalYear != null and appraisalYear != ''">
+                AND appraisal_year = #{appraisalYear}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+</mapper>

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

@@ -34,4 +34,9 @@
         where evaluation_dept_indicator_id = #{evaluationDeptIndicatorId}
     </select>
 
+    <select id="selectEvaluationDeptIndicatorItemListByEvaluationDeptId" resultType="com.ims.eval.entity.EvaluationDeptIndicatorItem">
+        <include refid="selectEvaluationDeptIndicatorItemVo"/>
+        where evaluation_dept_id = #{evaluationDeptId}
+    </select>
+
 </mapper>

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

@@ -13,7 +13,6 @@
         <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"/>
@@ -33,7 +32,6 @@
                short_dept_name,
                evaluation_category,
                annual,
-               monthly,
                enable,
                des,
                create_time,
@@ -53,9 +51,6 @@
             <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>
@@ -70,9 +65,6 @@
             <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>

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

@@ -0,0 +1,34 @@
+<?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.EvaluationDeptPlanContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptPlanContent">
+        <id column="id" property="id"/>
+        <result column="business_plan_id" property="businessPlanId"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="indicator_id" property="indicatorId"/>
+        <result column="indicator_name" property="indicatorName"/>
+        <result column="indicator_item_id" property="indicatorItemId"/>
+        <result column="indicator_item_name" property="indicatorItemName"/>
+        <result column="target_value" property="targetValue"/>
+        <result column="audit_status" property="auditStatus"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="selectEvaluationDeptPlanContentVo">
+        select id,
+               business_plan_id,
+               dept_id,
+               dept_name,
+               indicator_id,
+               indicator_name,
+               indicator_item_id,
+               indicator_item_name,
+               target_value,
+               audit_status
+        from evaluation_dept_plan_content
+    </sql>
+
+</mapper>