From ef980bb9becbf5fad66af893917e75c13ab3d4c9 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 23 Oct 2023 18:03:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DocumentSplitController.java | 13 ++++++--- .../handler/AbstractConditionBase.java | 7 +++-- .../mapper/DocumentSplitMapper.java | 7 +++++ .../mapper/xml/DocumentSplitMapper.xml | 14 ++++++---- .../impl/DocumentSplitServiceImpl.java | 28 +++++++++++++------ .../impl/FileSplitItemsEOServiceImpl.java | 5 ++-- 6 files changed, 50 insertions(+), 24 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 6070865d..b18647ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -136,8 +136,10 @@ public class DocumentSplitController { @AutoLog(value = "文档拆分-通过id删除") @ApiOperation(value="文档拆分-通过id删除", notes="文档拆分-通过id删除") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - sarFileSplitInfoService.deleteById(id); + public Result delete(@RequestBody Map map) { + if (map.containsKey("id")) { + sarFileSplitInfoService.deleteById((String) map.get("id")); + } return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } @@ -149,8 +151,11 @@ public class DocumentSplitController { @AutoLog(value = "文档拆分-批量删除") @ApiOperation(value="文档拆分-批量删除", notes="文档拆分-批量删除") @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestBody Map map) { + if (map.containsKey("ids")) { + String ids = (String) map.get("ids"); + sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); + } return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/AbstractConditionBase.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/AbstractConditionBase.java index de722d02..dedc25cc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/AbstractConditionBase.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/AbstractConditionBase.java @@ -14,14 +14,15 @@ import java.util.Date; * @Description: 抽象类 */ @Slf4j -public class AbstractConditionBase { +public abstract class AbstractConditionBase { + private static final String EXPLAIN = "抽象类"; /** * 构建查询条件 * @return 拼接完成的sql */ public String buildCondition(String fieldName, String value){ - log.info("构建查询条件字段名：{}， 参数值{}", fieldName, value); + log.info("{}构建查询条件字段名：{}， 参数值{}", EXPLAIN, fieldName, value); return ""; } @@ -30,7 +31,7 @@ public class AbstractConditionBase { * @return 拼接完成的sql */ public String buildUpdate(String fieldName, String value){ - log.info("构建修改字段字段名：{}， 参数值{}", fieldName, value); + log.info("{}构建修改字段字段名：{}， 参数值{}", EXPLAIN, fieldName, value); return ""; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 571ec1e8..9712e69d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -177,4 +177,11 @@ public interface DocumentSplitMapper { * @param sarFileSplitItemsVal */ int insertSarFileSplitItemsVal(@Param("entities") List sarFileSplitItemsVal); + + /** + * 文档拆分详情根据id查询 + * @param id + * @return + */ + Map queryDocumentSplitDetailById(String id); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 7922f828..d237908d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -73,9 +73,6 @@ and type ]]> 'interpretation' - - and type = #{type} - @@ -115,7 +112,7 @@ concat(u.realname, '(', u.username, ')') as author, i.create_time, i.split_result, - i.create_by, + u2.id createBy, i.standard_id, i.del_flag, publish_before_id, @@ -124,7 +121,8 @@ from sar_file_split_info i left join laws_domestic_standard s on i.standard_id = s.id and s.del_flag = 0 left join laws_enterprise_standard d on i.standard_id = d.id and d.del_flag = 0 - left join sys_user u on i.author = u.id) t + left join sys_user u on i.author = u.id + left join sys_user u2 on i.create_by = u2.username) t ${ew.customSqlSegment} @@ -206,6 +204,12 @@ #{item} + + UPDATE laws_document_split diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index d24d7fd9..7b31c327 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -518,21 +518,31 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { @Override public void deleteDocumentSplitDetail(Map parameter) { - // 删除数据 - documentSplitMapper.deleteDocumentSplitDetail((String) parameter.get(ID)); + String id = (String) parameter.get(ID); + // 获取原始据信息 + Map documentSplitDetail = documentSplitMapper.queryDocumentSplitDetailById(id); + String menuId = (String) documentSplitDetail.get(MENU_ID); + // 删除文档拆分详情数据 + documentSplitMapper.deleteDocumentSplitDetail(id); + // 删除对应目录 + documentSplitMapper.sarFileSplitMenuDeleteByIdList(Collections.singletonList(menuId)); + //删除对应条目信息 + // 条款解读 + documentSplitMapper.deleteItemsValByItemId(id, DocumentSplitCommon.INTERPRETATION); + // 条文内容 + documentSplitMapper.deleteItemsValByItemId(id, ""); } @Override public void deleteBatchDocumentSplitDetail(Map parameter) { - // where条件 - String updateCondition = ""; if (parameter.containsKey(IDS)){ String ids = (String) parameter.get(IDS); - List list = Arrays.asList(ids.split(",")); - updateCondition = "id in (" + "'" + String.join("','", list) + "')"; - // 删除数据 - documentSplitMapper.deleteBatchDocumentSplitDetail(updateCondition); - + String[] list = ids.split(","); + for (String id : list) { + Map map = new HashMap<>(); + map.put(ID, id); + deleteDocumentSplitDetail(map); + } } } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index db13ad7a..f7b191f3 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3607,12 +3607,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl",""); content = content.replaceAll("

","\n");