From 5901b45d3a409a027b1afc29f7efc7f50d5aa96f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 12 Dec 2023 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ILawsCommonService.java | 2 +- .../service/impl/LawsCommonServiceImpl.java | 9 +++-- .../controller/LawsDomesticController.java | 2 +- .../controller/LawsEnterpriseController.java | 33 ++++++++++++++++++- .../controller/LawsOverseasController.java | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) 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 d4321969..cf2477ae 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 @@ -172,7 +172,7 @@ public interface ILawsCommonService { * @Date: 2023/9/27 18:01 * @Description: 增加浏览记录 **/ - void addLookHistory(String id, String type, String module); + void addLookHistory(String id, String type, String module, String standardNo); /** * 获取文件内容 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 5e33bbf1..35f17846 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 @@ -1478,11 +1478,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 增加浏览记录 **/ @Override - public void addLookHistory(String id, String type, String module) { + public void addLookHistory(String id, String type, String module, String standardNo) { if ("1".equals(type)) { // 详情显示 LawsBrowsingHistory history = new LawsBrowsingHistory(); - ManyStandardSelectionBox singleStandard = getSingleStandard(null, id); + ManyStandardSelectionBox singleStandard = null; + if (StrUtil.isNotBlank(id)) { + singleStandard = getSingleStandard(null, id); + } else { + singleStandard = getSingleStandard(standardNo, null); + } history.setStandardId(id); history.setStandardNumber(singleStandard.getStandardNumber()); history.setStandardName(singleStandard.getStandardName()); 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 67c84419..c269e632 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 @@ -131,7 +131,7 @@ public class LawsDomesticController { @RequiresPermissions("domesticStandard:search") public Result> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id, @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type) { - lawsCommonService.addLookHistory(id, type, MODULE_VALUE); + lawsCommonService.addLookHistory(id, type, MODULE_VALUE, null); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); } 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 b0ea7446..4ff99523 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 @@ -12,6 +12,7 @@ import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; +import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; @@ -152,7 +153,8 @@ public class LawsEnterpriseController { public Result> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id, @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type, @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { - lawsCommonService.addLookHistory(id, type, MODULE_VALUE); + + lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber)); } @@ -324,4 +326,33 @@ public class LawsEnterpriseController { @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { return Result.OK(esAuthUserService.detailPermissionByUser(id, standardNumber, UserUtils.getUserId())); } + + /** + * 企业法规标准-临时授权记录 + * + * @return + */ + @AutoLog(value = "企业法规标准-临时授权记录") + @ApiOperation(value = "企业法规标准-临时授权记录", notes = "企业法规标准-临时授权记录") + @GetMapping(value = "/tempAuthRecord") + @ApiOperationSupport(order = 21) + public Result tempAuthRecord(TempAuthRecordQueryDto tempAuthRecordQueryDto, + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { + return Result.OK(esAuthUserService.tempAuthRecord(tempAuthRecordQueryDto, pageNo, pageSize)); + } + + /** + * 企业法规标准-解除授权 + * + * @return + */ + @AutoLog(value = "企业法规标准-解除授权") + @ApiOperation(value = "企业法规标准-解除授权", notes = "企业法规标准-解除授权") + @GetMapping(value = "/revokeAuth") + @ApiOperationSupport(order = 22) + public Result revokeAuth(@RequestParam(name="id", required = false) @ApiParam("Id") String authId) { + esAuthUserService.revokeAuth(authId); + return Result.OK(); + } } 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 0031c05b..8106eebf 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 @@ -131,7 +131,7 @@ public class LawsOverseasController { @RequiresPermissions("overseasStandard:search") public Result> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id, @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type) { - lawsCommonService.addLookHistory(id, type, MODULE_VALUE); + lawsCommonService.addLookHistory(id, type, MODULE_VALUE, null); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, null)); }