1

science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationValueService.java

@@ -3,6 +3,7 @@ import com.yiboshi.science.base.BaseService;
 import com.yiboshi.science.entity.ComEvaluationValue;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
+import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
 
 import java.util.List;
@@ -15,4 +16,17 @@ import java.util.List;
  */
 public interface ComEvaluationValueService extends BaseService<ComEvaluationValueQueryVO, ComEvaluationValueDTO, ComEvaluationValue> {
     List<ComEvaluationValueDTO> getListByAssignId(String assignId);
+
+    /**插入列表
+     *
+     * @param list
+     * @param assignId
+     */
+    void insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId);
+
+    /** 删除对象列表
+     *
+     * @param assignId
+     */
+    void deleteListByAssignId(String assignId);
 }

science-admin/src/main/java/com/yiboshi/science/service/ComProjectEquipmentService.java

@@ -34,5 +34,4 @@ public interface ComProjectEquipmentService extends BaseService<ComProjectEquipm
      * @param objectId
      */
     void deleteByObjectId(String objectId);
-
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationValueServiceImpl.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComEvaluationValueDAO;
 import com.yiboshi.science.entity.ComEvaluationValue;
+import com.yiboshi.science.entity.ComProjectEquipment;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
+import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
 import com.yiboshi.science.service.ComEvaluationItemService;
 import com.yiboshi.science.service.ComEvaluationValueService;
@@ -40,8 +42,8 @@ public class ComEvaluationValueServiceImpl extends BaseServiceImpl<ComEvaluation
             dtoList.forEach((e) -> {
                 ComEvaluationValueDTO dto = new ComEvaluationValueDTO();
                 StringUtil.copyObj2Obj(e, dto);
-                dto.setItemId(dto.getId());
-                dto.setAssignId(dto.getId());
+                dto.setItemId(e.getId());
+                dto.setAssignId(assignId);
                 list.add(dto);
             });
         }
@@ -66,4 +68,36 @@ public class ComEvaluationValueServiceImpl extends BaseServiceImpl<ComEvaluation
         });
         return list;
     }
+
+    /**
+     * 插入列表
+     *
+     * @param list
+     * @param assignId
+     */
+    @Override
+    public void insertListByAssignId(List<ComEvaluationValueDTO> list, String assignId) {
+        this.deleteListByAssignId(assignId);
+        if (null != list) {
+            list.forEach((d) -> {
+                if (!isObjectNull(d)) {
+                    d.setAssignId(assignId);
+                    ComEvaluationValue e = convert2Entity(d);
+                    this.insert(e);
+                }
+            });
+        }
+    }
+
+    /**
+     * 删除对象列表
+     *
+     * @param assignId
+     */
+    @Override
+    public void deleteListByAssignId(String assignId) {
+        ComEvaluationValue e = new ComEvaluationValue();
+        e.setAssignId(assignId);
+        this.delete(e);
+    }
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentAssignServiceImpl.java

@@ -148,6 +148,7 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
             throw new BusinessException("专家已评审，不允许删除！");
         this.deleteById(id);
         this.updateAssignState(comTalentAssign.getTalentId());
+        comEvaluationValueService.deleteListByAssignId(id);
         return id;
     }
 
@@ -168,6 +169,7 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
             throw new BusinessException("分配记录不存在或已删除！");
         ComTalentAssign entity = convert2Entity(dto);
         this.update(entity);
+        comEvaluationValueService.insertListByAssignId(dto.getScoreList(),dto.getId());
         if (Objects.nonNull(dto.getAuditState()) && dto.getAuditState().equals(2)) {
             this.updateAssignState(entity.getTalentId());
         }
@@ -220,7 +222,6 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
                     totalScore.add(obj.getTotalScore());
                 }
             }
-
             BigDecimal personCountBD = BigDecimal.valueOf(personCount);
             averageScore = totalScore.divide(personCountBD, 2, RoundingMode.HALF_UP);
             if (list.size() > personCount)