|
|
@@ -3,6 +3,7 @@ package com.xjrsoft.module.student.service.impl;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.yulichang.toolkit.MPJWrappers;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
@@ -11,6 +12,7 @@ import com.xjrsoft.module.base.mapper.BaseClassMapper;
|
|
|
import com.xjrsoft.module.form.entity.FormHistory;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
|
|
|
import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudentCadre;
|
|
|
import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
|
|
|
import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
|
|
|
import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
|
|
|
@@ -44,6 +46,14 @@ public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<B
|
|
|
List<String> classIdList = StrUtil.split(baseStudentAssessmentInspection.getClassIds(), ",");
|
|
|
|
|
|
for (String classId : classIdList) {
|
|
|
+ List<BaseStudentAssessmentClassRelation> list = baseStudentAssessmentClassRelationMapper.selectList(
|
|
|
+ Wrappers.lambdaQuery(BaseStudentAssessmentClassRelation.class)
|
|
|
+ .eq(BaseStudentAssessmentClassRelation::getClassId, classId)
|
|
|
+ .eq(BaseStudentAssessmentClassRelation::getBaseStudentAssessmentInspectionId, dataId)
|
|
|
+ );
|
|
|
+ if(!list.isEmpty() && list.size() > 0){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
BaseStudentAssessmentClassRelation classRelation = new BaseStudentAssessmentClassRelation();
|
|
|
Long classIdAsLong = Convert.toLong(classId);
|
|
|
classRelation.setClassId(classIdAsLong);
|
phoenix