fix bug

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

@@ -1,15 +1,14 @@
 package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.EvaluationDeptRating;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptRatingService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,7 +34,6 @@ public class DepartmentPerformanceAppraisalRatingController {
 	 * @param annual             月度
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptRating:view")
 	@GetMapping(value = "list")
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
@@ -49,16 +47,48 @@ public class DepartmentPerformanceAppraisalRatingController {
 	/**
 	 * 部门绩效考核评级信息
 	 *
-	 * @param deptName           部门名称
-	 * @param annual             月度
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptRating:view")
 	@GetMapping(value = "listAll")
-	public R listAll(
-		@RequestParam(value = "deptName", required = false) String deptName,
-		@RequestParam(value = "annual", required = false) String annual) {
-		List<EvaluationDeptRating> list = evaluationDeptRatingService.listAll(deptName, annual);
+	public R listAll() {
+		List<EvaluationDeptRating> list = evaluationDeptRatingService.list();
 		return R.ok().data(list);
 	}
+
+	/**
+	 * 新增/修改部门绩效考核评级信息
+	 *
+	 * @param evaluationDeptRating 部门绩效考核评级实体
+	 * @return 结果
+	 */
+	@PostMapping(value = "/save")
+	public R addAll(@RequestBody EvaluationDeptRating evaluationDeptRating) {
+		try {
+			boolean b = evaluationDeptRatingService.saveOrUpdate(evaluationDeptRating);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+	/**
+	 * 批量删除部门绩效考核评级信息
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@PostMapping(value = "/removeAll/{ids}")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = evaluationDeptRatingService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
 }

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

@@ -1,11 +1,11 @@
 package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ims.eval.entity.EvaluationDeptBusinessPlan;
-import com.ims.eval.entity.EvaluationDeptPlanContent;
+import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
+import com.ims.eval.service.IEvaluationDeptBusinessContentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
-import com.ims.eval.service.IEvaluationDeptPlanContentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,13 +24,7 @@ import java.util.List;
 public class DepartmentalPerformanceIndicatorAssessmentController {
 
 	@Autowired
-	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
-
-	@Autowired
-	private IEvaluationDeptPlanContentService evaluationDeptPlanContentService;
-
-	@Autowired
-	private HttpServletRequest request;
+	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
 	/**
 	 * 部门考评业务列表信息（分页）
@@ -43,7 +37,6 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	 * @param stage              流程状态
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
 	@GetMapping(value = "list")
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
@@ -52,22 +45,18 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
 		@RequestParam(value = "stage", required = false) String stage) {
-		stage = "流程已结束";
-		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage);
+		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage);
 		return R.ok().data(list);
 	}
 
 	/**
-	 * 详情
+	 * 部门考评业务信息
 	 *
-	 * @param id 业务主键
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
-	@GetMapping(value = "/details/{id}")
-	public R details(@PathVariable("id") String id) {
-		List<EvaluationDeptPlanContent> list = evaluationDeptPlanContentService.detailsList(id, "指标结果", request);
+	@GetMapping(value = "listAll")
+	public R listAll() {
+		List<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.list();
 		return R.ok().data(list);
 	}
-
 }

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

@@ -1,22 +1,20 @@
 package com.ims.eval.controller;
 
-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 com.ims.eval.util.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -26,6 +24,7 @@ import java.util.List;
  * @date 2023/4/26 14:15
  * 文件说明：
  */
+@Slf4j
 @RestController
 @RequestMapping("//evaluation-dept-plan")
 public class DepartmentalPerformanceIndicatorPlanController {
@@ -34,7 +33,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
 
 	@Autowired
-	private IEvaluationDeptPlanContentService evaluationDeptPlanContentService;
+	private IEvaluationDeptBusinessContentService evaluationDeptBusinessContentService;
 
 	@Autowired
 	private HttpServletRequest request;
@@ -50,7 +49,6 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param stage              流程状态
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
 	@GetMapping(value = "list")
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
@@ -66,32 +64,24 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	/**
 	 * 部门考评业务信息
 	 *
-	 * @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);
+	public R listAll() {
+		List<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.list();
 		return R.ok().data(list);
 	}
 
 	/**
 	 * 新增部门考评业务信息
 	 *
-	 * @param deptBusinessPlan 部门考评业务实体
+	 * @param evaluationDeptBusinessPlan 部门考评业务实体
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:edit")
 	@PostMapping(value = "/save")
-	public R addAll(@RequestBody EvaluationDeptBusinessPlan deptBusinessPlan) {
+	public R addAll(@RequestBody EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
 		try {
-			boolean b = evaluationDeptBusinessPlanService.save(deptBusinessPlan);
+			boolean b = evaluationDeptBusinessPlanService.save(evaluationDeptBusinessPlan);
 			if (b) {
 				return R.ok().data(b);
 			} else {
@@ -108,7 +98,6 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param ids
 	 * @return
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:remove")
 	@PostMapping(value = "/removeAll/{ids}")
 	public R deleteAll(@PathVariable("ids") String ids) {
 		String[] strings = ids.split(",");
@@ -126,25 +115,22 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	 * @param id 业务主键
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:view")
 	@GetMapping(value = "/details/{id}")
 	public R details(@PathVariable("id") String id) {
-		List<EvaluationDeptPlanContent> list = evaluationDeptPlanContentService.detailsList(id, "指标计划", request);
+		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, request);
 		return R.ok().data(list);
 	}
 
 	/**
-	 * 详情里指标内容修改
+	 * 详情-修改
 	 *
-	 * @param evaluationDeptPlanContentList
-	 * @return
+	 * @param evaluationDeptBusinessContentList 修改内容
+	 * @return 结果
 	 */
-
-	//@ImsPreAuth("eval:evaluationDeptBusinessPlan:edit")
 	@PostMapping(value = "/update")
-	public R update(@RequestBody List<EvaluationDeptPlanContent> evaluationDeptPlanContentList) {
+	public R update(@RequestBody List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
 		try {
-			boolean b = evaluationDeptPlanContentService.saveOrUpdateBatch(evaluationDeptPlanContentList);
+			boolean b = evaluationDeptBusinessContentService.saveOrUpdateBatch(evaluationDeptBusinessContentList);
 			if (b) {
 				return R.ok().data(b);
 			} else {
@@ -154,4 +140,56 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			return R.customError(e.getMessage()).data("失败！");
 		}
 	}
+
+	/**
+	 * 导入
+	 *
+	 * @param file
+	 * @param request
+	 * @return
+	 */
+	@PostMapping(value = "/import")
+	public R importData(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+		if (!file.isEmpty()) {
+			try {
+				//获取原始的文件名
+				String originalFilename = file.getOriginalFilename();
+				//获取文件类型
+				String fileType = originalFilename.substring(originalFilename.lastIndexOf(".") + 1, originalFilename.length());
+				//默认从第一行开始读取
+				int startRows = 1;
+				//获取输入流
+				InputStream is = file.getInputStream();
+				List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = new ArrayList<>();
+				//Excel导入导出的单元类
+				List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
+				//遍历Excel表每一行的数据
+				for (String[] str : strings) {
+					EvaluationDeptBusinessContent evaluationDeptBusinessContent = new EvaluationDeptBusinessContent();
+					evaluationDeptBusinessContent.setId(str[0]);
+					evaluationDeptBusinessContent.setBusinessPlanId(str[1]);
+					evaluationDeptBusinessContent.setDeptId(str[2]);
+					evaluationDeptBusinessContent.setDeptName(str[3]);
+					evaluationDeptBusinessContent.setDeptCode(str[4]);
+					evaluationDeptBusinessContent.setSerialNumber(str[5]);
+					evaluationDeptBusinessContent.setTargetName(str[6]);
+					evaluationDeptBusinessContent.setTargetValue(str[7]);
+					evaluationDeptBusinessContent.setBaseScore(str[8]);
+					evaluationDeptBusinessContent.setEvaluationCriteria(str[9]);
+					evaluationDeptBusinessContent.setAuditStatus("-1");
+					evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
+				}
+				boolean b = evaluationDeptBusinessContentService.saveOrUpdateBatch(evaluationDeptBusinessContentList);
+				if (b) {
+					return R.ok().data(b);
+				} else {
+					return R.error().data("保存失败！");
+				}
+			} catch (Exception e) {
+				log.error("错误", e);
+				return R.customError(e.getMessage()).data("失败！");
+			}
+		}
+		return R.customError("上传文件为空！");
+	}
 }

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

@@ -8,11 +8,8 @@ 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.*;
 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;
@@ -55,7 +52,6 @@ public class EvaluationDeptController {
 	 * @param annual   年度
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDept:view")
 	@GetMapping(value = "list")
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
@@ -78,16 +74,11 @@ public class EvaluationDeptController {
 	/**
 	 * 考评部门配置信息
 	 *
-	 * @param deptId  部门主键
-	 * @param annual  年度
 	 * @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) {
-		List<EvaluationDept> list = evaluationDeptService.listAll(deptId, annual);
+	public R listAll() {
+		List<EvaluationDept> list = evaluationDeptService.list();
 		for (EvaluationDept evaluationDept : list) {
 			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
 			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
@@ -105,88 +96,10 @@ public class EvaluationDeptController {
 	 * @param dept 考评部门实体
 	 * @return 结果
 	 */
-	//@ImsPreAuth("eval:evaluationDept:edit")
 	@PostMapping(value = "/save")
 	public R addAll(@RequestBody EvaluationDept dept) {
 		try {
-			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();
-						}
-					}
-				}
-			}
+			boolean b = evaluationDeptService.saveOrUpdate(dept);
 			if (b) {
 				return R.ok().data(b);
 			} else {
@@ -203,7 +116,6 @@ public class EvaluationDeptController {
 	 * @param ids
 	 * @return
 	 */
-	//@ImsPreAuth("eval:evaluationDept:remove")
 	@PostMapping(value = "/removeAll/{ids}")
 	public R deleteAll(@PathVariable("ids") String ids) {
 		String[] strings = ids.split(",");
@@ -234,7 +146,6 @@ public class EvaluationDeptController {
 	 * @param id
 	 * @return
 	 */
-	//@ImsPreAuth("eval:evaluationDept:remove")
 	@PostMapping(value = "/remove/{id}")
 	public R delete(@PathVariable("id") String id) {
 		boolean b = evaluationDeptIndicatorItemService.removeById(id);

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationDeptBusinessAssessmentMapper.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.EvaluationDeptBusinessAssessment;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 17:11
+ * 文件说明：
+ */
+public interface EvaluationDeptBusinessAssessmentMapper extends BaseMapper<EvaluationDeptBusinessAssessment> {
+
+	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage);
+
+}

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

@@ -0,0 +1,18 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.EvaluationDeptBusinessContent;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 10:41
+ * 文件说明：
+ */
+public interface EvaluationDeptBusinessContentMapper extends BaseMapper<EvaluationDeptBusinessContent> {
+
+	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId);
+
+	boolean removeByBusinessPlanId(String businessPlanId);
+}

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

@@ -18,7 +18,5 @@ import java.util.List;
  */
 public interface EvaluationDeptMapper extends BaseMapper<EvaluationDept> {
 
-	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);
 }

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

@@ -1,17 +0,0 @@
-package com.ims.eval.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ims.eval.entity.EvaluationDeptPlanContent;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author hlf
- * @date 2023/4/27 16:03
- * 文件说明：
- */
-public interface EvaluationDeptPlanContentMapper extends BaseMapper<EvaluationDeptPlanContent> {
-
-    List<EvaluationDeptPlanContent> detailsList(@Param("businessPlanId") String businessPlanId, @Param("indicatorCategory") String indicatorCategory);
-}

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

@@ -0,0 +1,133 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 17:09
+ * 文件说明：本部部门业绩指标考核
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptBusinessAssessment extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 业务编码
+	 */
+	private String responsibilityCode;
+
+	/**
+	 * 考评部门主键
+	 */
+	private String deptId;
+
+	/**
+	 * 考评部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 考评部门编码
+	 */
+	private String deptCode;
+
+	/**
+	 * 考评年度
+	 */
+	private String appraisalYear;
+
+	/**
+	 * 考评类别
+	 */
+	private String evaluationCategory;
+
+	/**
+	 * 业务类别
+	 */
+	private String businessClass;
+
+	/**
+	 * 单据状态
+	 */
+	private String documentStatus;
+
+	/**
+	 * 审批状态
+	 */
+	private String stage;
+
+	/**
+	 * 描述
+	 */
+	private String des;
+
+	/**
+	 * 复审人
+	 */
+	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/EvaluationDeptBusinessContent.java

@@ -0,0 +1,114 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 10:36
+ * 文件说明：本部部门业绩指标计划内容
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationDeptBusinessContent extends Model {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 指标计划主键
+	 */
+	private String businessPlanId;
+
+	/**
+	 * 考评部门主键
+	 */
+	private String deptId;
+
+	/**
+	 * 考评部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 考评部门编码
+	 */
+	private String deptCode;
+
+	/**
+	 * 序号
+	 */
+	private String serialNumber;
+
+	/**
+	 * 指标名称
+	 */
+	private String targetName;
+
+	/**
+	 * 目标值
+	 */
+	private String targetValue;
+
+	/**
+	 * 基础分
+	 */
+	private String baseScore;
+
+	/**
+	 * 完成情况
+	 */
+	private String completionStatus;
+
+	/**
+	 * 评价标准
+	 */
+	private String evaluationCriteria;
+
+	/**
+	 * 自评得分
+	 */
+	private String evaluationScore;
+
+	/**
+	 * 审核状态
+	 */
+	private String auditStatus;
+
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+
+	/**
+	 * 创建者
+	 */
+	private String createBy;
+
+	/**
+	 * 更新时间
+	 */
+	private String updateTime;
+
+	/**
+	 * 更新者
+	 */
+	private String updateBy;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 修改标记
+	 */
+	@TableField(exist = false)
+	private Boolean updateMark;
+}

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

@@ -1,5 +1,6 @@
 package com.ims.eval.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,7 +8,7 @@ import lombok.EqualsAndHashCode;
 /**
  * @author hlf
  * @date 2023/4/26 17:32
- * 文件说明：考评部门业务指标
+ * 文件说明：本部部门业绩指标计划
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -36,6 +37,11 @@ public class EvaluationDeptBusinessPlan extends Model {
 	private String deptName;
 
 	/**
+	 * 考评部门编码
+	 */
+	private String deptCode;
+
+	/**
 	 * 考评年度
 	 */
 	private String appraisalYear;
@@ -56,16 +62,11 @@ public class EvaluationDeptBusinessPlan extends Model {
 	private String documentStatus;
 
 	/**
-	 * 计划审批状态
+	 * 审批状态
 	 */
 	private String stage;
 
 	/**
-	 * 考核审批状态
-	 */
-	private String assessmentStage;
-
-	/**
 	 * 描述
 	 */
 	private String des;
@@ -101,16 +102,11 @@ public class EvaluationDeptBusinessPlan extends Model {
 	private String finalReviewOpinion;
 
 	/**
-	 * 计划流程实例ID
+	 * 流程实例ID
 	 */
 	private String instId;
 
 	/**
-	 * 考核流程实例ID
-	 */
-	private String assessmentInstId;
-
-	/**
 	 * 创建时间
 	 */
 	private String createTime;
@@ -135,4 +131,9 @@ public class EvaluationDeptBusinessPlan extends Model {
 	 */
 	private String remark;
 
+	/**
+	 * 部门json数据
+	 */
+	@TableField(exist = false)
+	private String deptData;
 }

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

@@ -1,81 +0,0 @@
-package com.ims.eval.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
-
-	/**
-	 * 审核状态(未开始-1 待审核0 已完成1)
-	 */
-	private String auditStatus;
-
-	/**
-	 * 修改标记
-	 */
-	@TableField(exist = false)
-	private Boolean updateMark;
-
-	/**
-	 * 指标类别(指标计划 指标结果)
-	 */
-	@TableField(exist = false)
-	private String indicatorCategory;
-
-}

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

@@ -48,10 +48,22 @@ public class EvaluationDeptRating extends Model {
 	private String nov;
 	//十二月
 	private String dece;
+
+	private String janContent;
+	private String febContent;
+	private String marContent;
+	private String aprContent;
+	private String mayContent;
+	private String junContent;
+	private String julContent;
+	private String augContent;
+	private String sepContent;
+	private String octContent;
+	private String novContent;
+	private String deceContent;
+
 	//A级总数
-	private String aCount;
-	//A级原因
-	private String aCause;
+	private String acount;
 	//创建时间
 	private String createTime;
 	//创建者

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

@@ -0,0 +1,17 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 17:10
+ * 文件说明：
+ */
+public interface IEvaluationDeptBusinessAssessmentService extends IService<EvaluationDeptBusinessAssessment> {
+
+	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage);
+
+	boolean editState(String id, String state, String instId);
+}

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

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.EvaluationDeptBusinessContent;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 10:40
+ * 文件说明：
+ */
+public interface IEvaluationDeptBusinessContentService extends IService<EvaluationDeptBusinessContent> {
+
+	List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, HttpServletRequest request);
+
+	boolean removeByBusinessPlanId(String businessPlanId);
+
+	boolean saveOrUpdateBatch(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
+}

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

@@ -3,6 +3,7 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -15,11 +16,9 @@ public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationD
 
 	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage);
 
-	List<EvaluationDeptBusinessPlan> listAll(String responsibilityCode, String des, String appraisalYear);
-
-	boolean save(EvaluationDeptBusinessPlan deptBusinessPlan);
+	boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan);
 
 	boolean editState(String id, String state, String instId);
 
-	boolean editAState(String id, String assessmentStage, String assessmentInstId);
+	boolean removeByIds(List<String> ids);
 }

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

@@ -1,17 +0,0 @@
-package com.ims.eval.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ims.eval.entity.EvaluationDeptPlanContent;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @author hlf
- * @date 2023/4/27 16:03
- * 文件说明：
- */
-public interface IEvaluationDeptPlanContentService extends IService<EvaluationDeptPlanContent> {
-
-    List<EvaluationDeptPlanContent> detailsList(String businessPlanId, String indicatorCategory, HttpServletRequest request);
-}

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

@@ -15,5 +15,5 @@ public interface IEvaluationDeptRatingService extends IService<EvaluationDeptRat
 
 	IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptName, String annual);
 
-	List<EvaluationDeptRating> listAll(String deptName, String annual);
+	boolean saveOrUpdate(EvaluationDeptRating evaluationDeptRating);
 }

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

@@ -3,6 +3,7 @@ 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;
+import com.ims.eval.entity.EvaluationDeptRating;
 
 import java.util.List;
 
@@ -16,8 +17,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptService extends IService<EvaluationDept> {
 
-	List<EvaluationDept> listAll(String deptId, String annual);
-
 	IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual);
 
+	boolean saveOrUpdate(EvaluationDept evaluationDept);
 }

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.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
 import com.ims.eval.service.IOrganizationEvaluationService;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +56,8 @@ public class WorkflowService {
 	@Autowired
 	private IEvaluationDeptBusinessPlanService evaluationDeptBusinessPlanService;
 
+	@Autowired
+	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
 	/**
 	 * 发起流程
@@ -247,7 +250,7 @@ public class WorkflowService {
 				evaluationDeptBusinessPlanService.editState(bizKey,taskName,instId);
 				break;
 			case "bbbmyjzbkh"://本部部门业绩指标考核
-				evaluationDeptBusinessPlanService.editAState(bizKey,taskName,instId);
+				evaluationDeptBusinessAssessmentService.editState(bizKey,taskName,instId);
 				break;
 		}
 		return true;

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

@@ -0,0 +1,41 @@
+package com.ims.eval.service.impl;
+
+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.EvaluationDeptBusinessAssessmentMapper;
+import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
+import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 17:10
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptBusinessAssessmentServiceImpl extends ServiceImpl<EvaluationDeptBusinessAssessmentMapper, EvaluationDeptBusinessAssessment> implements IEvaluationDeptBusinessAssessmentService {
+
+	@Override
+	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage) {
+		if (null == pageNum || null == pageSize) {
+			throw new RuntimeException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<EvaluationDeptBusinessAssessment> page = new Page<>(pageNum, pageSize);
+		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage);
+	}
+
+	@Override
+	public boolean editState(String id, String state, String instId) {
+		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = baseMapper.selectById(id);
+		if (StringUtils.isNotEmpty(state)) {
+			evaluationDeptBusinessAssessment.setStage(state);
+		}
+		if (StringUtils.isNotEmpty(instId)) {
+			evaluationDeptBusinessAssessment.setInstId(instId);
+		}
+		return super.saveOrUpdate(evaluationDeptBusinessAssessment);
+	}
+}

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

@@ -0,0 +1,79 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.dao.EvaluationDeptBusinessContentMapper;
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.EvaluationDeptBusinessContent;
+import com.ims.eval.service.IDataDictionaryService;
+import com.ims.eval.service.IEvaluationDeptBusinessContentService;
+import com.ims.eval.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/5/6 10:40
+ * 文件说明：
+ */
+@Service
+public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<EvaluationDeptBusinessContentMapper, EvaluationDeptBusinessContent> implements IEvaluationDeptBusinessContentService {
+
+	@Autowired
+	private IUserService userService;
+
+	@Autowired
+	private IDataDictionaryService dataDictionaryService;
+
+	@Override
+	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, HttpServletRequest request) {
+		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = baseMapper.detailsList(businessPlanId);
+		/*Myuser myuser = userService.getSysUser(request);
+		if (null != myuser) {
+			throw new CustomException("暂无权限");
+		} else {
+			for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+				boolean updateMark = false;
+				if (!"".equals(myuser.getDeptId())) {
+					if (myuser.getDeptId().equals(evaluationDeptBusinessContent.getDeptId())) {
+						updateMark = true;
+					} else if (myuser.getLoginName().equals("admin")) {
+						updateMark = true;
+					} else {
+						throw new CustomException("暂无权限");
+					}
+				}
+				evaluationDeptBusinessContent.setUpdateMark(updateMark);
+			}
+		}
+		return null;*/
+		evaluationDeptBusinessContentList.stream().forEach(i -> {
+			i.setUpdateMark(true);
+		});
+		return evaluationDeptBusinessContentList;
+	}
+
+	@Override
+	public boolean removeByBusinessPlanId(String businessPlanId) {
+		return baseMapper.removeByBusinessPlanId(businessPlanId);
+	}
+
+	@Override
+	public boolean saveOrUpdateBatch(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
+		boolean b = false;
+		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+			if (StringUtils.isEmpty(evaluationDeptBusinessContent.getId())) {
+				DataDictionary dataDictionary = dataDictionaryService.getById(evaluationDeptBusinessContent.getDeptId());
+				evaluationDeptBusinessContent.setDeptName(dataDictionary.getKeyName());
+				evaluationDeptBusinessContent.setDeptCode(dataDictionary.getDataKey());
+				b = super.save(evaluationDeptBusinessContent);
+			} else {
+				b = super.updateById(evaluationDeptBusinessContent);
+			}
+		}
+		return b;
+	}
+}

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

@@ -1,7 +1,11 @@
 package com.ims.eval.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +17,7 @@ import com.ims.eval.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,16 +29,10 @@ import java.util.List;
 public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<EvaluationDeptBusinessPlanMapper, EvaluationDeptBusinessPlan> implements IEvaluationDeptBusinessPlanService {
 
 	@Autowired
-	private IEvaluationDeptService evaluationDeptService;
+	private IEvaluationDeptBusinessContentService evaluationDeptBusinessContentService;
 
 	@Autowired
-	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
-
-	@Autowired
-	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
-
-	@Autowired
-	private IEvaluationDeptPlanContentService evaluationDeptPlanContentService;
+	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
 	@Override
 	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage) {
@@ -46,66 +45,74 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	}
 
 	@Override
-	public List<EvaluationDeptBusinessPlan> listAll(String responsibilityCode, String des, String appraisalYear) {
+	public boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan) {
+		boolean b;
 		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);
+		if (StringUtils.isNotEmpty(evaluationDeptBusinessPlan.getAppraisalYear())) {
+			qw.lambda().eq(EvaluationDeptBusinessPlan::getAppraisalYear, evaluationDeptBusinessPlan.getAppraisalYear());
 		}
-
-		return baseMapper.selectList(qw);
-	}
-
-	@Override
-	public boolean save(EvaluationDeptBusinessPlan deptBusinessPlan) {
-		String businessPlanId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
-		deptBusinessPlan.setId(businessPlanId);
-		deptBusinessPlan.setResponsibilityCode("bmkp_" + deptBusinessPlan.getBusinessClass().toLowerCase() + "_" + deptBusinessPlan.getAppraisalYear());
-		deptBusinessPlan.setDocumentStatus("有效");
-		deptBusinessPlan.setStage("流程未启动");
-		deptBusinessPlan.setAssessmentStage("流程未启动");
-		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(deptBusinessPlan.getAppraisalYear())) {
-			qw.lambda().eq(EvaluationDept::getAnnual, deptBusinessPlan.getAppraisalYear());
+		EvaluationDeptBusinessPlan businessPlan = baseMapper.selectOne(qw);
+		if (ObjectUtil.isNotNull(businessPlan)){
+			return false;
 		}
-		List<EvaluationDept> evaluationDeptList = evaluationDeptService.list(qw);
+		String id = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+		evaluationDeptBusinessPlan.setId(id);
+		evaluationDeptBusinessPlan.setResponsibilityCode("BMKP_" + evaluationDeptBusinessPlan.getBusinessClass() + "_" + evaluationDeptBusinessPlan.getAppraisalYear());
+		evaluationDeptBusinessPlan.setDocumentStatus("有效");
+		evaluationDeptBusinessPlan.setStage("流程未启动");
+		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = new ArrayList<>();
+		JSONArray array = JSONUtil.parseArray(evaluationDeptBusinessPlan.getDeptData());
+		List<Dict> deptList = JSONUtil.toList(array, Dict.class);
 		StringBuilder deptIds = new StringBuilder();
 		StringBuilder deptNames = new StringBuilder();
-		for (int i = 0; i < evaluationDeptList.size(); i++) {
-			EvaluationDept evaluationDept = evaluationDeptList.get(i);
-			List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptId(evaluationDept.getId());
-			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("-1");
-				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(",");
-			}
+		StringBuilder deptCodes = new StringBuilder();
+		for (Dict dict : deptList) {
+			String deptId = dict.get("id").toString();
+			String deptName = dict.get("keyName").toString();
+			String deptCode = dict.get("dataKey").toString();
+			EvaluationDeptBusinessContent evaluationDeptBusinessContent = new EvaluationDeptBusinessContent();
+			evaluationDeptBusinessContent.setBusinessPlanId(id);
+			evaluationDeptBusinessContent.setDeptId(deptId);
+			evaluationDeptBusinessContent.setDeptName(deptName);
+			evaluationDeptBusinessContent.setDeptCode(deptCode);
+			evaluationDeptBusinessContent.setSerialNumber("1");
+			evaluationDeptBusinessContent.setAuditStatus("-1");
+			evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
+			deptIds.append(deptId).append(",");
+			deptNames.append(deptName).append(",");
+			deptCodes.append(deptCode).append(",");
 		}
-		deptBusinessPlan.setDeptId(deptIds.toString());
-		deptBusinessPlan.setDeptName(deptNames.toString());
-		return super.save(deptBusinessPlan);
+		b = evaluationDeptBusinessContentService.saveBatch(evaluationDeptBusinessContentList);
+		evaluationDeptBusinessPlan.setDeptId(deptIds.toString().substring(0, deptIds.toString().length() - 1));
+		evaluationDeptBusinessPlan.setDeptName(deptNames.toString().substring(0, deptNames.toString().length() - 1));
+		evaluationDeptBusinessPlan.setDeptCode(deptCodes.toString().substring(0, deptCodes.toString().length() - 1));
+		b = super.save(evaluationDeptBusinessPlan);
+		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = new EvaluationDeptBusinessAssessment();
+		evaluationDeptBusinessAssessment.setId(evaluationDeptBusinessPlan.getId());
+		evaluationDeptBusinessAssessment.setResponsibilityCode(evaluationDeptBusinessPlan.getResponsibilityCode());
+		evaluationDeptBusinessAssessment.setDeptId(evaluationDeptBusinessPlan.getDeptId());
+		evaluationDeptBusinessAssessment.setDeptName(evaluationDeptBusinessPlan.getDeptName());
+		evaluationDeptBusinessAssessment.setDeptCode(evaluationDeptBusinessPlan.getDeptCode());
+		evaluationDeptBusinessAssessment.setAppraisalYear(evaluationDeptBusinessPlan.getAppraisalYear());
+		evaluationDeptBusinessAssessment.setEvaluationCategory(evaluationDeptBusinessPlan.getEvaluationCategory());
+		evaluationDeptBusinessAssessment.setBusinessClass(evaluationDeptBusinessPlan.getBusinessClass());
+		evaluationDeptBusinessAssessment.setDocumentStatus(evaluationDeptBusinessPlan.getDocumentStatus());
+		evaluationDeptBusinessAssessment.setStage(evaluationDeptBusinessPlan.getStage());
+		evaluationDeptBusinessAssessment.setDes(evaluationDeptBusinessPlan.getDes());
+		evaluationDeptBusinessAssessment.setReviewPeople(evaluationDeptBusinessPlan.getReviewPeople());
+		evaluationDeptBusinessAssessment.setReviewPeopleTime(evaluationDeptBusinessPlan.getReviewPeopleTime());
+		evaluationDeptBusinessAssessment.setReviewOpinion(evaluationDeptBusinessPlan.getReviewOpinion());
+		evaluationDeptBusinessAssessment.setFinalReviewPeople(evaluationDeptBusinessPlan.getFinalReviewPeople());
+		evaluationDeptBusinessAssessment.setFinalReviewPeopleTime(evaluationDeptBusinessPlan.getFinalReviewPeopleTime());
+		evaluationDeptBusinessAssessment.setFinalReviewOpinion(evaluationDeptBusinessPlan.getFinalReviewOpinion());
+		evaluationDeptBusinessAssessment.setInstId(evaluationDeptBusinessPlan.getInstId());
+		evaluationDeptBusinessAssessment.setCreateTime(evaluationDeptBusinessPlan.getCreateTime());
+		evaluationDeptBusinessAssessment.setCreateBy(evaluationDeptBusinessPlan.getCreateBy());
+		evaluationDeptBusinessAssessment.setUpdateTime(evaluationDeptBusinessPlan.getUpdateTime());
+		evaluationDeptBusinessAssessment.setUpdateBy(evaluationDeptBusinessPlan.getUpdateBy());
+		evaluationDeptBusinessAssessment.setRemark(evaluationDeptBusinessPlan.getRemark());
+		b = evaluationDeptBusinessAssessmentService.save(evaluationDeptBusinessAssessment);
+		return b;
 	}
 
 	@Override
@@ -121,14 +128,10 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	}
 
 	@Override
