修改部门考评评级数据权限问题

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

@@ -103,13 +103,13 @@ public class DepartmentAllocationController {
 			}
 			EvaluationDept obj = evaluationDeptService.getOne(qw);
 			if (obj != null) {
-				return R.customError("部门重复，请重新添加！");
+				return R.error("部门重复，请重新添加！");
 			}
 			boolean b = evaluationDeptService.saveOrUpdate(evaluationDept);
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -160,7 +160,7 @@ public class DepartmentAllocationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");

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

@@ -52,9 +52,10 @@ public class DepartmentPerformanceAppraisalRatingController {
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
 		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "deptId") String deptId,
 		@RequestParam(value = "deptName", required = false) String deptName,
 		@RequestParam(value = "annual", required = false) String annual) {
-		IPage<EvaluationDeptRating> list = evaluationDeptRatingService.listPage(pageNum, pageSize, deptName, annual);
+		IPage<EvaluationDeptRating> list = evaluationDeptRatingService.listPage(pageNum, pageSize, deptId, deptName, annual);
 		return R.ok().data(list);
 	}
 
@@ -83,7 +84,7 @@ public class DepartmentPerformanceAppraisalRatingController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -104,7 +105,7 @@ public class DepartmentPerformanceAppraisalRatingController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -189,13 +190,13 @@ public class DepartmentPerformanceAppraisalRatingController {
 				if (b) {
 					return R.ok().data(b);
 				} else {
-					return R.customError("导入失败！");
+					return R.error("导入失败！");
 				}
 			} catch (Exception e) {
 				log.error("错误", e);
 				return R.customError(e.getMessage()).data("失败！");
 			}
 		}
-		return R.customError("上传文件为空！");
+		return R.error("上传文件为空！");
 	}
 }

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

@@ -180,7 +180,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("失败！");
+				return R.error("失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -218,7 +218,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 		if (b) {
 			return R.ok().data(b);
 		} else {
-			return R.customError("行数据审核状态未通过！");
+			return R.error("行数据审核状态未通过！");
 		}
 	}
 
@@ -260,13 +260,13 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 				if (b) {
 					return R.ok().data(b);
 				} else {
-					return R.customError("导入失败！");
+					return R.error("导入失败！");
 				}
 			} catch (Exception e) {
 				log.error("错误", e);
 				return R.customError(e.getMessage()).data("失败！");
 			}
 		}
-		return R.customError("上传文件为空！");
+		return R.error("上传文件为空！");
 	}
 }

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

@@ -101,7 +101,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -135,7 +135,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("修改失败！");
+				return R.error("修改失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -156,7 +156,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -211,7 +211,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("新增/修改失败，指标名称重复！");
+				return R.error("新增/修改失败，指标名称重复！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -231,7 +231,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (null != evaluationDeptBusinessContent) {
 				if ("23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//组织人事部添加
 					if (!"23031009".equals(deptId)) {//非组织人事部
-						return R.customError("没有删除权限，删除失败！");
+						return R.error("没有删除权限，删除失败！");
 					}
 				}
 			}
@@ -239,7 +239,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -308,14 +308,14 @@ public class DepartmentalPerformanceIndicatorPlanController {
 				if (b) {
 					return R.ok().data(b);
 				} else {
-					return R.customError("导入失败！");
+					return R.error("导入失败！");
 				}
 			} catch (Exception e) {
 				log.error("错误", e);
 				return R.customError(e.getMessage()).data("失败！");
 			}
 		}
