diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/ExamineController.java b/src/main/java/com/bonus/aqgqj/basis/controller/ExamineController.java index ab89b2c..6f2723a 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/ExamineController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/ExamineController.java @@ -47,7 +47,6 @@ public class ExamineController { @PostMapping(value = "getDetailList") @DecryptAndVerify(decryptedClass = ParamsDto.class)//加解密统一管理 @LogAnnotation(operModul = "审查管理", operation = "查询审查详情列表", operDesc = "系统级事件", operType = "查询") -// @PreAuthorize("@pms.hasPermission('sys:examine:detailQuery')") public ServerResponse getDetailList(EncryptedReq data) { PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); List list = service.getDetailList(data.getData()); diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java b/src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java index fd706d1..c5b8ce5 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/OriginalRecordController.java @@ -43,15 +43,4 @@ public class OriginalRecordController { PageInfo pageInfo = new PageInfo<>(list); return ServerResponse.createSuccessPage(pageInfo, data.getData().getPage(), data.getData().getLimit()); } - - @PostMapping(value = "getDetailList") - @DecryptAndVerify(decryptedClass = ParamsDto.class)//加解密统一管理 - @LogAnnotation(operModul = "原始记录管理", operation = "查询审查详情列表", operDesc = "系统级事件", operType = "查询") -// @PreAuthorize("@pms.hasPermission('sys:originalRecord:detailQuery')") - public ServerResponse getDetailList(EncryptedReq data) { - PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); - List list = service.getDetailList(data.getData()); - PageInfo pageInfo = new PageInfo<>(list); - return ServerResponse.createSuccessPage(pageInfo, data.getData().getPage(), data.getData().getLimit()); - } } diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java index 7384c6e..f6cc67b 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/OriginalRecordMapper.java @@ -28,24 +28,4 @@ public interface OriginalRecordMapper { * @date 2024/7/23 10:15 */ List getList(ParamsDto dto); - - /** - * 原始记录审查详情列表 - * - * @param dto - * @return List - * @author cwchen - * @date 2024/7/23 17:58 - */ - List getDetailList(ParamsDto dto); - - /** - * 查询试验设备数量 - * @param experId - * @return List> - * @author cwchen - * @date 2024/7/23 18:16 - */ - @MapKey("id") - List> getExperDevItemsNum(Long experId); } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java b/src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java index c10ecd8..d54ffed 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/OriginalRecordService.java @@ -25,12 +25,4 @@ public interface OriginalRecordService { */ List getList(ParamsDto data); - /** - * 审查详情列表 - * @param data - * @return List - * @author cwchen - * @date 2024/7/23 17:57 - */ - List getDetailList(ParamsDto data); } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java index 690aa9c..8ba72c8 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/OriginalRecordServiceImpl.java @@ -42,29 +42,4 @@ public class OriginalRecordServiceImpl implements OriginalRecordService { } return list; } - - @Override - public List getDetailList(ParamsDto dto) { - List list = new ArrayList<>(); - try { - list = mapper.getDetailList(dto); - if (CollectionUtils.isNotEmpty(list)) { - for (ExperimentalDetailVo detailVo : list) { - // 样品试验结果、样品数量、送样总数 - List sampleList = new ArrayList<>(); - if (detailVo.getExperId() != null) { - List> mapList = mapper.getExperDevItemsNum(detailVo.getExperId()); - JSONArray jsonArray = new JSONArray(); - jsonArray.addAll(mapList); - sampleList = jsonArray.toJavaList(ExperimentalDetailVo.Sample.class); - } - detailVo.setSampleList(sampleList); - detailVo.setSampleQuantity(sampleList.size()); - } - } - } catch (Exception e) { - log.error(e.toString(), e); - } - return list; - } } diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml index 2953db7..f342696 100644 --- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml +++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml @@ -129,50 +129,4 @@ ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC - - - - diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js index ff86c85..0ad6181 100644 --- a/src/main/resources/static/js/basis/child/auditData.js +++ b/src/main/resources/static/js/basis/child/auditData.js @@ -155,9 +155,9 @@ function getReqParams(page, limit, type) { // 查询/重置 function query() { let pattern = new RegExp("[%_<>]"); - if (pattern.test($("#ip").val())) { - $("#ip").val(''); - return layer.msg('ip查询包含特殊字符,请重新输入', { + if (pattern.test($("#keyWord").val())) { + $("#keyWord").val(''); + return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2, time: 2000 //2秒关闭(如果不配置,默认是3秒) }); diff --git a/src/main/resources/static/js/basis/examine.js b/src/main/resources/static/js/basis/examine.js index 035bfd8..fa43b7e 100644 --- a/src/main/resources/static/js/basis/examine.js +++ b/src/main/resources/static/js/basis/examine.js @@ -142,9 +142,9 @@ function getReqParams(page, limit, type) { // 查询/重置 function query() { let pattern = new RegExp("[%_<>]"); - if (pattern.test($("#ip").val())) { - $("#ip").val(''); - return layer.msg('ip查询包含特殊字符,请重新输入', { + if (pattern.test($("#keyWord").val())) { + $("#keyWord").val(''); + return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2, time: 2000 //2秒关闭(如果不配置,默认是3秒) }); diff --git a/src/main/resources/static/js/basis/originalRecord.js b/src/main/resources/static/js/basis/originalRecord.js index 1f65acf..43bffc4 100644 --- a/src/main/resources/static/js/basis/originalRecord.js +++ b/src/main/resources/static/js/basis/originalRecord.js @@ -143,8 +143,8 @@ function getReqParams(page, limit, type) { function query() { let pattern = new RegExp("[%_<>]"); if (pattern.test($("#ip").val())) { - $("#ip").val(''); - return layer.msg('ip查询包含特殊字符,请重新输入', { + $("#keyWord").val(''); + return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2, time: 2000 //2秒关闭(如果不配置,默认是3秒) });