-	public boolean editAState(String id, String assessmentStage, String assessmentInstId) {
-		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = baseMapper.selectById(id);
-		if (StringUtils.isNotEmpty(assessmentStage)) {
-			evaluationDeptBusinessPlan.setAssessmentStage(assessmentStage);
+	public boolean removeByIds(List<String> ids) {
+		for (String id : ids) {
+			evaluationDeptBusinessContentService.removeByBusinessPlanId(id);
 		}
-		if (StringUtils.isNotEmpty(assessmentInstId)) {
-			evaluationDeptBusinessPlan.setAssessmentInstId(assessmentInstId);
-		}
-		return super.saveOrUpdate(evaluationDeptBusinessPlan);
+		return super.removeByIds(ids);
 	}
 }

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

@@ -1,56 +0,0 @@
-package com.ims.eval.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ims.common.utils.Constant;
-import com.ims.eval.config.CustomException;
-import com.ims.eval.dao.EvaluationDeptPlanContentMapper;
-import com.ims.eval.entity.EvaluationDeptPlanContent;
-import com.ims.eval.entity.Myuser;
-import com.ims.eval.entity.dto.response.MyuserResDTO;
-import com.ims.eval.service.IEvaluationDeptPlanContentService;
-import com.ims.eval.service.IUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * @author hlf
- * @date 2023/4/27 16:03
- * 文件说明：
- */
-@Service
-public class EvaluationDeptPlanContentImpl extends ServiceImpl<EvaluationDeptPlanContentMapper, EvaluationDeptPlanContent> implements IEvaluationDeptPlanContentService {
-
-	@Autowired
-	private IUserService userService;
-
-	@Override
-	public List<EvaluationDeptPlanContent> detailsList(String businessPlanId, String indicatorCategory, HttpServletRequest request) {
-		List<EvaluationDeptPlanContent> evaluationDeptPlanContentList = baseMapper.detailsList(businessPlanId, indicatorCategory);
-		/*Myuser myuser = userService.getSysUser(request);
-		if (null != myuser) {
-			throw new CustomException("暂无权限");
-		} else {
-			for (EvaluationDeptPlanContent evaluationDeptPlanContent : evaluationDeptPlanContentList) {
-				boolean updateMark = false;
-				if (!"".equals(myuser.getDeptId())) {
-					if (myuser.getDeptId().equals(evaluationDeptPlanContent.getDeptId())) {
-						updateMark = true;
-					} else if (myuser.getLoginName().equals("admin")) {
-						updateMark = true;
-					} else {
-						throw new CustomException("暂无权限");
-					}
-				}
-				evaluationDeptPlanContent.setUpdateMark(updateMark);
-			}
-		}*/
-		evaluationDeptPlanContentList.stream().forEach(i->{
-			i.setUpdateMark(true);
-		});
-		return evaluationDeptPlanContentList;
-	}
-}

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

@@ -1,5 +1,7 @@
 package com.ims.eval.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,6 +11,7 @@ import com.ims.eval.dao.EvaluationDeptRatingMapper;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import com.ims.eval.entity.EvaluationDeptRating;
 import com.ims.eval.service.IEvaluationDeptRatingService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -32,18 +35,58 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 	}
 
 	@Override
