部门、个人自动考核指标bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

 package com.mortals.xhx.module.feedback.service.impl;
-import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.service.FeedbackStaffService;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.feedback.dao.FeedbackDao;
-import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
-import com.mortals.xhx.module.feedback.model.FeedbackQuestionQuery;
 import com.mortals.xhx.module.feedback.service.FeedbackQuestionService;
 import org.springframework.util.ObjectUtils;
 
@@ -33,7 +30,15 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     private FeedbackQuestionService feedbackQuestionService;
     @Autowired
     private FeedbackStaffService feedbackStaffService;
-    
+
+    @Override
+    protected void saveBefore(FeedbackEntity entity, Context context) throws AppException {
+        super.saveBefore(entity,context);
+        if(!ObjectUtils.isEmpty(entity.getStaffList())){
+            entity.setInviteNum(entity.getStaffList().size());
+        }
+    }
+
     @Override
     protected void saveAfter(FeedbackEntity entity, Context context) throws AppException {
         if(!ObjectUtils.isEmpty(entity.getFeedbackQuestionList())){
@@ -73,6 +78,20 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             }).count();
             feedbackQuestionService.save(entity.getFeedbackQuestionList());
         }
+        if(!ObjectUtils.isEmpty(entity.getStaffList())){
+            Long[] feedbackStaffIds = feedbackStaffService.find(new FeedbackStaffQuery().feedbackId(entity.getId())).stream().map(FeedbackStaffEntity::getId).toArray(Long[]::new);
+            feedbackStaffService.remove(feedbackStaffIds,context);
+            List<FeedbackStaffEntity> staffEntityList = new ArrayList<>();
+            for(Long staffId:entity.getStaffList()){
+                FeedbackStaffEntity feedbackStaffEntity = new FeedbackStaffEntity();
+                feedbackStaffEntity.setFeedbackId(entity.getId());
+                feedbackStaffEntity.setStaffId(staffId);
+                feedbackStaffEntity.setCreateTime(new Date());
+                feedbackStaffEntity.setCreateUserId(this.getContextUserId(context));
+                staffEntityList.add(feedbackStaffEntity);
+            }
+            feedbackStaffService.save(staffEntityList,context);
+        }
         super.updateAfter(entity, context);
     }
 
@@ -80,6 +99,8 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
         List<FeedbackQuestionEntity> feedbackQuestionlist = feedbackQuestionService.find(new FeedbackQuestionQuery().feedbackIdList(Arrays.asList(ids)));
         feedbackQuestionService.removeList(feedbackQuestionlist,context);
+        List<FeedbackStaffEntity> staffEntityList = feedbackStaffService.find(new FeedbackStaffQuery().feedbackIdList(Arrays.asList(ids)));
+        feedbackStaffService.removeList(staffEntityList,context);
         super.removeAfter(ids, context, result);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformDeptConfServiceImpl.java

@@ -60,6 +60,27 @@ public class PerformDeptConfServiceImpl extends AbstractCRUDServiceImpl<PerformD
         }
     }
 
+    @Override
+    protected void updateAfter(PerformDeptConfEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getDeptConfDetail())){
+            Long[] detailIds = performDeptConfDetailService.find(new PerformDeptConfDetailQuery().deptConfId(entity.getId())).stream().map(PerformDeptConfDetailEntity::getId).toArray(Long[]::new);
+            performDeptConfDetailService.remove(detailIds,context);
+            for(PerformDeptConfDetailEntity item:entity.getDeptConfDetail()){
+                item.setDeptConfId(entity.getId());
+                item.setCreateTime(entity.getCreateTime());
+                item.setCreateUser(entity.getCreateUser());
+                item.setDeptId(entity.getDeptId());
+                item.setDeptName(entity.getDeptName());
+                PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId());
+                if(categoryEntity!=null){
+                    item.setCategoryName(categoryEntity.getName());
+                }
+                item.setId(null);
+            }
+            performDeptConfDetailService.save(entity.getDeptConfDetail(),context);
+        }
+    }
+
     @Override
     protected void saveBefore(PerformDeptConfEntity entity, Context context) throws AppException {
         super.saveBefore(entity,context);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java

@@ -92,6 +92,23 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
         }
     }
 
+    @Override
+    protected void saveAfter(PerformStaffConfEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getStaffConfDetail())){
+            for(PerformStaffConfDetailEntity item:entity.getStaffConfDetail()){
+                item.setStaffConfId(entity.getId());
+                item.setCreateTime(entity.getCreateTime());
+                item.setCreateUser(entity.getCreateUser());
+                item.setId(null);
+                PerformRulesCategoryEntity categoryEntity = performRulesCategoryService.get(item.getCategoryId());
+                if(categoryEntity!=null){
+                    item.setCategoryName(categoryEntity.getName());
+                }
+            }
+            performStaffConfDetailService.save(entity.getStaffConfDetail(),context);
+        }
+    }
+
     @Override
     protected void updateBefore(PerformStaffConfEntity entity, Context context) throws AppException {
         super.updateBefore(entity,context);
@@ -114,8 +131,10 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
     }
 
     @Override
-    protected void saveAfter(PerformStaffConfEntity entity, Context context) throws AppException {
+    protected void updateAfter(PerformStaffConfEntity entity, Context context) throws AppException {
         if(CollectionUtils.isNotEmpty(entity.getStaffConfDetail())){
+            Long[] detailIds = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId())).stream().map(PerformStaffConfDetailEntity::getId).toArray(Long[]::new);
+            performStaffConfDetailService.remove(detailIds,context);
             for(PerformStaffConfDetailEntity item:entity.getStaffConfDetail()){
                 item.setStaffConfId(entity.getId());
                 item.setCreateTime(entity.getCreateTime());