|
|
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
import com.alibaba.excel.write.merge.LoopMergeStrategy;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
@@ -310,20 +311,25 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
|
|
|
return "已经评价,请勿重复评价";
|
|
|
}
|
|
|
|
|
|
- if(dto.getSubmitType() != null && dto.getSubmitType() == 1){
|
|
|
+ if(dto.getSubmitType() != null && dto.getSubmitType() == 2){
|
|
|
//评价结果保存
|
|
|
- List<AddEvaluateResultDto> resultList = dto.getResultList();
|
|
|
- for (AddEvaluateResultDto addEvaluateResultDto : resultList) {
|
|
|
- EvaluateResult evaluateResult = BeanUtil.toBean(addEvaluateResultDto, EvaluateResult.class);
|
|
|
- evaluateResult.setEvaluatedObject(mobileResultPageVo.getEvaluateType());
|
|
|
- evaluateResult.setUserId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
|
|
|
- evaluateResult.setEvaluatedObjectId(Long.parseLong(mobileResultPageVo.getEvaluateObjectId()));
|
|
|
- evaluateResult.setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
- evaluateResult.setEnabledMark(EnabledMark.ENABLED.getCode());
|
|
|
- evaluateResult.setCreateDate(createDate);
|
|
|
- evaluateResult.setSubmitRecordId(mobileResultPageVo.getEvaluateSubmitRecordId());
|
|
|
- evaluateResultMapper.insert(evaluateResult);
|
|
|
- }
|
|
|
+ evaluateResultMapper.delete(
|
|
|
+ new QueryWrapper<EvaluateResult>().lambda()
|
|
|
+ .eq(EvaluateResult::getSubmitRecordId, mobileResultPageVo.getEvaluateSubmitRecordId())
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ List<AddEvaluateResultDto> resultList = dto.getResultList();
|
|
|
+ for (AddEvaluateResultDto addEvaluateResultDto : resultList) {
|
|
|
+ EvaluateResult evaluateResult = BeanUtil.toBean(addEvaluateResultDto, EvaluateResult.class);
|
|
|
+ evaluateResult.setEvaluatedObject(mobileResultPageVo.getEvaluateType());
|
|
|
+ evaluateResult.setUserId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
|
|
|
+ evaluateResult.setEvaluatedObjectId(Long.parseLong(mobileResultPageVo.getEvaluateObjectId()));
|
|
|
+ evaluateResult.setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
+ evaluateResult.setEnabledMark(EnabledMark.ENABLED.getCode());
|
|
|
+ evaluateResult.setCreateDate(createDate);
|
|
|
+ evaluateResult.setSubmitRecordId(mobileResultPageVo.getEvaluateSubmitRecordId());
|
|
|
+ evaluateResultMapper.insert(evaluateResult);
|
|
|
}
|
|
|
|
|
|
|