修改问题

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

@@ -2,17 +2,19 @@ package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
-import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessAssessment;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
 import com.ims.eval.entity.custom.Path;
+import com.ims.eval.entity.dto.request.DeptDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptBusinessAssessmentService;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
+import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.WordUtil;
 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 javax.servlet.http.HttpServletResponse;
@@ -56,12 +58,12 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
 		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "deptId") String deptId,
 		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
-		@RequestParam(value = "stage", required = false) String stage,
-		@RequestParam(value = "deptId", required = false) String deptId) {
-		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage, deptId);
+		@RequestParam(value = "stage", required = false) String stage) {
+		IPage<EvaluationDeptBusinessAssessment> list = evaluationDeptBusinessAssessmentService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage);
 		return R.ok().data(list);
 	}
 
@@ -87,17 +89,17 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = evaluationDeptBusinessAssessmentService.getById(id);
 		String[] deptIds = evaluationDeptBusinessAssessment.getDeptId().split(",");
 		String[] deptNames = evaluationDeptBusinessAssessment.getDeptName().split(",");
-		List<EvaluationDept> evaluationDeptList = new ArrayList<>();
+		List<DeptDTO> deptList = new ArrayList<>();
 		for (int i = 0; i < deptIds.length; i++) {
-			EvaluationDept evaluationDept = new EvaluationDept();
-			evaluationDept.setDeptId(deptIds[i]);
-			evaluationDept.setDeptName(deptNames[i]);
+			DeptDTO dept = new DeptDTO();
+			dept.setDeptId(deptIds[i]);
+			dept.setDeptName(deptNames[i]);
 			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptIds[i]);
-			evaluationDept.setList(evaluationDeptBusinessContentList);
-			evaluationDeptList.add(evaluationDept);
+			dept.setList(evaluationDeptBusinessContentList);
+			deptList.add(dept);
 		}
 		dataMap.put("appraisalYear", evaluationDeptBusinessAssessment.getAppraisalYear());
-		dataMap.put("list", evaluationDeptList);
+		dataMap.put("list", deptList);
 		String fileName = evaluationDeptBusinessAssessment.getAppraisalYear() + "年度经营业绩完成情况.doc";
 		WordUtil.generateWord(dataMap, "template_dbkp_wcqk.ftl", Path.getStatementPath(), fileName);
 		return R.ok().data(fileName);
@@ -189,4 +191,75 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		EvaluationDeptBusinessAssessment evaluationDeptBusinessAssessment = evaluationDeptBusinessAssessmentService.getById(id);
 		return R.ok().data(evaluationDeptBusinessAssessment);
 	}
+
+	/**
+	 * 校验审核状态
+	 *
+	 * @param id 主键
+	 * @return 结果
+	 */
+	@GetMapping(value = "/checkAuditStatus/{id}/{deptId}")
+	public R checkAuditStatus(@PathVariable String id, @PathVariable String deptId) {
+		boolean b = true;
+		List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptId);
+		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+			if (!"0".equals(evaluationDeptBusinessContent.getAuditStatusKp())) {
+				b = false;
+				break;
+			}
+		}
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.customError("行数据审核状态未通过！");
+		}
+	}
+
+	/**
+	 * 导入
+	 *
+	 * @param file 文件
+	 * @return 结果
+	 */
+	@PostMapping(value = "/import")
+	public R importData(@RequestParam("file") MultipartFile file, @RequestParam("id") String id) {
+		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.setBusinessPlanId(id);
+					evaluationDeptBusinessContent.setDeptId(str[0]);
+					evaluationDeptBusinessContent.setDeptName(str[1]);
+					evaluationDeptBusinessContent.setSerialNumber(str[2]);
+					evaluationDeptBusinessContent.setTargetName(str[3]);
+					evaluationDeptBusinessContent.setTargetValue(str[4]);
+					evaluationDeptBusinessContent.setEvaluationCriteria(str[5]);
+					evaluationDeptBusinessContent.setBaseScore(str[6]);
+					evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
+				}
+				boolean b = evaluationDeptBusinessContentService.importAssessmentDataList(evaluationDeptBusinessContentList);
+				if (b) {
+					return R.ok().data(b);
+				} else {
+					return R.customError("导入失败！");
+				}
+			} 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/DepartmentalPerformanceIndicatorPlanController.java

