haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检测报告管理

This commit is contained in:
hayu 2024-07-26 18:30:46 +08:00
parent 2edc5bfc6b
commit 585a6576f3
7 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java
View File

@ -45,10 +45,6 @@ public class ToolsManageServiceImpl implements ToolsManageService {
@Override
public List<ToolsManageDto> list(ToolsManageDto bean) {
List<ToolsManageDto> list = toolsManageDao.list(bean);
// for (ToolsManageDto dto : list){
// String sampleTools = toolsManageDao.getSampleTools(dto.getId());
// dto.setSampleTools(sampleTools);
// }
return list;
}

23
src/main/resources/mappers/basis/ToolsManageMapper.xml
View File

@ -4,40 +4,41 @@
<select id="list" resultType="com.bonus.aqgqj.basis.entity.dto.ToolsManageDto">
SELECT
tsd.id,
ted.id,
tsd.dev_type_name as sampleTools,
tsd.dev_code as devCode,
ted.dev_code as devCode,
tsd.customer_code as customerCode,
tsd.dev_module as devModule,
tc.custom_name as customName,
tcs.custom_name as sampleDepartment,
ted.manufacture_date as manufactureDate,
te.exper_time as experTime,
te.exper_conclu as experConclu,
case ted.is_hg when 0 then '合格'
when 1 then '不合格'
end as experConclu,
te.next_exper_time as nextExperTime,
te.submit_location as submitLocation,
su.user_name as experUser
FROM
tb_sample_device tsd
tb_exper_dev ted
LEFT JOIN tb_sample_device tsd on ted.dev_id=tsd.id and tsd.del_falg=0
LEFT JOIN tb_sample ts on ts.id=tsd.sample_id and ts.del_flag=0
LEFT JOIN tb_custom tc on tc.id=ts.custom_id and tc.del_flag=0
LEFT JOIN tb_custom tcs on tcs.id=tsd.department_id and tcs.del_flag=0
LEFT JOIN tb_exper_dev ted on ted.dev_id=tsd.id
LEFT JOIN tb_exper te on te.id=ted.exper_id and te.del_flag=0
LEFT JOIN tb_custom tcs on tcs.id=ted.department_id and tcs.del_flag=0
LEFT JOIN tb_exper te on te.id=ted.exper_id
LEFT JOIN sys_user su on su.id=te.create_user and su.del_flag=0
WHERE
tsd.del_falg=0
is_hg=0
<if test="sampleTools != null and sampleTools != ''">
and tsd.dev_type_name like concat('%',#{sampleTools}, '%')
</if>
<if test="keyWord != null and keyWord != ''">
AND (
tsd.dev_code like concat('%', #{keyWord}, '%') OR
ted.dev_code like concat('%', #{keyWord}, '%') OR
tsd.customer_code like concat('%', #{keyWord}, '%') OR
tsd.dev_module like concat('%', #{keyWord}, '%') OR
tc.custom_name like concat('%', #{keyWord}, '%') OR
tcs.custom_name like concat('%', #{keyWord}, '%') OR
te.exper_conclu like concat('%', #{keyWord}, '%')
tcs.custom_name like concat('%', #{keyWord}, '%')
)
</if>
</select>

4
src/main/resources/static/js/samples/child/samplesAdd.js
View File

@ -160,6 +160,10 @@ function getReqParams(page, limit, type) {
return obj;
}
function cancel() {
closePage(0);
}
/**
* 上传数据
*/

12
src/main/resources/static/js/system/child/userForm.js
View File

@ -6,10 +6,6 @@ let data = [], appResList = [];
let roleList;
let orgData;
let teamList;
// showDictSelect("orgId", "org_id");
// showDictSelect("sex", "sex");
// showDictSelect("unit", "unit");
// showDictSelect("dept", "dept");
function setParams(params) {
console.log(params)
idParam = JSON.parse(params).id;
@ -72,7 +68,7 @@ function setParams(params) {
*/
function getRoleSelected() {
let url = dataUrl + '/roles/all';
ajaxRequest(url, "POST", null, true, function () {
ajaxRequest(url, "POST", null, false, function () {
}, function (result) {
if (result.code === 200) {
setSelectValue(result.data, 'roleId');
@ -88,8 +84,8 @@ function getRoleSelected() {
* 获取班组数据
*/
function getTeamSelected() {
let url = dataUrl + '/samples/getTeamSelected';
ajaxRequest(url, "POST", null, true, function () {
let url = dataUrl + '/testReport/getTeamSelected';
ajaxRequest(url, "POST", null, false, function () {
}, function (result) {
if (result.code === 200) {
setSelectValue(result.data, 'teamId');
@ -121,7 +117,7 @@ function setOrgTree(data){
function getOrgTree() {
let data = [];
let url = dataUrl + '/users/getOrg';
ajaxRequest(url, "POST", null, true, function () {
ajaxRequest(url, "POST", null, false, function () {
}, function (result) {
if (result.code === 200) {
console.log(result,"getOrgTree")

2
src/main/resources/static/js/testReport/child/testReportForm.js
View File

@ -90,7 +90,7 @@ function initTable(dataList, limit, page) {
//表头
{title: "序号", width: 68, unresize: true, align: "center",
templet: function (d) {
return (page - 1) * limit + d.LAY_INDEX;
return (page - 1) * limit + d.LAY_NUM;
}
},
{field: "sampleTools", title: "设备类型", unresize: true, align: "center"},

2
src/main/resources/static/js/testReport/testReportMge.js
View File

@ -100,7 +100,7 @@ function initTable(dataList, limit, page) {
//表头
{title: "序号", width: 80, unresize: true, align: "center",
templet: function (d) {
return (page - 1) * limit + d.LAY_INDEX;
return (page - 1) * limit + d.LAY_NUM;
}
},
{field: "customName", title: "送样单位", unresize: true, align: "center"},

2
src/main/resources/static/pages/samples/child/samplesAdd.html
View File

@ -131,7 +131,7 @@
<div class="table-box right-box" table-responsive style="z-index: 1;">
<table id="table_data" class="table" lay-filter="table_data"></table>
<!-- <div id="voi-page" class="layout"></div>-->
<button style="margin-top: 5%; width: 100px; margin-left: 55%" id="cancel" class="layui-btn" >取消</button>
<button style="margin-top: 5%; width: 100px; margin-left: 55%" id="cancel" class="layui-btn" onclick="cancel()">取消</button>
<button style="margin-top: 5%; width: 100px; margin-left: 5%" id="upload" class="layui-btn" onclick="uploadData()" >上传</button>
</div>
</div>