-	public List<EvaluationDeptRating> listAll(String deptName, String annual) {
-		QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
-
-		if (StringUtils.isNotEmpty(deptName)) {
-			qw.lambda().eq(EvaluationDeptRating::getDeptName, deptName);
+	public boolean saveOrUpdate(EvaluationDeptRating evaluationDeptRating) {
+		if (StringUtils.isEmpty(evaluationDeptRating.getId())){
+			QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(evaluationDeptRating.getDeptId())) {
+				qw.lambda().eq(EvaluationDeptRating::getDeptId, evaluationDeptRating.getDeptId());
+			}
+			if (StringUtils.isNotEmpty(evaluationDeptRating.getAnnual())) {
+				qw.lambda().eq(EvaluationDeptRating::getAnnual, evaluationDeptRating.getAnnual());
+			}
+			EvaluationDeptRating deptRating = baseMapper.selectOne(qw);
+			if (ObjectUtil.isNotNull(deptRating)){
+				return false;
+			}
 		}
-
-		if (StringUtils.isNotEmpty(annual)) {
-			qw.lambda().eq(EvaluationDeptRating::getAnnual, annual);
+		int count = 0;
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJan()) && "A".equals(evaluationDeptRating.getJan())){
+			count += 1;
 		}
-
-		return baseMapper.selectList(qw);
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getFeb()) && "A".equals(evaluationDeptRating.getFeb())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getMar()) && "A".equals(evaluationDeptRating.getMar())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getApr()) && "A".equals(evaluationDeptRating.getApr())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getMay()) && "A".equals(evaluationDeptRating.getMay())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJun()) && "A".equals(evaluationDeptRating.getJun())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJul()) && "A".equals(evaluationDeptRating.getJul())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getAug()) && "A".equals(evaluationDeptRating.getAug())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getSep()) && "A".equals(evaluationDeptRating.getSep())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getOct()) && "A".equals(evaluationDeptRating.getOct())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getNov()) && "A".equals(evaluationDeptRating.getNov())){
+			count += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getDece()) && "A".equals(evaluationDeptRating.getDece())){
+			count += 1;
+		}
+		evaluationDeptRating.setAcount(Convert.toStr(count));
+		return super.saveOrUpdate(evaluationDeptRating);
 	}
