updates

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -351,6 +352,13 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                 List<YxHistoryMajorEnroll> updateList = new ArrayList<>();
                 List<YxHistoryMajorEnroll> list = ExcelImportUtil.importExcel(file.getInputStream(), YxHistoryMajorEnroll.class, params);
                 index = 3;
+                List<String> schoolCodeList = list.stream().filter(l -> StringUtils.isNotBlank(l.getSchoolCode())).map(l -> l.getSchoolCode()).collect(Collectors.toList());
+                AssertUtils.notTrue(CollectionUtils.isEmpty(schoolCodeList),"未读取到学校代码");
+                Map<String,YxSchoolMajor> schoolMajorMap = new LinkedHashMap<>();
+                for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorService.list(new LambdaQueryWrapper<YxSchoolMajor>().in(YxSchoolMajor::getSchoolCode, schoolCodeList))) {
+                    key = yxSchoolMajor.getSchoolCode()+"_"+yxSchoolMajor.getMajorName()+"_"+yxSchoolMajor.getBatch()+"_"+yxSchoolMajor.getCategory();
+                    schoolMajorMap.put(key,yxSchoolMajor);
+                }
                 for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
                     schoolCode = yxHistoryMajorEnroll.getSchoolCode();//学校代码
                     schoolName = yxHistoryMajorEnroll.getSchoolName();//学校名称
@@ -388,6 +396,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
 //                    AssertUtils.notNull(admissionNum, String.format("行[%s],请输入录取人数", index));
                     //=========================================================================
                     majorName = majorName.replace("(", "（").replace(")", "）");
+                    yxHistoryMajorEnroll.setMajorName(majorName);
                     int i = majorName.indexOf("（");
                     mn = majorName;
                     if (i != -1) {
@@ -440,6 +449,9 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                             zhuanyeBili = new BigDecimal(operator.split("\\*")[1]);
                         }
                     }
+
+                    AssertUtils.notTrue(!schoolMajorMap.containsKey(schoolCode+"_"+majorName+"_"+batch+"_"+category), String.format("行[%s],未在系统中找到招录专业", index));
+
                     if ("文过专排".equals(rulesEnrollProbability) || "文过专排主科".equals(rulesEnrollProbability)) {
                         BigDecimal multiply = specialScore.multiply(zhuanyeBili);
                         yxHistoryMajorEnroll.setControlLine(multiply);
@@ -480,7 +492,12 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch, batch.contains("提前批") ? "提前批" : batch);
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getCategory, category);
                     yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorType, majorType);
-                    oldYxHistoryMajorEnroll = yxHistoryMajorEnrollService.getOne(yxHistoryMajorEnrollLambdaQueryWrapper);
+                    try {
+                        oldYxHistoryMajorEnroll = yxHistoryMajorEnrollService.getOne(yxHistoryMajorEnrollLambdaQueryWrapper);
+                    }catch (TooManyResultsException e){
+                        throw new JeecgBootException("该数据已存在多条该历年数据");
+                    }
+
 
 
                     if (oldYxHistoryMajorEnroll == null) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java

@@ -50,7 +50,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
         if(StringUtils.isNotBlank(id)){
             queryWrapper.ne(YxHistoryMajorEnroll::getId,id);
         }
-        return count(queryWrapper)>0?true:false;
+        return count(queryWrapper)>0;
     }
 
     @Override