教材征订征订列表总征订数量

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookSubscriptionServiceImpl.java

@@ -417,7 +417,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(TextbookSubscription textbookSubscription) {
-        textbookSubscriptionTextbookSubscriptionMapper.updateById(textbookSubscription);
+        int sum = 0;
         //********************************* TextbookSubscriptionItem  增删改  开始 *******************************************/
         {
             // 查出所有子级的id
@@ -428,30 +428,32 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
             List<Long> textbookSubscriptionItemIds = textbookSubscriptionItemList.stream()
                     .map(TextbookSubscriptionItem::getId)
                     .collect(Collectors.toList());
-            //原有子表单 没有被删除的主键
+            // 原有子表单 没有被删除的主键
             List<Long> textbookSubscriptionItemOldIds = textbookSubscription.getTextbookSubscriptionItemList().stream()
                     .map(TextbookSubscriptionItem::getId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
-            //找到需要删除的id
+            // 找到需要删除的id
             List<Long> textbookSubscriptionItemRemoveIds = textbookSubscriptionItemIds.stream()
                     .filter(item -> !textbookSubscriptionItemOldIds.contains(item))
                     .collect(Collectors.toList());
 
             for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscription.getTextbookSubscriptionItemList()) {
-                //如果不等于空则修改
+                // 如果不等于空则修改
                 if (textbookSubscriptionItem.getId() != null) {
                     textbookSubscriptionTextbookSubscriptionItemMapper.updateById(textbookSubscriptionItem);
-                }
-                //如果等于空 则新增
-                else {
-                    //已经不存在的id 删除
+                } else {
+                    // 如果等于空 则新增
                     textbookSubscriptionItem.setTextbookSubscriptionId(textbookSubscription.getId());
                     textbookSubscriptionTextbookSubscriptionItemMapper.insert(textbookSubscriptionItem);
                 }
+                textbookSubscriptionItem.setStudentNum(ObjectUtils.isEmpty(textbookSubscriptionItem.getStudentNum()) ? 0 : textbookSubscriptionItem.getStudentNum());
+                textbookSubscriptionItem.setTeacherNum(ObjectUtils.isEmpty(textbookSubscriptionItem.getTeacherNum()) ? 0 : textbookSubscriptionItem.getTeacherNum());
+
+                sum += textbookSubscriptionItem.getStudentNum() + textbookSubscriptionItem.getTeacherNum();
             }
-            //已经不存在的id 删除
-            if (textbookSubscriptionItemRemoveIds.size() > 0) {
+            // 已经不存在的id 删除
+            if (ObjectUtils.isNotEmpty(textbookSubscriptionItemRemoveIds.isEmpty())) {
                 textbookSubscriptionTextbookSubscriptionItemMapper.deleteBatchIds(textbookSubscriptionItemRemoveIds);
             }
         }
@@ -469,8 +471,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                 && StringUtils.isNotBlank(textbookSubscription.getBaseClassIds())
         ) {
             String[] classIdArr = textbookSubscription.getBaseClassIds().split(",");
-            List<String> classIdList = Arrays.asList(classIdArr);
-            for (String str : classIdList) {
+            for (String str : classIdArr) {
                 TextbookSubscriptionClass textbookSubscriptionClass = new TextbookSubscriptionClass();
                 textbookSubscriptionClass.setTextbookSubscriptionId(textbookSubscription.getId());
                 textbookSubscriptionClass.setBaseClassId(Long.parseLong(str));
@@ -479,6 +480,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
         }
         //********************************* TextbookSubscriptionClass  增删改  结束 *******************************************/
 
+        textbookSubscriptionTextbookSubscriptionMapper.updateById(textbookSubscription);
         return true;
     }