|
|
@@ -10,7 +10,6 @@ import com.xjrsoft.common.enums.DeleteMark;
|
|
|
import com.xjrsoft.common.enums.EnabledMark;
|
|
|
import com.xjrsoft.common.enums.YesOrNoEnum;
|
|
|
import com.xjrsoft.common.exception.MyException;
|
|
|
-import com.xjrsoft.common.model.result.RT;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
|
|
|
import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
|
|
|
@@ -38,7 +37,6 @@ import com.xjrsoft.module.system.entity.DictionaryItem;
|
|
|
import com.xjrsoft.module.system.mapper.DictionarydetailMapper;
|
|
|
import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-import org.camunda.bpm.engine.TaskService;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -358,4 +356,37 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增分班任务后,自动初始化班级数据
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public Boolean initClassByBaseClass(BandingTask bandingTask) {
|
|
|
+ List<BaseClass> classList = classMapper.selectList(
|
|
|
+ new QueryWrapper<BaseClass>().lambda()
|
|
|
+ .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
+ .eq(BaseClass::getGradeId, bandingTask.getGradeId())
|
|
|
+ );
|
|
|
+ List<BandingTaskClass> insList = new ArrayList<>();//新增班级
|
|
|
+ for (BaseClass baseClass : classList) {
|
|
|
+ BandingTaskClass one = new BandingTaskClass();
|
|
|
+ one.setBandingTaskId(bandingTask.getId());
|
|
|
+ one.setIsOrderClass(baseClass.getIsOrderClass());
|
|
|
+ one.setClassType(baseClass.getClassType());
|
|
|
+ one.setTeacherId(baseClass.getTeacherId());
|
|
|
+ one.setMajorSetId(baseClass.getMajorSetId());
|
|
|
+ one.setClassroomId(baseClass.getClassroomId());
|
|
|
+ one.setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
+ one.setCreateDate(new Date());
|
|
|
+ one.setEnabledMark(EnabledMark.ENABLED.getCode());
|
|
|
+ one.setName(baseClass.getName());
|
|
|
+ one.setCreateUserId(StpUtil.getLoginIdAsLong());
|
|
|
+ insList.add(one);
|
|
|
+ }
|
|
|
+ if(!insList.isEmpty()){
|
|
|
+ this.saveBatch(insList);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
}
|