Browse Source

考评项设置

wangyangyang 4 years ago
parent
commit
837bf51599

+ 2 - 0
operation_manager/src/main/java/com/huaxu/evaluation/service/EvaluationItemValueService.java

@@ -55,4 +55,6 @@ public interface EvaluationItemValueService {
      */
     public EvaluationItemValueEntity findEvaluationItemValueById(Long id);
 
+    public boolean saveOrUpdate(EvaluationItemValueEntity evaluationItemValue);
+
 }

+ 8 - 1
operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationItemServiceImpl.java

@@ -44,6 +44,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 自定义分页查询,含关联实体对像
      */
+    @Override
     public IPage<EvaluationItemEntity> findPage(IPage<EvaluationItemEntity> page, EvaluationItemEntity evaluationItemEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if (currentUser != null) {
@@ -82,6 +83,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 查列表
      */
+    @Override
     public List<EvaluationItemEntity> findList(EvaluationItemEntity evaluationItemEntity) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if(currentUser!=null) {
@@ -97,6 +99,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 批量删除
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delEvaluationItemByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
@@ -105,6 +108,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 单个删除
      */
+    @Override
     public boolean delEvaluationItemById(Long id) {
         boolean result = this.removeById(id);
         if (result) {
@@ -116,6 +120,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 保存
      */
+    @Override
     public boolean addEvaluationItem(EvaluationItemEntity evaluationItem) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         for (Integer itemCompanyId : evaluationItem.getDeptOrgIds()) {
@@ -148,6 +153,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 修改根居ID
      */
+    @Override
     public boolean updateEvaluationItemById(EvaluationItemEntity evaluationItem) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         if (this.updateById(evaluationItem)) {
@@ -162,7 +168,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
                 item.setStatus(1);
                 item.setDateUpdate(new Date());
                 item.setDateCreate(new Date());
-                evaluationItemValueService.addEvaluationItemValue(item);
+                evaluationItemValueService.saveOrUpdate(item);
             }
             return true;
         }
@@ -172,6 +178,7 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
     /**
      * 根居ID获取对象
      */
+    @Override
     public EvaluationItemEntity findEvaluationItemById(Long id) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         EvaluationItemEntity entity = evaluationItemMapper.findEvaluationItemById(id);