@@ -5,10 +5,10 @@ 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.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptBusinessContent;
 import com.ims.eval.entity.EvaluationDeptBusinessPlan;
 import com.ims.eval.entity.custom.Path;
+import com.ims.eval.entity.dto.request.DeptDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationDeptBusinessContentService;
 import com.ims.eval.service.IEvaluationDeptBusinessPlanService;
@@ -55,12 +55,12 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
 		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "deptId") String deptId,
 		@RequestParam(value = "responsibilityCode", required = false) String responsibilityCode,
 		@RequestParam(value = "des", required = false) String des,
 		@RequestParam(value = "appraisalYear", required = false) String appraisalYear,
-		@RequestParam(value = "stage", required = false) String stage,
-		@RequestParam(value = "deptId", required = false) String deptId) {
-		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, responsibilityCode, des, appraisalYear, stage, deptId);
+		@RequestParam(value = "stage", required = false) String stage) {
+		IPage<EvaluationDeptBusinessPlan> list = evaluationDeptBusinessPlanService.listPage(pageNum, pageSize, deptId, responsibilityCode, des, appraisalYear, stage);
 		return R.ok().data(list);
 	}
 
@@ -189,6 +189,42 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	}
 
 	/**
+	 * 详情部门信息
+	 *
+	 * @param id     业务主键
+	 * @param deptId 当前登录人部门主键
+	 * @return 结果
+	 */
+	@GetMapping(value = "/detailDeptData")
+	public R detailDeptData(@RequestParam(value = "id") String id,
+							@RequestParam(value = "deptId") String deptId) {
+		Map<String, String> map = new HashMap<>();
+		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
+		if (null != evaluationDeptBusinessPlan) {
+			if (!"".equals(evaluationDeptBusinessPlan.getDeptId()) && !"".equals(evaluationDeptBusinessPlan.getDeptName())) {
+				String[] deptIds = evaluationDeptBusinessPlan.getDeptId().split(",");
+				String[] deptNames = evaluationDeptBusinessPlan.getDeptName().split(",");
+				if ("23031009".equals(deptId)) {//组织人事部
+					if (deptIds.length == deptNames.length) {
+						for (int i = 0; i < deptIds.length; i++) {
+							map.put(deptIds[i], deptNames[i]);
+						}
+					}
+				} else {
+					if (deptIds.length == deptNames.length) {
+						for (int i = 0; i < deptIds.length; i++) {
+							if (deptId.equals(deptIds[i])) {
+								map.put(deptIds[i], deptNames[i]);
+							}
+						}
+					}
+				}
+			}
+		}
+		return R.ok().data(map);
+	}
+
+	/**
 	 * 导入
 	 *
 	 * @param file 文件
@@ -220,10 +256,9 @@ public class DepartmentalPerformanceIndicatorPlanController {
 					evaluationDeptBusinessContent.setTargetValue(str[4]);
 					evaluationDeptBusinessContent.setEvaluationCriteria(str[5]);
 					evaluationDeptBusinessContent.setBaseScore(str[6]);
-					evaluationDeptBusinessContent.setAuditStatus("-1");
 					evaluationDeptBusinessContentList.add(evaluationDeptBusinessContent);
 				}
-				boolean b = evaluationDeptBusinessContentService.importDataList(evaluationDeptBusinessContentList);
+				boolean b = evaluationDeptBusinessContentService.importPlanDataList(evaluationDeptBusinessContentList);
 				if (b) {
 					return R.ok().data(b);
 				} else {
@@ -272,23 +307,23 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		EvaluationDeptBusinessPlan evaluationDeptBusinessPlan = evaluationDeptBusinessPlanService.getById(id);
 		String[] deptIds = evaluationDeptBusinessPlan.getDeptId().split(",");
 		String[] deptNames = evaluationDeptBusinessPlan.getDeptName().split(",");
-		List<EvaluationDept> evaluationDeptList = new ArrayList<>();
+		List<DeptDTO> deptList = new ArrayList<>();
 		for (int i = 0; i < deptIds.length; i++) {
-			EvaluationDept evaluationDept = new EvaluationDept();
-			evaluationDept.setDeptId(deptIds[i]);
-			evaluationDept.setDeptName(deptNames[i]);
+			DeptDTO dept = new DeptDTO();
+			dept.setDeptId(deptIds[i]);
+			dept.setDeptName(deptNames[i]);
 			List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList = evaluationDeptBusinessContentService.selectEvaluationDeptBusinessContentListByBusinessPlanId(id, deptIds[i]);
 			if (evaluationDeptBusinessContentList.size() > 0) {
-				evaluationDept.setEvaluationDeptBusinessContent(evaluationDeptBusinessContentList.get(0));
+				dept.setEvaluationDeptBusinessContent(evaluationDeptBusinessContentList.get(0));
 				if (evaluationDeptBusinessContentList.size() > 1) {
 					evaluationDeptBusinessContentList.remove(0);
-					evaluationDept.setList(evaluationDeptBusinessContentList);
+					dept.setList(evaluationDeptBusinessContentList);
 				}
 			}
-			evaluationDeptList.add(evaluationDept);
+			deptList.add(dept);
 		}
 		dataMap.put("appraisalYear", evaluationDeptBusinessPlan.getAppraisalYear());
-		dataMap.put("list", evaluationDeptList);
+		dataMap.put("list", deptList);
 		String fileName = evaluationDeptBusinessPlan.getAppraisalYear() + "年度经营业绩指标计划.doc";
 		WordUtil.generateWord(dataMap, "template_dbkp_zbjh.ftl", Path.getStatementPath(), fileName);
 		return R.ok().data(fileName);

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

@@ -1,150 +0,0 @@
-package com.ims.eval.controller;
-
-
-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.IEvaluationDeptIndicatorItemService;
-import com.ims.eval.service.IEvaluationDeptIndicatorService;
-import com.ims.eval.service.IEvaluationDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * 考评部门配置
- *
- * @author hlf
- * @date 2023/4/25 9:34
- * 文件说明：
- */
-@RestController
-@RequestMapping("//evaluation-dept")
-public class EvaluationDeptController {
-
-	@Autowired
-	private IEvaluationDeptService evaluationDeptService;
-
-	@Autowired
-	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
-
-	@Autowired
-	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
-
-	/**
-	 * 考评部门配置列表信息（分页）
-	 *
-	 * @param pageNum  当前记录起始索引
-	 * @param pageSize 每页显示记录数
-	 * @param deptName 部门名称
-	 * @param annual   年度
-	 * @return 结果
-	 */
-	@GetMapping(value = "list")
-	public R list(
-		@RequestParam(value = "pageNum") Integer pageNum,
-		@RequestParam(value = "pageSize") Integer pageSize,
-		@RequestParam(value = "deptName", required = false) String deptName,
-		@RequestParam(value = "annual", required = false) String annual) {
-		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());
-			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
-				List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicator.getId());
-				evaluationDeptIndicator.setEvaluationDeptIndicatorItemList(evaluationDeptIndicatorItemList);
-			}
-			evaluationDept.setEvaluationDeptIndicatorList(evaluationDeptIndicatorList);
-		}
-		return R.ok().data(list);
-	}
-
-	/**
-	 * 考评部门配置信息
-	 *
-	 * @return 结果
-	 */
-	@GetMapping(value = "listAll")
-	public R listAll() {
-		List<EvaluationDept> list = evaluationDeptService.list();
-		for (EvaluationDept evaluationDept : list) {
-			List<EvaluationDeptIndicator> evaluationDeptIndicatorList = evaluationDeptIndicatorService.selectEvaluationDeptIndicatorListByEvaluationDeptId(evaluationDept.getId());
-			for (EvaluationDeptIndicator evaluationDeptIndicator : evaluationDeptIndicatorList) {
-				List<EvaluationDeptIndicatorItem> evaluationDeptIndicatorItemList = evaluationDeptIndicatorItemService.selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId(evaluationDeptIndicator.getId());
-				evaluationDeptIndicator.setEvaluationDeptIndicatorItemList(evaluationDeptIndicatorItemList);
-			}
-			evaluationDept.setEvaluationDeptIndicatorList(evaluationDeptIndicatorList);
-		}
-		return R.ok().data(list);
-	}
-
-	/**
-	 * 新增/修改考评部门配置信息
-	 *
-	 * @param dept 考评部门实体
-	 * @return 结果
-	 */
-	@PostMapping(value = "/save")
-	public R addAll(@RequestBody EvaluationDept dept) {
-		try {
-			boolean b = evaluationDeptService.saveOrUpdate(dept);
-			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;
-		b = evaluationDeptService.removeByIds(Arrays.asList(strings));
-		for (String id : strings) {
-			QueryWrapper<EvaluationDeptIndicator> qw1 = new QueryWrapper<>();
-			if (StringUtils.isNotEmpty(id)) {
-				qw1.lambda().eq(EvaluationDeptIndicator::getEvaluationDeptId, id);
-			}
-			b = evaluationDeptIndicatorService.remove(qw1);
-			QueryWrapper<EvaluationDeptIndicatorItem> qw2 = new QueryWrapper<>();
-			if (StringUtils.isNotEmpty(id)) {
-				qw2.lambda().eq(EvaluationDeptIndicatorItem::getEvaluationDeptId, id);
-			}
-			b = evaluationDeptIndicatorItemService.remove(qw2);
-		}
-		if (b) {
-			return R.ok().data(b);
-		} else {
-			return R.error().data("删除失败！");
-		}
-	}
-
-	/**
-	 * 删除考评部门指标项信息
-	 *
-	 * @param id
-	 * @return
-	 */
-	@PostMapping(value = "/remove/{id}")
-	public R delete(@PathVariable("id") String id) {
-		boolean b = evaluationDeptIndicatorItemService.removeById(id);
-		if (b) {
-			return R.ok().data(b);
-		} else {
-			return R.error().data("删除失败！");
-		}
-	}
-}

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

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 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, @Param("deptId") String deptId);
+	IPage<EvaluationDeptBusinessAssessment> selectListPage(Page<EvaluationDeptBusinessAssessment> page, @Param("deptId") String deptId, @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/EvaluationDeptBusinessPlanMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface EvaluationDeptBusinessPlanMapper extends BaseMapper<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("responsibilityCode") String responsibilityCode, @Param("des") String des, @Param("appraisalYear") String appraisalYear, @Param("stage") String stage, @Param("deptId") String deptId);
+	IPage<EvaluationDeptBusinessPlan> selectListPage(Page<EvaluationDeptBusinessPlan> page, @Param("deptId") String deptId, @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/EvaluationDeptIndicatorItemMapper.java

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

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

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

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

@@ -1,22 +0,0 @@
-package com.ims.eval.dao;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ims.eval.entity.EvaluationDept;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 考评部门 Mapper 接口
- * </p>
- *
- * @author wang
- * @since 2023-03-06
- */
-public interface EvaluationDeptMapper extends BaseMapper<EvaluationDept> {
-
-    IPage<EvaluationDept> selectListPage(Page<EvaluationDept> page, @Param("deptName") String deptName, @Param("annual") String annual);
-}

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

@@ -1,113 +0,0 @@
-package com.ims.eval.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 考评部门
- * </p>
- *
- * @author wang
- * @since 2023-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EvaluationDept extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private String id;
-
-    /**
-     * 公司编码
-     */
-    private String companyId;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 公司简称
-     */
-    private String shortCompanyName;
-
-    /**
-     * 部门编码
-     */
-    private String deptId;
-
-    /**
-     * 部门名称
-     */
-    private String deptName;
-
-    /**
-     * 部门简称
-     */
-    private String shortDeptName;
-
-	/**
-	 * 考评类别
-	 */
-	private String evaluationCategory;
-
-    /**
-     * 年度
-     */
-    private String annual;
-
-	/**
-	 * 是否启用
-	 */
-	private boolean enable;
-
-	/**
-	 * 描述
-	 */
-	private String des;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-	/**
-	 * 指标组
-	 */
-	@TableField(exist = false)
-	private List<EvaluationDeptIndicator> evaluationDeptIndicatorList;
-
-	//生成报表word数据集合
-	@TableField(exist = false)
-	private List<EvaluationDeptBusinessContent> list;
-
-	//生成报表word数据
-	@TableField(exist = false)
-	private EvaluationDeptBusinessContent evaluationDeptBusinessContent;
-}

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

