Browse Source

找回了遗失的大括号

phoenix 1 year ago
parent
commit
6b4d2dabdf

+ 21 - 32
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -12,23 +12,14 @@ import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
-import com.xjrsoft.module.textbook.entity.Textbook;
-import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
-import com.xjrsoft.module.textbook.entity.TextbookSubscriptionRecord;
-import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
-import com.xjrsoft.module.textbook.entity.WfTextbookSubscriptionItem;
+import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.TextbookClassRelationMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
 import com.xjrsoft.module.textbook.service.ITextbookService;
 import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
-import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
-import com.xjrsoft.module.textbook.vo.TextbookPageVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
-import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.*;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -117,7 +108,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             List<TextbookSubscriptionRecord> textbookSubscriptionRecordList = textbookTextbookSubscriptionRecordMapper.selectList(Wrappers.lambdaQuery(TextbookSubscriptionRecord.class).eq(TextbookSubscriptionRecord::getWfTextbookSubscriptionId, textbook.getId()).select(TextbookSubscriptionRecord::getId));
             List<Long> textbookSubscriptionRecordIds = textbookSubscriptionRecordList.stream().map(TextbookSubscriptionRecord::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
-            if(!textbookSubscriptionRecordIds.isEmpty()){
+            if (!textbookSubscriptionRecordIds.isEmpty()) {
                 List<Long> textbookSubscriptionRecordOldIds = textbook.getTextbookSubscriptionRecordList().stream().map(TextbookSubscriptionRecord::getId).filter(Objects::nonNull).collect(Collectors.toList());
                 //找到需要删除的id
                 List<Long> textbookSubscriptionRecordRemoveIds = textbookSubscriptionRecordIds.stream().filter(item -> !textbookSubscriptionRecordOldIds.contains(item)).collect(Collectors.toList());
@@ -135,34 +126,32 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     }
                 }
                 //已经不存在的id 删除
-                if(textbookSubscriptionRecordRemoveIds.size() > 0){
+                if (textbookSubscriptionRecordRemoveIds.size() > 0) {
                     textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
                 }
-            for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
-                //如果不等于空则修改
-                if (textbookSubscriptionRecord.getId() != null) {
-                    textbookTextbookSubscriptionRecordMapper.updateById(textbookSubscriptionRecord);
+                for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
+                    //如果不等于空则修改
+                    if (textbookSubscriptionRecord.getId() != null) {
+                        textbookTextbookSubscriptionRecordMapper.updateById(textbookSubscriptionRecord);
+                    }
+                    //如果等于空 则新增
+                    else {
+                        //已经不存在的id 删除
+                        textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
+                        textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                    }
                 }
-                //如果等于空 则新增
-                else {
-                    //已经不存在的id 删除
-                    textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
-                    textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                //已经不存在的id 删除
+                if (textbookSubscriptionRecordRemoveIds.size() > 0) {
+                    textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
                 }
-            }
-            //已经不存在的id 删除
-            if (textbookSubscriptionRecordRemoveIds.size() > 0) {
-                textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
-            }
-
-
 
 
+            }
+            //********************************* TextbookSubscriptionRecord  增删改  结束 *******************************************/
 
+            return true;
         }
-        //********************************* TextbookSubscriptionRecord  增删改  结束 *******************************************/
-
-        return true;
     }
 
     @Override