1、绑定知识点bug修复

beetlsql3-dev
wgf 2 years ago
parent 32559ed30a
commit eaf5c097cd

@ -132,33 +132,36 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ
* @return * @return
*/ */
@Transactional @Transactional
public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery) { public JsonResult addBindingKnowledge(TeacherOpenCourseKnowledgePointRelationQuery pointRelationQuery,boolean isBindingKnowledgePoint) {
String teacherOpenCourseKnowledgePointIdPlural = Objects.isNull(pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural()) ? "" : pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural(); String teacherOpenCourseKnowledgePointIdPlural = Objects.isNull(pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural()) ? "" : pointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural();
String[] knowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural.split(","); String[] knowledgePointIdPlural = teacherOpenCourseKnowledgePointIdPlural.split(",");
if (!isBindingKnowledgePoint){
//先解绑
List<TeacherOpenCourseKnowledgePointRelation> pointRelationList = sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class)
.andEq(TeacherOpenCourseKnowledgePointRelation::getBussinessId, pointRelationQuery.getBussinessId())
.andEq(TeacherOpenCourseKnowledgePointRelation::getDelFlag, 0)
.andEq(TeacherOpenCourseKnowledgePointRelation::getOrgId, pointRelationQuery.getOrgId())
.andEq(TeacherOpenCourseKnowledgePointRelation::getUserId, pointRelationQuery.getUserId())
.select();
//先解绑
List<TeacherOpenCourseKnowledgePointRelation> pointRelationList = sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class)
.andEq(TeacherOpenCourseKnowledgePointRelation::getBussinessId, pointRelationQuery.getBussinessId())
.andEq(TeacherOpenCourseKnowledgePointRelation::getDelFlag, 0)
.andEq(TeacherOpenCourseKnowledgePointRelation::getOrgId, pointRelationQuery.getOrgId())
.andEq(TeacherOpenCourseKnowledgePointRelation::getUserId, pointRelationQuery.getUserId())
.select();
pointRelationList.stream().filter(item -> { pointRelationList.stream().filter(item -> {
boolean b = true; boolean b = true;
for (String s : knowledgePointIdPlural) { for (String s : knowledgePointIdPlural) {
if (Objects.equals(s, item.getTeacherOpenCourseKnowledgePointId().toString())) { if (Objects.equals(s, item.getTeacherOpenCourseKnowledgePointId().toString())) {
b = false; b = false;
break; break;
}
} }
} return b;
return b; }).collect(Collectors.toList()).forEach(item -> {
}).collect(Collectors.toList()).forEach(item -> { sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class)
sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class) .andEq(TeacherOpenCourseKnowledgePointRelation::getTeacherOpenCourseKnowledgeRelationId, item.getTeacherOpenCourseKnowledgeRelationId())
.andEq(TeacherOpenCourseKnowledgePointRelation::getTeacherOpenCourseKnowledgeRelationId, item.getTeacherOpenCourseKnowledgeRelationId()) .delete();
.delete(); });
}); }
//绑定、修改 //绑定、修改

@ -181,7 +181,7 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService<Teac
relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(teacherOpenCourseKnowledgePointQuery.getTeacherOpenCourseKnowledgePointId().toString()); relationQuery.setTeacherOpenCourseKnowledgePointIdPlural(teacherOpenCourseKnowledgePointQuery.getTeacherOpenCourseKnowledgePointId().toString());
relationQuery.setBussinessType(1L); relationQuery.setBussinessType(1L);
relationQuery.setBussinessId(teacherOpenCourseKnowledgePointQuery.getBussinessId()); relationQuery.setBussinessId(teacherOpenCourseKnowledgePointQuery.getBussinessId());
relationService.addBindingKnowledge(relationQuery); relationService.addBindingKnowledge(relationQuery,true);
} }
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();

@ -219,7 +219,7 @@ public class TeacherOpenCourseKnowledgePointRelationController{
teacherOpenCourseKnowledgePointRelationQuery.setOrgId(coreUser.getOrgId()); teacherOpenCourseKnowledgePointRelationQuery.setOrgId(coreUser.getOrgId());
teacherOpenCourseKnowledgePointRelationQuery.setCreateTime(new Date()); teacherOpenCourseKnowledgePointRelationQuery.setCreateTime(new Date());
teacherOpenCourseKnowledgePointRelationQuery.setDelFlag(0); teacherOpenCourseKnowledgePointRelationQuery.setDelFlag(0);
return teacherOpenCourseKnowledgePointRelationService.addBindingKnowledge(teacherOpenCourseKnowledgePointRelationQuery); return teacherOpenCourseKnowledgePointRelationService.addBindingKnowledge(teacherOpenCourseKnowledgePointRelationQuery,false);
} }
} }

Loading…
Cancel
Save