@@ -38,11 +38,6 @@ public class EvaluationDeptBusinessAssessment extends Model {
 	private String deptName;
 
 	/**
-	 * 考评部门编码
-	 */
-	private String deptCode;
-
-	/**
 	 * 考评年度
 	 */
 	private String appraisalYear;

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessContent.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;
@@ -38,11 +39,6 @@ public class EvaluationDeptBusinessContent extends Model {
 	private String deptName;
 
 	/**
-	 * 考评部门编码
-	 */
-	private String deptCode;
-
-	/**
 	 * 序号
 	 */
 	private String serialNumber;
@@ -78,11 +74,16 @@ public class EvaluationDeptBusinessContent extends Model {
 	private String evaluationScore;
 
 	/**
-	 * 审核状态(-1待审核、0已通过、-2未通过、1已批准)
+	 * 计划审核状态(-1待审核、0已通过、-2未通过)
 	 */
 	private String auditStatus;
 
 	/**
+	 * 考评审核状态(-1待审核、0已通过、-2未通过)
+	 */
+	private String auditStatusKp;
+
+	/**
 	 * 创建时间
 	 */
 	private Date createTime;
@@ -98,6 +99,11 @@ public class EvaluationDeptBusinessContent extends Model {
 	private String createName;
 
 	/**
+	 * 创建者部门
+	 */
+	private String createDept;
+
+	/**
 	 * 更新时间
 	 */
 	private Date updateTime;
@@ -111,4 +117,10 @@ public class EvaluationDeptBusinessContent extends Model {
 	 * 备注
 	 */
 	private String remark;
+
+	/**
+	 * 当前用户部门
+	 */
+	@TableField(exist = false)
+	private String currentUserDept;
 }

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

@@ -39,11 +39,6 @@ public class EvaluationDeptBusinessPlan extends Model {
 	private String deptName;
 
 	/**
-	 * 考评部门编码
-	 */
-	private String deptCode;
-
-	/**
 	 * 考评年度
 	 */
 	private String appraisalYear;

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

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

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

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

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/DeptDTO.java

@@ -0,0 +1,25 @@
+package com.ims.eval.entity.dto.request;
+
+import com.ims.eval.entity.EvaluationDeptBusinessContent;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author hlf
+ * @date 2023/7/10 16:14
+ * 文件说明：业绩指标计划/考评生成报表部门类
+ */
+@Data
+public class DeptDTO {
+
+	private String deptId;
+
+	private String deptName;
+
+	//生成报表word数据集合
+	private List<EvaluationDeptBusinessContent> list;
+
+	//生成报表word数据
+	private EvaluationDeptBusinessContent evaluationDeptBusinessContent;
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/OrganizationEvaluationRuleDTO.java

@@ -1,7 +1,5 @@
 package com.ims.eval.entity.dto.request;
 
-import com.ims.eval.entity.EvaluationDept;
-import com.ims.eval.entity.EvaluationUnit;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.entity.OrganizationStructure;
 import io.swagger.annotations.ApiModel;

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessAssessmentService extends IService<EvaluationDeptBusinessAssessment> {
 
-	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId);
+	IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, 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

@@ -20,5 +20,7 @@ public interface IEvaluationDeptBusinessContentService extends IService<Evaluati
 
 	List<EvaluationDeptBusinessContent> selectEvaluationDeptBusinessContentListByBusinessPlanId(String businessPlanId, String deptId);
 
-	boolean importDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
+	boolean importPlanDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
+
+	boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList);
 }

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptBusinessPlanService extends IService<EvaluationDeptBusinessPlan> {
 
-	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId);
+	IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage);
 
 	boolean save(EvaluationDeptBusinessPlan evaluationDeptBusinessPlan);
 

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

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

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

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

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

@@ -1,23 +0,0 @@
-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;
-
-/**
- * <p>
- * 考评部门 服务类
- * </p>
- *
- * @author wang
- * @since 2023-03-06
- */
-public interface IEvaluationDeptService extends IService<EvaluationDept> {
-
-	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/impl/EvaluationDeptBusinessAssessmentServiceImpl.java

@@ -21,16 +21,16 @@ import java.util.List;
 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, String deptId) {
+	public IPage<EvaluationDeptBusinessAssessment> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
+		if ("23031009".equals(deptId)){//组织人事部
+			deptId = "";
+		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessAssessment> page = new Page<>(pageNum, pageSize);
-		if ("23031009".equals(deptId)){
-			deptId = "";
-		}
-		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage, deptId);
+		return baseMapper.selectListPage(page, deptId, responsibilityCode, des, appraisalYear, stage);
 	}
 
 	@Override

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

@@ -28,7 +28,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 
 	@Override
 	public List<EvaluationDeptBusinessContent> detailsList(String businessPlanId, String deptId) {
-		if ("23031009".equals(deptId)) {
+		if ("23031009".equals(deptId)) {//组织人事部
 			deptId = "";
 		}
 		return baseMapper.detailsList(businessPlanId, deptId);
@@ -66,32 +66,66 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 					b = false;
 				}
 			} else {//修改
-				QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
-				}
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-				}
-				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-					qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-				}
-				List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
-				if (objList2.size() == 1) {
-					list2.add(evaluationDeptBusinessContent);
-				} else if (objList2.size() == 0) {
-					QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
+				evaluationDeptBusinessContent.setCreateDept(null);
+				if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
+					QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
+						qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
+					}
 					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-						qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+						qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
 					}
 					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
 						qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
 					}
