浏览代码

征订总数量统计的时候考虑教师数量为空的情况

大数据与最优化研究所 11 月之前
父节点
当前提交
de1194b00f

+ 3 - 1
src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -81,7 +81,9 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
         // 处理征订表
         int sum = 0;
         for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscription.getTextbookSubscriptionItemList()) {
-            sum += textbookSubscriptionItem.getStudentNum() + textbookSubscriptionItem.getTeacherNum();
+            sum += (ObjectUtils.isNotEmpty(textbookSubscriptionItem.getStudentNum()) ? textbookSubscriptionItem.getStudentNum() : 0)
+                    + (ObjectUtils.isNotEmpty(textbookSubscriptionItem.getTeacherNum()) ? textbookSubscriptionItem.getTeacherNum() : 0)
+                    ;
         }
         textbookSubscriptionMapper.insert(textbookSubscription);
 

+ 1 - 3
src/main/java/com/xjrsoft/module/veb/util/ImportExcelUtil.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.veb.util;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,7 +18,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.naming.directory.InvalidAttributesException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -31,7 +29,7 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
- * @author dzx
+ * @author phoenix
  * @Description 导入工具类
  * 2023/12/5
  */