From b99c16430d8a2a5cf000a6dd6ac29fff68437f59 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 21 Sep 2023 10:30:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E4=BC=81=E6=A0=87=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/mapper/LawsCommonMapper.java | 3 ++- .../laws/common/mapper/xml/LawsCommonMapper.xml | 8 +++++++- .../laws/common/service/ILawsCommonService.java | 2 +- .../common/service/impl/LawsCommonServiceImpl.java | 10 +++++----- .../standard/controller/LawsDomesticController.java | 2 +- .../standard/controller/LawsEnterpriseController.java | 7 ++++--- .../standard/controller/LawsOverseasController.java | 3 +-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java index 45784092..6a2ea578 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java @@ -53,7 +53,8 @@ public interface LawsCommonMapper { **/ Map getByIdAndModule(@org.apache.ibatis.annotations.Param("tableName") String tableName, @org.apache.ibatis.annotations.Param("selectField") String selectField, - @org.apache.ibatis.annotations.Param("id") String id); + @org.apache.ibatis.annotations.Param("id") String id, + @org.apache.ibatis.annotations.Param("standardNumber") String standardNumber); /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 0fd02364..8fc67e74 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -18,7 +18,13 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 0b3708e2..2e66002d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -87,7 +87,7 @@ public interface ILawsCommonService { * @Date: 2023/8/24 11:49 * @Description: 根据id和模块标识获取信息 **/ - Map getByIdAndModule(String id, String module, String type); + Map getByIdAndModule(String id, String module, String type, String standardNumber); /** * @Author: liao diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 6f6af0fc..0de24e43 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -532,7 +532,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { String id = (String) parameterMap.get(FieldCommon.ID); parameterMap.remove(FieldCommon.ID); // 获取数据库里没修改的数据 - Map oldDataMap = getByIdAndModule(id, module, "2"); + Map oldDataMap = getByIdAndModule(id, module, "2", standardNumber); // 组装更新内容 StringBuilder recordBuffer = new StringBuilder(); @@ -720,9 +720,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 根据id和模块标识获取信息 **/ @Override - public Map getByIdAndModule(String id, String module, String type) { - if (StringUtils.isBlank(id)) { - throw new JeroBootException(ResultCommon.EMPTY_COMMON, "id"); + public Map getByIdAndModule(String id, String module, String type, String standardNumber) { + if (StringUtils.isBlank(id) && StringUtils.isBlank(standardNumber)) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, "id和标准号不能同时为空"); } // 获取要操作的表名 String tableName = TableNameEnum.getTableName(module); @@ -742,7 +742,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 封装查询显示的字段 String selectField = getSelectField(fieldList); // 封装查询条件 - Map initMap = lawsCommonMapper.getByIdAndModule(tableName, selectField, id); + Map initMap = lawsCommonMapper.getByIdAndModule(tableName, selectField, id, standardNumber); if (initMap == null) { throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 835104c0..f0ad65e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -97,7 +97,7 @@ public class LawsDomesticController { @GetMapping(value = "getByIdAndModule") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { - return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type)); + return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); } @AutoLog(value = "国内法规标准-根据ids和模块标识删除信息") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 934d8d0e..8d3bfc24 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -105,9 +105,10 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-根据id和模块标识获取信息") @ApiOperation(value="企业法规标准-根据id和模块标识获取信息", notes="企业法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") - public Result> getByIdAndModule(@RequestParam(name="id") String id, - @RequestParam(name="type") String type) { - return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type)); + public Result> getByIdAndModule(@RequestParam(name="id", required = false) String id, + @RequestParam(name="type") String type, + @RequestParam(name="standardNumber", required = false) String standardNumber) { + return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber)); } @AutoLog(value = "企业法规标准-根据ids和模块标识删除信息") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 4b4f5e88..f7d4f05b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import java.util.Objects; /** * @Author: liao @@ -98,7 +97,7 @@ public class LawsOverseasController { @GetMapping(value = "getByIdAndModule") public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { - return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type)); + return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); } @AutoLog(value = "海外法规标准-根据ids和模块标识删除信息")