-					List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
-					if (objList3.size() == 0) {
+					List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
+					if (objList2.size() == 1) {
 						list2.add(evaluationDeptBusinessContent);
-					} else {
-						b = false;
+					} else if (objList2.size() == 0) {
+						QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+							qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+						}
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+						}
+						List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
+						if (objList3.size() == 0) {
+							list2.add(evaluationDeptBusinessContent);
+						} else {
+							b = false;
+						}
+					}
+				} else {
+					if ("23031009".equals(evaluationDeptBusinessContent.getCurrentUserDept())) {//组织人事部
+						QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
+						}
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+						}
+						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+							qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+						}
+						List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
+						if (objList2.size() == 1) {
+							list2.add(evaluationDeptBusinessContent);
+						} else if (objList2.size() == 0) {
+							QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
+							if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+								qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+							}
+							if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+								qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+							}
+							List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
+							if (objList3.size() == 0) {
+								list2.add(evaluationDeptBusinessContent);
+							} else {
+								b = false;
+							}
+						}
 					}
 				}
 			}
@@ -124,7 +158,7 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 	}
 
 	@Override
-	public boolean importDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
+	public boolean importPlanDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
 		boolean b = false;
 		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
 			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
@@ -136,13 +170,23 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 			}
 			List<EvaluationDeptBusinessContent> objList = super.list(qw);
 			if (objList.size() == 1) {//修改
-				evaluationDeptBusinessContent.setId(objList.get(0).getId());
-				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
-				b = super.updateById(evaluationDeptBusinessContent);
+				if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
+					evaluationDeptBusinessContent.setId(objList.get(0).getId());
+					evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
+					b = super.updateById(evaluationDeptBusinessContent);
+				}else {
+					if ("23031009".equals(evaluationDeptBusinessContent.getCurrentUserDept())) {//组织人事部
+						evaluationDeptBusinessContent.setId(objList.get(0).getId());
+						evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
+						b = super.updateById(evaluationDeptBusinessContent);
+					}
+				}
 			} else if (objList.size() == 0) {//新增
 				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
 				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);
 				if (null != organizationStructure) {
+					evaluationDeptBusinessContent.setAuditStatus("-1");
+					evaluationDeptBusinessContent.setAuditStatusKp("-1");
 					evaluationDeptBusinessContent.setDeptName(organizationStructure.getName());
 					evaluationDeptBusinessContent.setCreateTime(DateUtil.date());
 					b = super.save(evaluationDeptBusinessContent);
@@ -151,4 +195,25 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 		}
 		return b;
 	}
