From 6f0312a5d8c4e1df7acd1b7177a7eda594fc24e5 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 25 Jul 2024 13:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/aqgqj/basis/dao/ExamineMapper.java | 2 +- .../service/impl/ExamineServiceImpl.java | 5 +- .../resources/mappers/basis/ExamineMapper.xml | 2 +- .../static/js/basis/child/auditData.js | 7 +- .../static/js/basis/child/viewAuditData.js | 176 ++++++++++++++++++ .../static/js/basis/originalRecord.js | 6 +- .../pages/basis/child/viewAuditData.html | 67 +++++++ 7 files changed, 254 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/static/js/basis/child/viewAuditData.js create mode 100644 src/main/resources/static/pages/basis/child/viewAuditData.html diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java index 5f14858..c7c52ae 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/ExamineMapper.java @@ -72,7 +72,7 @@ public interface ExamineMapper { * @author cwchen * @date 2024/7/25 9:16 */ - void updateExperStatus(@Param("params") AuditHistoryVo vo, @Param("experId") Long experId, @Param("status") Integer status, @Param("auditStatus") Integer auditStatus); + void updateExperStatus(@Param("params") AuditHistoryVo vo, @Param("status") Integer status, @Param("auditStatus") Integer auditStatus); /** * 查询试验项是否都是通过 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 e5661f6..d78a66e 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 @@ -95,7 +95,6 @@ public class ExamineServiceImpl implements ExamineService { if(StringUtils.isNotBlank(result)){ return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result); } - SystemUtils.isExperimentalTeamLeader(); for (Long experId : vo.getExperIds()) { vo.setExperId(experId); mapper.checkData(vo); @@ -113,7 +112,7 @@ public class ExamineServiceImpl implements ExamineService { status = valArr[0]; auditStatus = valArr[1]; } - mapper.updateExperStatus(vo, experId, status, auditStatus); + mapper.updateExperStatus(vo, status, auditStatus); } // 查询试验项是否都是通过，并更新收样信息审核的状态 List experIsPassList = mapper.getExperIsPass(vo); @@ -130,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/resources/mappers/basis/ExamineMapper.xml b/src/main/resources/mappers/basis/ExamineMapper.xml index 2738156..a761140 100644 --- a/src/main/resources/mappers/basis/ExamineMapper.xml +++ b/src/main/resources/mappers/basis/ExamineMapper.xml @@ -10,7 +10,7 @@ UPDATE tb_exper SET status = #{status},audit_status = #{auditStatus},audit_user_name = #{params.auditUserName},audit_time = #{params.auditTime},audit_remakr = #{params.auditRemark} - WHERE id = #{experId} + WHERE id = #{params.experId} diff --git a/src/main/resources/static/js/basis/child/auditData.js b/src/main/resources/static/js/basis/child/auditData.js index 01019b1..5bc88d1 100644 --- a/src/main/resources/static/js/basis/child/auditData.js +++ b/src/main/resources/static/js/basis/child/auditData.js @@ -91,7 +91,6 @@ function initTable(dataList, limit, page) { { title: "序号", width: 80, unresize: true, align: "center", templet: function (d) { - console.log(d.experId) return (page - 1) * limit + d.LAY_NUM; } }, @@ -275,7 +274,7 @@ function viewData(experId, devTypeCode) { function passData(experId, sampleId, status, type) { if (type === 1) { // 通过 - layer.confirm('确认通过？', {icon: 7}, function (index) { + layer.confirm('确认通过？', {icon: 7,move:false}, function (index) { saveData([experId], sampleId); }) } else { @@ -306,7 +305,7 @@ function batchAudit(type) { experIdArr.push(item.experId) }) if (type === 1) { // 批量通过 - layer.confirm('确认批量通过？', {icon: 7}, function (index) { + layer.confirm('确认批量通过？', {icon: 7,move:false}, function (index) { saveData(experIdArr, sampleId); }) } else if (type === 2) { // 批量不通过 @@ -338,7 +337,7 @@ function saveData(experIdArr, sampleId) { obj.experIds = experIdArr; obj.sampleId = parseInt(sampleId); obj.auditStatus = 1; - obj.auditType = typeParam; + obj.auditType = statusParam; let params = { encryptedData: encryptCBC(JSON.stringify(obj)) } diff --git a/src/main/resources/static/js/basis/child/viewAuditData.js b/src/main/resources/static/js/basis/child/viewAuditData.js new file mode 100644 index 0000000..e76b6c7 --- /dev/null +++ b/src/main/resources/static/js/basis/child/viewAuditData.js @@ -0,0 +1,176 @@ +let form, layer, table, tableIns, laydate; +let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10 +let deviceTypeList = []; +let idParam = null, statusParam = null; +function setParams(params) { + idParam = JSON.parse(params).id; + statusParam = JSON.parse(params).status; + layui.use(['form', 'layer', 'table', 'laydate'], function () { + form = layui.form; + layer = layui.layer; + table = layui.table; + laydate = layui.laydate; + layui.form.render(); + deviceTypeList = getDictsSelect("dev_code"); + setDictSelectValue(deviceTypeList, 'devTypeCode'); + laydate.render({ + elem: '#ID-laydate-rangeLinked', + range: ['#startTime', '#endTime'], + rangeLinked: true + }); + pages(1, 1, 1); + }) +} + +function pages(pageNum, pageSize, typeNum) { + let params = getReqParams(pageNum, pageSize, typeNum); + $.ajax({ + url: dataUrl + "/examine/getDetailList", + headers: { + "token": tokens + }, + data: params, + type: 'POST', + async: false, + success: function (result) { + if (result.code === 200) { + if (result.data) { + initTable(result.data, result.limit, result.curr) + laypages(result.count, result.curr, result.limit) + } + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, error: function (xhr) { + error(xhr); + } + }); +} + +function laypages(total, page, limit) { + layui.use(['laypage'], function () { + let laypage = layui.laypage; + laypage.render({ + elem: 'voi-page', + count: total, + curr: page, + limit: limit, + limits: [10, 20, 50, 100, 200, 500], + layout: ['prev', 'page', 'next', 'skip', 'count', 'limit'], + groups: 5, + jump: function (obj, first) { + if (!first) { + pageNum = obj.curr, limitSize = obj.limit; + pages(obj.curr, obj.limit, null); + } + } + }); + }) +} + +let flag = true; + +/*初始化表格*/ +function initTable(dataList, limit, page) { + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); + tableIns = table.render({ + elem: "#table_data", + id: 'testData', + height: "full-140", + data: dataList, + limit: limit, + cols: [ + [ + { + title: "序号", width: 80, unresize: true, align: "center", + templet: function (d) { + return (page - 1) * limit + d.LAY_NUM; + } + }, + {field: "devTypeName", title: "设备类型", unresize: true, align: "center"}, + {field: "sampleNum", title: "送样总数", unresize: true, align: "center"}, + {field: "sampleQuantity", title: "样品总数", unresize: true, align: "center"}, + {field: "experimenter", title: "试验人员", unresize: true, align: "center"}, + {field: "testTime", title: "试验时间", unresize: true, align: "center"}, + {field: "status", title: "状态", unresize: true, align: "center", templet: function (d) { + return setAuditStatus(d.status); + } + }, + {field: "causeOfRejection", title: "驳回原因", unresize: true, align: "center"}, + { + title: "原始记录", unresize: true, align: "center", + templet: function (d) { + let html = ''; + html += "查看"; + return html; + } + }, + ], + ], + done: function (res, curr, count) { + layer.close(loadingMsg); + table.resize("testData"); + count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block"); + count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto"); + } + }); +} + +// 获取参数 +function getReqParams(page, limit, type) { + let obj = {}; + if (!type) { + obj = { + page: page + "", + limit: limit + "", + keyWord: $('#keyWord').val(), + startTime: $('#startTime').val(), + endTime: $('#endTime').val(), + devTypeCode: $('#devTypeCode').val(), + id: idParam + }; + } else { + obj = { + page: '1', + limit: '10', + keyWord: '', + accessType: '', + startTime: '', + endTime: '', + devTypeCode: '', + id: idParam + }; + } + obj = { + encryptedData: encryptCBC(JSON.stringify(obj)) + } + return obj; +} + +// 查询/重置 +function query() { + let pattern = new RegExp("[%_<>]"); + if (pattern.test($("#keyWord").val())) { + $("#keyWord").val(''); + return layer.msg('关键字查询包含特殊字符，请重新输入', { + icon: 2, + time: 2000 //2秒关闭（如果不配置，默认是3秒） + }); + } + pageNum = 1; + pages(1, limitSize); +} + +function reloadData() { + pages(pageNum, limitSize); +} + +// 原始数据查看 +function viewData(experId, devTypeCode) { + let title = '原始记录'; + let param = { + 'experId': experId, + 'devTypeCode': devTypeCode + } + openIframe7("viewData", title, "child/viewExperData.html", '1500px', '800px', param); +} \ No newline at end of file diff --git a/src/main/resources/static/js/basis/originalRecord.js b/src/main/resources/static/js/basis/originalRecord.js index 43bffc4..9589d7b 100644 --- a/src/main/resources/static/js/basis/originalRecord.js +++ b/src/main/resources/static/js/basis/originalRecord.js @@ -88,7 +88,9 @@ function initTable(dataList, limit, page) { {field: "sampleUserName", title: "收样人", unresize: true, align: "center"}, {field: "sampleDate", title: "收样时间", unresize: true, align: "center"}, {field: "teamName", title: "试验班组", unresize: true, align: "center"}, - {field: "audtiStatus", title: "状态", unresize: true, align: "center"}, + {field: "audtiStatus", title: "状态", unresize: true, align: "center",templet: function (d) { + return setAuditStatus(d.audtiStatus); + }}, { title: "审查", unresize: true, width: 180, align: "center", templet: function (d) { @@ -164,7 +166,7 @@ function auditData(id, status, btnName) { 'id': id, 'status':status } - openIframe3("auditData", title, "child/auditData.html", '1500px', '800px', param); + openIframe3("auditData", title, "child/viewAuditData.html", '1500px', '800px', param); } const data = { diff --git a/src/main/resources/static/pages/basis/child/viewAuditData.html b/src/main/resources/static/pages/basis/child/viewAuditData.html new file mode 100644 index 0000000..0e238ee --- /dev/null +++ b/src/main/resources/static/pages/basis/child/viewAuditData.html @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + 试验数据-审阅/审核/审批 + + +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
-
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file