|
|
@@ -1,32 +1,34 @@
|
|
|
package com.xjrsoft.module.student.service.impl;
|
|
|
|
|
|
-import camundajar.impl.scala.concurrent.impl.FutureConvertersImpl;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
-import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.base.entity.BaseSemester;
|
|
|
-import com.xjrsoft.module.base.service.IBaseGradeService;
|
|
|
-import com.xjrsoft.module.base.service.IBaseSemesterService;
|
|
|
-import com.xjrsoft.module.material.entity.MaterialTaskAssign;
|
|
|
import com.xjrsoft.module.student.dto.PbVXsxxsfytbExcelDto;
|
|
|
import com.xjrsoft.module.student.dto.PbVXsxxsfytbPageDto;
|
|
|
import com.xjrsoft.module.student.dto.PersonalPortraitFeeInformationDto;
|
|
|
-import com.xjrsoft.module.student.entity.*;
|
|
|
+import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
|
|
|
+import com.xjrsoft.module.student.entity.PbSemesterConfig;
|
|
|
+import com.xjrsoft.module.student.entity.PbVXsxxsfytb;
|
|
|
import com.xjrsoft.module.student.mapper.PbVXsxxsfytbMapper;
|
|
|
-import com.xjrsoft.module.student.service.IPbSemesterConfigService;
|
|
|
import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
|
|
|
-import com.xjrsoft.module.student.vo.*;
|
|
|
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbExcelVo;
|
|
|
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbPageVo;
|
|
|
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbPersonal;
|
|
|
+import com.xjrsoft.module.student.vo.PbVXsxxsfytbPersonalMap;
|
|
|
+import com.xjrsoft.module.student.vo.PersonalPortraitFeeInformationVo;
|
|
|
import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -108,7 +110,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
|
|
|
|
|
|
MPJLambdaWrapper<PbVXsxxsfytb> pbVXsxxsfytbMPJLambdaWrapper = new MPJLambdaWrapper<>();
|
|
|
if (dto.getSemesterId() != null && dto.getSemesterId() > 0) {
|
|
|
- pbVXsxxsfytbMPJLambdaWrapper.exists("select 1 from `pb_semester_config` where base_semester_id = " + dto.getSemesterId() + " and beltcode = pb_v_xsxxsfytb.beltcode");
|
|
|
+ pbVXsxxsfytbMPJLambdaWrapper.exists("select 1 from `pb_semester_config` where base_semester_id = " + dto.getSemesterId() + " and beltcode = t.beltcode");
|
|
|
}
|
|
|
|
|
|
pbVXsxxsfytbMPJLambdaWrapper
|