+
+	@Override
+	public boolean importAssessmentDataList(List<EvaluationDeptBusinessContent> evaluationDeptBusinessContentList) {
+		boolean b = false;
+		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : evaluationDeptBusinessContentList) {
+			QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+				qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+			}
+			if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+				qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+			}
+			List<EvaluationDeptBusinessContent> objList = super.list(qw);
+			if (objList.size() == 1) {//修改
+				evaluationDeptBusinessContent.setId(objList.get(0).getId());
+				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
+				b = super.updateById(evaluationDeptBusinessContent);
+			}
+		}
+		return b;
+	}
 }

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

@@ -36,16 +36,16 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 	private IEvaluationDeptBusinessAssessmentService evaluationDeptBusinessAssessmentService;
 
 	@Override
-	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String responsibilityCode, String des, String appraisalYear, String stage, String deptId) {
+	public IPage<EvaluationDeptBusinessPlan> listPage(Integer pageNum, Integer pageSize, String deptId, String responsibilityCode, String des, String appraisalYear, String stage) {
+		if ("23031009".equals(deptId)){//组织人事部
+			deptId = "";
+		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptBusinessPlan> page = new Page<>(pageNum, pageSize);
-		if ("23031009".equals(deptId)){
-			deptId = "";
-		}
-		return baseMapper.selectListPage(page, responsibilityCode, des, appraisalYear, stage, deptId);
+		return baseMapper.selectListPage(page, deptId, responsibilityCode, des, appraisalYear, stage);
 	}
 
 	@Override
@@ -79,7 +79,6 @@ public class EvaluationDeptBusinessPlanServiceImpl extends ServiceImpl<Evaluatio
 				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());

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

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

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

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

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

@@ -1,147 +0,0 @@
-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.*;
-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;
-
-/**
- * <p>
- * 考评部门 服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-03-06
- */
-@Service
-public class EvaluationDeptServiceImpl extends ServiceImpl<EvaluationDeptMapper, EvaluationDept> implements IEvaluationDeptService {
-
-	@Autowired
-	private IEvaluationDeptIndicatorService evaluationDeptIndicatorService;
-
-	@Autowired
-	private IEvaluationDeptIndicatorItemService evaluationDeptIndicatorItemService;
-
-	@Override
-	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);
-	}
-
-	@Transactional
-	@Override
-	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

