From 585a6576f34d99e356720cf756dd3918f8a69086 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 26 Jul 2024 18:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ToolsManageServiceImpl.java  |  4 ----
 .../mappers/basis/ToolsManageMapper.xml       | 23 ++++++++++---------
 .../static/js/samples/child/samplesAdd.js     |  4 ++++
 .../static/js/system/child/userForm.js        | 12 ++++------
 .../js/testReport/child/testReportForm.js     |  2 +-
 .../static/js/testReport/testReportMge.js     |  2 +-
 .../pages/samples/child/samplesAdd.html       |  2 +-
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java
index d89944b..9c7e76b 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java
@@ -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;
 	}
 
diff --git a/src/main/resources/mappers/basis/ToolsManageMapper.xml b/src/main/resources/mappers/basis/ToolsManageMapper.xml
index 943c1ab..96f5fc3 100644
--- a/src/main/resources/mappers/basis/ToolsManageMapper.xml
+++ b/src/main/resources/mappers/basis/ToolsManageMapper.xml
@@ -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>
diff --git a/src/main/resources/static/js/samples/child/samplesAdd.js b/src/main/resources/static/js/samples/child/samplesAdd.js
index dd89953..94838cd 100644
--- a/src/main/resources/static/js/samples/child/samplesAdd.js
+++ b/src/main/resources/static/js/samples/child/samplesAdd.js
@@ -160,6 +160,10 @@ function getReqParams(page, limit, type) {
     return obj;
 }
 
+function cancel() {
+    closePage(0);
+}
+
 /**
  * 上传数据
  */
diff --git a/src/main/resources/static/js/system/child/userForm.js b/src/main/resources/static/js/system/child/userForm.js
index 924fb71..83dc2ff 100644
--- a/src/main/resources/static/js/system/child/userForm.js
+++ b/src/main/resources/static/js/system/child/userForm.js
@@ -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")
diff --git a/src/main/resources/static/js/testReport/child/testReportForm.js b/src/main/resources/static/js/testReport/child/testReportForm.js
index 5598d9e..71ea2cf 100644
--- a/src/main/resources/static/js/testReport/child/testReportForm.js
+++ b/src/main/resources/static/js/testReport/child/testReportForm.js
@@ -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"},
diff --git a/src/main/resources/static/js/testReport/testReportMge.js b/src/main/resources/static/js/testReport/testReportMge.js
index 2a98bec..fc4274a 100644
--- a/src/main/resources/static/js/testReport/testReportMge.js
+++ b/src/main/resources/static/js/testReport/testReportMge.js
@@ -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"},
diff --git a/src/main/resources/static/pages/samples/child/samplesAdd.html b/src/main/resources/static/pages/samples/child/samplesAdd.html
index 39cb20a..be47c4a 100644
--- a/src/main/resources/static/pages/samples/child/samplesAdd.html
+++ b/src/main/resources/static/pages/samples/child/samplesAdd.html
@@ -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>