拆分条款-导入拆分结果修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java

@@ -48,7 +48,7 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper<SarFileSplitMenuEO>
 
     int deleteByIdList(@Param("idList") List<String> idList);
 
-
+    SarFileSplitMenuEO selectGeneral(@Param("infoId") String infoId);
 
     int insert(SarFileSplitMenuEO sarFileSplitMenuEO);
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml

@@ -350,5 +350,9 @@
         </foreach>
     </select>
 
+    <select id="selectGeneral" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select * from SAR_FILE_SPLIT_MENU
+        where info_id = #{infoId} and parent_id is null
+    </select>
 
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -1459,6 +1459,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         sarFileSplitInfoEO.setSplitResult("成功");
         sarFileSplitInfoEO.setCreateTime(now);
         sarFileSplitInfoEO.setUpdateTime(now);
+        sarFileSplitInfoService.save(sarFileSplitInfoEO);
 
         // 添加条款总目录
         SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
@@ -1470,12 +1471,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         sarFileSplitMenuEO.setValidFlag(0);
         sarFileSplitMenuEO.setCreationTime(new Date());
         sarFileSplitMenuEO.setModifyTime(new Date());
+        sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
 
         // 导入文件
         Result<?> result = importSplitItems(mFile, cut, menuId, infoId);
-        if(result.isSuccess()){
-            sarFileSplitInfoService.save(sarFileSplitInfoEO);
-            sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
+        if(!result.isSuccess()){
+            sarFileSplitInfoService.deleteById(infoId);
         }
         return result;
     }
@@ -2036,7 +2037,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("result", false);
             String html = "";
             for (String message : stringMessage) {
-                html += message + "；";
+                html += message;
 //                html += message + "</br>";
             }
             map.put("message", html);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.split.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
@@ -11,10 +12,12 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
+import com.jero.modules.split.entity.SarFileSplitMenuEO;
 import com.jero.modules.split.enums.SplitFileTypeTypeEnum;
 import com.jero.modules.split.mapper.SarFileSplitInfoMapper;
 import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
+import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.lang.StringUtils;
@@ -49,6 +52,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 	private ISysDictItemService sysDictItemService;
 	@Autowired
 	private FileSpiltService fileSpiltService;
+	@Autowired
+	private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
 
 
 	/**
@@ -128,6 +133,11 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 	@Override
     public void deleteById(String id) {
         removeById(id);
+        // 删除条款和目录
+		SarFileSplitMenuEO menu = sarFileSplitMenuEOMapper.selectGeneral(id);
+		if(ObjectUtil.isNotEmpty(menu)) {
+			sarFileSplitMenuEOService.deleteMenu(menu.getId());
+		}
     }
 
 	/**
@@ -139,6 +149,13 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 	@Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);
+        for(String id : ids){
+			// 删除条款和目录
+			SarFileSplitMenuEO menu = sarFileSplitMenuEOMapper.selectGeneral(id);
+			if(ObjectUtil.isNotEmpty(menu)) {
+				sarFileSplitMenuEOService.deleteMenu(menu.getId());
+			}
+		}
     }
 
 	/**