@@ -8,7 +8,6 @@
         <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"/>

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

@@ -8,7 +8,6 @@
         <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"/>
@@ -17,9 +16,11 @@
         <result column="evaluation_criteria" property="evaluationCriteria"/>
         <result column="evaluation_score" property="evaluationScore"/>
         <result column="audit_status" property="auditStatus"/>
+        <result column="audit_status_kp" property="auditStatusKp"/>
         <result column="create_time" property="createTime"/>
         <result column="create_by" property="createBy"/>
         <result column="create_name" property="createName"/>
+        <result column="create_dept" property="createDept"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_by" property="updateBy"/>
         <result column="remark" property="remark"/>
@@ -40,9 +41,11 @@
                evaluation_criteria,
                evaluation_score,
                audit_status,
+               audit_status_kp,
                create_time,
                create_by,
                create_name,
+               create_dept,
                update_time,
                update_by,
                remark

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

@@ -8,7 +8,6 @@
         <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"/>

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

@@ -1,42 +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.EvaluationDeptIndicatorItemMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptIndicatorItem">
-        <id column="id" property="id"/>
-        <result column="evaluation_dept_id" property="evaluationDeptId"/>
-        <result column="evaluation_dept_indicator_id" property="evaluationDeptIndicatorId"/>
-        <result column="indicator_name" property="indicatorName"/>
-        <result column="indicator_code" property="indicatorCode"/>
-        <result column="indicator_item_name" property="indicatorItemName"/>
-        <result column="indicator_item_code" property="indicatorItemCode"/>
-        <result column="indicator_category" property="indicatorCategory"/>
-        <result column="des" property="des"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="selectEvaluationDeptIndicatorItemVo">
-        select id,
-               evaluation_dept_id,
-               evaluation_dept_indicator_id,
-               indicator_name,
-               indicator_code,
-               indicator_item_name,
-               indicator_item_code,
-               indicator_category,
-               des
-        from evaluation_dept_indicator_item
-    </sql>
-
-    <select id="selectEvaluationDeptIndicatorItemListByEvaluationDeptIndicatorId" resultType="com.ims.eval.entity.EvaluationDeptIndicatorItem">
-        <include refid="selectEvaluationDeptIndicatorItemVo"/>
-        where evaluation_dept_indicator_id = #{evaluationDeptIndicatorId}
-    </select>
-
-    <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/EvaluationDeptIndicatorMapper.xml

