diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml index 4412cae..2953db7 100644 --- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml +++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml @@ -15,7 +15,14 @@ DATE_FORMAT(ts.sample_date, '%Y-%m-%d') AS sampleDate, tt.team_name AS teamName, ts.process_status AS status, - + + CASE WHEN ts.process_status = 1 AND ts.audti_status = 0 THEN '待审阅' + WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核' + WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批' + WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成' + END AS audtiStatus, + + CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过' WHEN ts.process_status = 2 AND ts.audti_status = 0 THEN '待审核' WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过' @@ -24,14 +31,11 @@ WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成' END AS audtiStatus, - - CASE WHEN ts.process_status = 1 AND ts.audti_status = 2 THEN '审阅不通过' - WHEN process_status > 1 THEN '待审核' - END AS audtiStatus, - CASE WHEN ts.process_status = 2 AND ts.audti_status = 2 THEN '审核不通过' - WHEN process_status > 2 THEN '待审批' + WHEN ts.process_status = 3 AND ts.audti_status = 0 THEN '待审批' + WHEN ts.process_status = 3 AND ts.audti_status = 2 THEN '审批不通过' + WHEN ts.process_status = 4 AND ts.audti_status = 1 THEN '试验完成' END AS audtiStatus, @@ -112,6 +116,17 @@ (ts.process_status = 4 AND audti_status = 1) ) + /*管理员-审阅不通过/待审核/审核不通过/待审批/审批不通过/试验完成*/ + + AND ( + (ts.process_status = 1 AND audti_status = 2) OR + (ts.process_status = 2 AND audti_status = 0) OR + (ts.process_status = 2 AND audti_status = 2) OR + (ts.process_status = 3 AND audti_status = 0) OR + (ts.process_status = 3 AND audti_status = 2) OR + (ts.process_status = 4 AND audti_status = 1) + ) + ORDER BY FIELD(audtiStatus, '审阅不通过','审核不通过','审批不通过','待试验','待提交','待审阅','待审核','待审批','试验结束') ASC,dispatch_time ASC diff --git a/src/main/resources/static/js/basis/originalRecord.js b/src/main/resources/static/js/basis/originalRecord.js index 035bfd8..1f65acf 100644 --- a/src/main/resources/static/js/basis/originalRecord.js +++ b/src/main/resources/static/js/basis/originalRecord.js @@ -20,7 +20,7 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () { function pages(pageNum, pageSize, typeNum) { let params = getReqParams(pageNum, pageSize, typeNum); $.ajax({ - url: dataUrl + "/examine/getList", + url: dataUrl + "/originalRecord/getList", headers: { "token": tokens },