-		return R.customError("上传文件为空！");
+		return R.error("上传文件为空！");
 	}
 
 	/**
@@ -335,7 +335,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("失败！");
+				return R.error("失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -395,7 +395,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 		if (b) {
 			return R.ok().data(b);
 		} else {
-			return R.customError("行数据审核状态未通过！");
+			return R.error("行数据审核状态未通过！");
 		}
 	}
 }

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

@@ -108,7 +108,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -143,7 +143,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("修改失败！");
+				return R.error("修改失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -164,7 +164,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -208,7 +208,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("新增/修改失败或人员已重复！");
+				return R.error("新增/修改失败，人员已重复！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -228,7 +228,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -294,14 +294,14 @@ public class DeptAssessmentDeclarationController {
 				if (b) {
 					return R.ok().data(b);
 				} else {
-					return R.customError("导入失败！");
+					return R.error("导入失败！");
 				}
 			} catch (Exception e) {
 				log.error("错误", e);
 				return R.customError(e.getMessage()).data("失败！");
 			}
 		}
-		return R.customError("上传文件为空！");
+		return R.error("上传文件为空！");
 	}
 
 	/**
@@ -321,7 +321,7 @@ public class DeptAssessmentDeclarationController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("失败！");
+				return R.error("失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");

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

@@ -97,7 +97,7 @@ public class EvaluationRevisionController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("考评修订失败！");
+				return R.error("考评修订失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -145,7 +145,7 @@ public class EvaluationRevisionController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (Exception e) {
 			log.error("错误", e);

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

@@ -102,7 +102,7 @@ public class NoticeManagementController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("保存失败！");
+				return R.error("保存失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -123,7 +123,7 @@ public class NoticeManagementController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除失败！");
+				return R.error("删除失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -159,7 +159,7 @@ public class NoticeManagementController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("失败！");
+				return R.error("失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -195,7 +195,7 @@ public class NoticeManagementController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("上传附件失败！");
+				return R.error("上传附件失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -230,7 +230,7 @@ public class NoticeManagementController {
 			if (b) {
 				return R.ok().data(b);
 			} else {
-				return R.customError("删除附件失败！");
+				return R.error("删除附件失败！");
 			}
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");

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

@@ -4,6 +4,7 @@ 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.EvaluationDeptRating;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author hlf
@@ -12,5 +13,5 @@ import com.ims.eval.entity.EvaluationDeptRating;
  */
 public interface EvaluationDeptRatingMapper extends BaseMapper<EvaluationDeptRating> {
 
-	IPage<EvaluationDeptRating> selectListPage(Page<EvaluationDeptRating> page, String deptName, String annual);
+	IPage<EvaluationDeptRating> selectListPage(Page<EvaluationDeptRating> page, @Param("deptId") String deptId, @Param("deptName") String deptName, @Param("annual") String annual);
 }

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

@@ -34,6 +34,8 @@ public class DeptAssessmentDeclaration extends Model {
 	private String declarationMonth;
 	//申报等级
 	private String declarationLevel;
+	//评定等级
+	private String ratingGrade;
 	//部门领导主键
 	private String deptLeaderId;
 	//部门领导名称

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IEvaluationDeptRatingService extends IService<EvaluationDeptRating> {
 
-	IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptName, String annual);
+	IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptId, String deptName, String annual);
 
 	boolean saveOrUpdate(EvaluationDeptRating evaluationDeptRating);
 

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

@@ -62,6 +62,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		String id = Convert.toStr(IdUtil.getSnowflake(1, 1).nextId());
 		deptAssessmentDeclaration.setId(id);
 		deptAssessmentDeclaration.setOrderNumber("KHSB_GDDL_" + deptAssessmentDeclaration.getAnnual() + "_" + StringUtils.addZeroForStr(String.valueOf(Integer.parseInt(deptAssessmentDeclaration.getDeclarationMonth())), 2, "l") + StringUtils.addZeroForStr(String.valueOf(count + 1), 2, "l"));
+		deptAssessmentDeclaration.setRatingGrade(deptAssessmentDeclaration.getDeclarationLevel());
 		deptAssessmentDeclaration.setStage("流程未启动");
 		deptAssessmentDeclaration.setCreateTime(DateUtil.date());
 		List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = new ArrayList<>();

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

@@ -23,13 +23,16 @@ import java.util.List;
 public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptRatingMapper, EvaluationDeptRating> implements IEvaluationDeptRatingService {
 
 	@Override
-	public IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptName, String annual) {
+	public IPage<EvaluationDeptRating> listPage(Integer pageNum, Integer pageSize, String deptId, String deptName, String annual) {
+		if ("23031009".equals(deptId)) {//组织人事部
+			deptId = "";
+		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<EvaluationDeptRating> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, deptName, annual);
+		return baseMapper.selectListPage(page, deptId, deptName, annual);
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@
         <result column="annual" property="annual" />
         <result column="declaration_month" property="declarationMonth" />
         <result column="declaration_level" property="declarationLevel" />
+        <result column="rating_grade" property="ratingGrade" />
         <result column="dept_leader_id" property="deptLeaderId" />
         <result column="dept_leader_name" property="deptLeaderName" />
         <result column="declaration_reason" property="declarationReason" />
@@ -36,6 +37,7 @@
                annual,
                declaration_month,
                declaration_level,
+               rating_grade,
                dept_leader_id,
                dept_leader_name,
                declaration_reason,

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

@@ -84,6 +84,9 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.EvaluationDeptRating">
         <include refid="selectEvaluationDeptPlanContentVo"/>
         <where>
+            <if test="deptId != null and deptId != ''">
+                AND dept_id = #{deptId}
+            </if>
             <if test="deptName != null and deptName != ''">
                 AND dept_name like CONCAT('%',#{deptName},'%')
             </if>