-
 }

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

@@ -1,18 +1,24 @@
 package com.ims.eval.service.impl;
 
+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.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.entity.*;
 import com.ims.eval.dao.EvaluationDeptMapper;
+import com.ims.eval.service.IEvaluationDeptIndicatorItemService;
+import com.ims.eval.service.IEvaluationDeptIndicatorService;
 import com.ims.eval.service.IEvaluationDeptService;
 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 java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -26,20 +32,11 @@ import java.util.List;
 @Service
 public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper, EvaluationDept> implements IEvaluationDeptService {
 
-	@Transactional
-	@Override
-	public boolean saveOrUpdate(EvaluationDept entity) {
-		boolean b = false;
-
-		b = super.saveOrUpdate(entity);
-
-		return b;
-	}
+	@Autowired
+	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
 
-	@Override
-	public List<EvaluationDept> listAll(String deptId, String annual) {
-		return baseMapper.selectListAll(deptId, annual);
-	}
+	@Autowired
+	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
 
 	@Override
 	public IPage<EvaluationDept> listPage(Integer pageNum, Integer pageSize, String deptName, String annual) {
@@ -53,8 +50,98 @@ public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper,
 
 	@Transactional
 	@Override
-	public boolean saveBatch(Collection<EvaluationDept> entityList) {
-		boolean b = super.saveBatch(entityList);
+	public boolean saveOrUpdate(EvaluationDept dept) {
+		if (StringUtils.isEmpty(dept.getId())){
+			QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(dept.getDeptId())) {
+				qw.lambda().eq(EvaluationDept::getDeptId, dept.getDeptId());
+			}
+			if (StringUtils.isNotEmpty(dept.getAnnual())) {
+				qw.lambda().eq(EvaluationDept::getAnnual, dept.getAnnual());
+			}
+			EvaluationDept evaluationDept = baseMapper.selectOne(qw);
+			if (ObjectUtil.isNotNull(evaluationDept)){
+				return false;
+			}
+		}
+		boolean b;
+		if (StringUtils.isEmpty(dept.getId())) {
+			String edId = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
+			dept.setId(edId);
+			//默认启用
+			dept.setEnable(true);
+			//新增部门配置信息
+			b = super.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 = super.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();
+					}
+				}
+			}
+		}
 		return b;
 	}
 }

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

