|
@@ -10,6 +10,7 @@ import com.kcim.dao.model.*;
|
|
import com.kcim.util.BaseUtil;
|
|
import com.kcim.util.BaseUtil;
|
|
import com.kcim.util.PageUtils;
|
|
import com.kcim.util.PageUtils;
|
|
import lombok.val;
|
|
import lombok.val;
|
|
|
|
+import net.sf.jsqlparser.statement.select.GroupByElement;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Repository;
|
|
import org.springframework.stereotype.Repository;
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
@@ -187,6 +188,7 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
|
|
|
|
//调整记录
|
|
//调整记录
|
|
List<QualificationApplyAdjust> listApplyAdjust = applyAdjustRepository.list();
|
|
List<QualificationApplyAdjust> listApplyAdjust = applyAdjustRepository.list();
|
|
|
|
+ Map<Integer, List<QualificationApplyAdjust>> qualificationApplyAdjustMap = listApplyAdjust.stream().collect(Collectors.groupingBy(QualificationApplyAdjust::getQualificationApplyId));
|
|
|
|
|
|
List<QualificationApply> list = this.list(queryWrapper);
|
|
List<QualificationApply> list = this.list(queryWrapper);
|
|
for(QualificationApply apply: list){
|
|
for(QualificationApply apply: list){
|
|
@@ -211,12 +213,16 @@ public class QualificationApplyRepository extends ServiceImpl<QualificationApply
|
|
// .filter(d -> d.getCode().equals(qualification.getOperationLevelCode()))
|
|
// .filter(d -> d.getCode().equals(qualification.getOperationLevelCode()))
|
|
// .findFirst();
|
|
// .findFirst();
|
|
// dic.ifPresent(sysDictionary -> qualification.setOperationLevelName(sysDictionary.getName()));
|
|
// dic.ifPresent(sysDictionary -> qualification.setOperationLevelName(sysDictionary.getName()));
|
|
- qualification.setOperationLevelName(operationLevelMap.get(qualification.getOperationLevelCode()).getName());
|
|
|
|
|
|
+ SysDictionary operationLevel = operationLevelMap.get(qualification.getOperationLevelCode());
|
|
|
|
+ if(operationLevel != null){
|
|
|
|
+ qualification.setOperationLevelName(operationLevel.getName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
apply.setQualificationInfo(qualification);
|
|
apply.setQualificationInfo(qualification);
|
|
|
|
|
|
//调整历史
|
|
//调整历史
|
|
- List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
|
|
|
|
|
|
+ //List<QualificationApplyAdjust> applyAdjustList = listApplyAdjust.stream().filter(a -> a.getQualificationApplyId().equals(apply.getId())).collect(Collectors.toList());
|
|
|
|
+ List<QualificationApplyAdjust> applyAdjustList = qualificationApplyAdjustMap.get(apply.getId());
|
|
|
|
|
|
//调整历史-调整人姓名
|
|
//调整历史-调整人姓名
|
|
for(QualificationApplyAdjust adjust : applyAdjustList){
|
|
for(QualificationApplyAdjust adjust : applyAdjustList){
|