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 8ba72c8..04fb04a 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 @@ -34,9 +34,6 @@ public class OriginalRecordServiceImpl implements OriginalRecordService { List list = new ArrayList<>(); try { list = mapper.getList(dto); - for (ExperimentalVo vo : list) { - - } } catch (Exception e) { log.error(e.toString(), e); } diff --git a/src/main/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml index a761140..1abd5e0 100644 --- a/src/main/resources/mappers/basis/ExamineMapper.xml +++ b/src/main/resources/mappers/basis/ExamineMapper.xml @@ -105,44 +105,47 @@ AND process_status IN (1,2,3) AND audti_status = 0 - ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') ASC,ts.sample_date DESC + ORDER BY FIELD(audtiStatus, '待审阅','待审核','待审批') DESC,ts.sample_date DESC diff --git a/src/main/resources/static/js/basis/originalRecord.js b/src/main/resources/static/js/basis/originalRecord.js index 9589d7b..5ed0515 100644 --- a/src/main/resources/static/js/basis/originalRecord.js +++ b/src/main/resources/static/js/basis/originalRecord.js @@ -185,9 +185,9 @@ function getValueByKey(obj, key) { /**设置审核类型*/ function setButtonName(id, value, status) { let cent = ""; - const btnName = getValueByKey(data, value + status) + const btnName = '审查记录'; if (btnName) { - cent += "" + btnName + ""; + cent += ""+btnName+""; } return cent; } \ No newline at end of file