@@ -0,0 +1,79 @@
+<?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.EvaluationDeptBusinessAssessmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptBusinessAssessment">
+        <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="dept_code" property="deptCode"/>
+        <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="selectEvaluationDeptBusinessAssessmentVo">
+        select id,
+               responsibility_code,
+               dept_id,
+               dept_name,
+               dept_code,
+               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.EvaluationDeptBusinessAssessment">
+        <include refid="selectEvaluationDeptBusinessAssessmentVo"/>
+        <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>
+            <if test="stage != null and stage != ''">
+                AND stage = #{stage}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,59 @@
+<?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.EvaluationDeptBusinessContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptBusinessContent">
+        <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="dept_code" property="deptCode"/>
+        <result column="serial_number" property="serialNumber"/>
+        <result column="target_name" property="targetName"/>
+        <result column="target_value" property="targetValue"/>
+        <result column="base_score" property="baseScore"/>
+        <result column="completion_status" property="completionStatus"/>
+        <result column="evaluation_criteria" property="evaluationCriteria"/>
+        <result column="evaluation_score" property="evaluationScore"/>
+        <result column="audit_status" property="auditStatus"/>
+        <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="selectEvaluationDeptBusinessContentVo">
+        select id,
+               business_plan_id,
+               dept_id,
+               dept_name,
+               dept_code,
+               serial_number,
+               target_name,
+               target_value,
+               base_score,
+               completion_status,
+               evaluation_criteria,
+               evaluation_score,
+               audit_status,
+               create_time,
+               create_by,
+               update_time,
+               update_by,
+               remark
+        from evaluation_dept_business_content
+    </sql>
+
+    <select id="detailsList" resultType="com.ims.eval.entity.EvaluationDeptBusinessContent">
+        <include refid="selectEvaluationDeptBusinessContentVo"/>
+        where business_plan_id = #{businessPlanId} order by dept_name asc, serial_number asc
+    </select>
+
+    <delete id="removeByBusinessPlanId">
+        delete from evaluation_dept_business_content where business_plan_id = #{businessPlanId}
+    </delete>
+
+</mapper>

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