@@ -1,27 +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.EvaluationDeptIndicatorMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDeptIndicator">
-        <id column="id" property="id"/>
-        <result column="evaluation_dept_id" property="evaluationDeptId"/>
-        <result column="indicator_name" property="indicatorName"/>
-        <result column="indicator_code" property="indicatorCode"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="selectEvaluationDeptIndicatorVo">
-        select id,
-               evaluation_dept_id,
-               indicator_name,
-               indicator_code
-        from evaluation_dept_indicator
-    </sql>
-
-    <select id="selectEvaluationDeptIndicatorListByEvaluationDeptId" resultType="com.ims.eval.entity.EvaluationDeptIndicator">
-        <include refid="selectEvaluationDeptIndicatorVo"/>
-        where evaluation_dept_id = #{evaluationDeptId}
-    </select>
-
-</mapper>

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

@@ -1,58 +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.EvaluationDeptMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ims.eval.entity.EvaluationDept">
-        <id column="id" property="id"/>
-        <result column="company_id" property="companyId"/>
-        <result column="company_name" property="companyName"/>
-        <result column="short_company_name" property="shortCompanyName"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="dept_name" property="deptName"/>
-        <result column="short_dept_name" property="shortDeptName"/>
-        <result column="evaluation_category" property="evaluationCategory"/>
-        <result column="annual" property="annual"/>
-        <result column="enable" property="enable"/>
-        <result column="des" property="des"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="selectEvaluationDeptVo">
-        select id,
-               company_id,
-               company_name,
-               short_company_name,
-               dept_id,
-               dept_name,
-               short_dept_name,
-               evaluation_category,
-               annual,
-               enable,
-               des,
-               create_time,
-               create_by,
-               update_time,
-               update_by
-        from evaluation_dept
-    </sql>
-
-    <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDept">
-        <include refid="selectEvaluationDeptVo"/>
-        <where>
-            enable = true
-            <if test="deptName != null and deptName != ''">
-                AND dept_name like CONCAT('%',#{deptName},'%')
-            </if>
-            <if test="annual != null and annual != ''">
-                AND annual = #{annual}
-            </if>
-        </where>
-        order by create_time desc
-    </select>
-
-</mapper>