diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java index d78a66e..ff58699 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExamineServiceImpl.java @@ -101,7 +101,7 @@ public class ExamineServiceImpl implements ExamineService { // auditType 审核类型 1 审阅 2 审核 3 审批 auditStatus 审核结果 2 不通过 1通过 Integer status = 0, auditStatus = 0; if (Objects.equals(vo.getAuditStatus(), Constants.PASS)) { - // 审查不通过 + // 审查通过 Integer[] valArr = handleData(vo, 1); status = valArr[0]; auditStatus = valArr[1]; @@ -129,7 +129,7 @@ public class ExamineServiceImpl implements ExamineService { audtiStatus = valArr[1]; } // 审核状态、流程状态不为0时,修改收样信息审核状态 - if(!Objects.equals(audtiStatus, Constants.ALL_EXPER_INDEX) && !Objects.equals(processStatus, Constants.ALL_EXPER_INDEX)){ + if(!Objects.equals(audtiStatus, Constants.ALL_EXPER_INDEX) || !Objects.equals(processStatus, Constants.ALL_EXPER_INDEX)){ mapper.updateSampleStatus(vo, audtiStatus, processStatus); } } catch (Exception e) { diff --git a/src/main/java/com/bonus/aqgqj/webResult/Constants.java b/src/main/java/com/bonus/aqgqj/webResult/Constants.java index e6a2b84..e4cd8a6 100644 --- a/src/main/java/com/bonus/aqgqj/webResult/Constants.java +++ b/src/main/java/com/bonus/aqgqj/webResult/Constants.java @@ -167,9 +167,9 @@ public class Constants /**审阅*/ public static final Integer AUDIT_TYPE_1 = 1; /**审核*/ - public static final Integer AUDIT_TYPE_2 = 1; + public static final Integer AUDIT_TYPE_2 = 2; /**审批*/ - public static final Integer AUDIT_TYPE_3 = 1; + public static final Integer AUDIT_TYPE_3 = 3; public static final Integer NOT_PASS_INDEX = 2; public static final Integer PASS_INDEX = 1; diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml index 1bd4fd6..b8bf301 100644 --- a/src/main/resources/mappers/basis/ExperimentalMapper.xml +++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml @@ -193,7 +193,7 @@ - UPDATE tb_exper SET status = 1,audit_status = 0 + UPDATE tb_exper SET status = 1,audit_status = 0,audit_user_name = null,audit_time = null,audit_remakr = null WHERE sample_id IN #{item} diff --git a/src/main/resources/mappers/basis/OriginalRecordMapper.xml b/src/main/resources/mappers/basis/OriginalRecordMapper.xml index 454f0d0..8ba18f4 100644 --- a/src/main/resources/mappers/basis/OriginalRecordMapper.xml +++ b/src/main/resources/mappers/basis/OriginalRecordMapper.xml @@ -97,9 +97,10 @@ (ts.process_status = 4 AND audti_status = 1) ) - /*管理员-审阅不通过/待审核/审核不通过/待审批/审批不通过/试验完成*/ + /*管理员-待审阅/审阅不通过/待审核/审核不通过/待审批/审批不通过/试验完成*/ AND ( + (ts.process_status = 1 AND audti_status = 0) OR (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 diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js index 5bc88d1..e95b264 100644 --- a/src/main/resources/static/js/basis/child/auditData.js +++ b/src/main/resources/static/js/basis/child/auditData.js @@ -86,7 +86,7 @@ function initTable(dataList, limit, page) { [ //表头 { - type: 'checkbox', fixed: 'left' + type: 'checkbox' }, { title: "序号", width: 80, unresize: true, align: "center", @@ -172,7 +172,7 @@ function initTable(dataList, limit, page) { } else { temp_table_list.forEach(function (o, i) { let index = checkAllList(temp_all_list, o); - if (index == -1 && isCheck(o.status)) { + if (index == -1 && isCheck(o.status) && (checkNameArr.indexOf(o.status) + 1 === parseInt(statusParam))) { temp_all_list.push(o); } }) @@ -256,7 +256,7 @@ function query() { } function reloadData() { - temp_all_list.splice(0, temp_all_list.length); + temp_all_list.splice(0,temp_all_list.length) pages(pageNum, limitSize); } @@ -309,7 +309,7 @@ function batchAudit(type) { saveData(experIdArr, sampleId); }) } else if (type === 2) { // 批量不通过 - let index = layer.confirm('批量' + (type === 1 ? '通过' : '不通过') + '确认前,请仔细检查数据?', { + let index = layer.confirm('批量' + (type === 1 ? '通过' : '不通过') + '确认,请仔细检查数据?', { title: '操作提示', icon: 7, move: false