@@ -8,12 +8,12 @@
         <result column="responsibility_code" property="responsibilityCode"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
+        <result column="dept_code" property="deptCode"/>
         <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="assessment_stage" property="assessmentStage"/>
         <result column="des" property="des"/>
         <result column="review_people" property="reviewPeople"/>
         <result column="review_people_time" property="reviewPeopleTime"/>
@@ -22,7 +22,6 @@
         <result column="final_review_people_time" property="finalReviewPeopleTime"/>
         <result column="final_review_opinion" property="finalReviewOpinion"/>
         <result column="inst_id" property="instId"/>
-        <result column="assessment_inst_id" property="assessmentInstId"/>
         <result column="create_time" property="createTime"/>
         <result column="create_by" property="createBy"/>
         <result column="update_time" property="updateTime"/>
@@ -36,12 +35,12 @@
                responsibility_code,
                dept_id,
                dept_name,
+               dept_code,
                appraisal_year,
                evaluation_category,
                business_class,
                document_status,
                stage,
-               assessment_stage,
                des,
                review_people,
                review_people_time,
@@ -50,7 +49,6 @@
                final_review_people_time,
                final_review_opinion,
                inst_id,
-               assessment_inst_id,
                create_time,
                create_by,
                update_time,

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

@@ -41,20 +41,6 @@
         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>
-        </where>
-        order by create_time desc
-    </select>
-
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDept">
         <include refid="selectEvaluationDeptVo"/>
         <where>

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

@@ -1,51 +0,0 @@
-<?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>
-
-    <select id="detailsList" resultType="com.ims.eval.entity.EvaluationDeptPlanContent">
-        select edpc.id,
-               edpc.business_plan_id,
-               edpc.dept_id,
-               edpc.dept_name,
-               edpc.indicator_id,
-               edpc.indicator_name,
-               edpc.indicator_item_id,
-               edpc.indicator_item_name,
-               edpc.target_value,
-               edpc.audit_status,
-               edii.indicator_category as "indicatorCategory"
-        from evaluation_dept_plan_content edpc
-        left join evaluation_dept_indicator_item edii on edii.id = edpc.indicator_item_id
-        where edpc.business_plan_id = #{businessPlanId} and edii.indicator_category = #{indicatorCategory}
-    </select>
-
-</mapper>

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

@@ -20,8 +20,19 @@
         <result column="oct" property="oct"/>
         <result column="nov" property="nov"/>
         <result column="dece" property="dece"/>
-        <result column="a_count" property="aCount"/>
-        <result column="a_cause" property="aCause"/>
+        <result column="jan_content" property="janContent"/>
+        <result column="feb_content" property="febContent"/>
+        <result column="mar_content" property="marContent"/>
+        <result column="apr_content" property="aprContent"/>
+        <result column="may_content" property="mayContent"/>
+        <result column="jun_content" property="junContent"/>
+        <result column="jul_content" property="julContent"/>
+        <result column="aug_content" property="augContent"/>
+        <result column="sep_content" property="sepContent"/>
+        <result column="oct_content" property="octContent"/>
+        <result column="nov_content" property="novContent"/>
+        <result column="dece_content" property="deceContent"/>
+        <result column="acount" property="acount"/>
         <result column="create_time" property="createTime"/>
         <result column="create_by" property="createBy"/>
         <result column="update_time" property="updateTime"/>
@@ -46,8 +57,19 @@
                oct,
                nov,
                dece,
-               a_count,
-               a_cause,
+               jan_content,
+               feb_content,
+               mar_content,
+               apr_content,
+               may_content,
+               jun_content,
+               jul_content,
+               aug_content,
+               sep_content,
+               oct_content,
+               nov_content,
+               dece_content,
+               acount,
                create_time,
                create_by,
                update_time,