From f8b3aecccd31d845804d0255a034d4727b4adcea Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 26 Jul 2024 16:32:59 +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

---
 .../basis/entity/dto/TestReportManageDto.java  | 11 +++++++++++
 .../impl/TestReportManageServiceImpl.java      |  4 ----
 .../mappers/basis/TestReportManageMapper.xml   | 10 ++++++++++
 .../js/testReport/child/testReportForm.js      | 12 +++++++++++-
 .../static/js/testReport/testReportMge.js      | 14 +++++++++++---
 .../pages/testReport/child/testReportForm.html | 18 ++++++++++++++++--
 .../static/pages/testReport/testReportMge.html | 18 +++++++++++++-----
 7 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java b/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java
index 9106db1..428c4f0 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/dto/TestReportManageDto.java
@@ -173,4 +173,15 @@ public class TestReportManageDto extends PageEntity {
 
 	private List<ExperimentalDetailVo.Sample> sampleList;
 
+	/**
+	 * 开始时间
+	 */
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
+
+
 }
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
index c446c46..e9052c9 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/TestReportManageServiceImpl.java
@@ -42,10 +42,6 @@ public class TestReportManageServiceImpl implements TestReportManageService {
 	@Override
 	public List<TestReportManageDto> list(TestReportManageDto bean) {
 		List<TestReportManageDto> list = testReportManageDao.list(bean);
-//		for (TestReportManageDto dto : list){
-//			String sampleTools = testReportManageDao.getSampleTools(dto.getId());
-//			dto.setSampleTools(sampleTools);
-//		}
 		return list;
 	}
 
diff --git a/src/main/resources/mappers/basis/TestReportManageMapper.xml b/src/main/resources/mappers/basis/TestReportManageMapper.xml
index 72220c5..a2faff7 100644
--- a/src/main/resources/mappers/basis/TestReportManageMapper.xml
+++ b/src/main/resources/mappers/basis/TestReportManageMapper.xml
@@ -87,6 +87,7 @@
 		LEFT JOIN tb_custom tc on tc.id=ts.custom_id and tc.del_flag=0
 		LEFT JOIN sys_user su on su.id=ts.create_user and su.del_flag=0
 		LEFT JOIN tb_team tt on tt.id=ts.team_id and tt.del_flag=0
+		where 1=1
 		<if test="collectSamplesUser != null and collectSamplesUser != ''">
 			AND su.user_name like concat('%', #{collectSamplesUser}, '%')
 		</if>
@@ -96,6 +97,12 @@
 				tt.team_name like concat('%', #{keyWord}, '%')
 			)
 		</if>
+		<if test="startTime != null and endTime!=''">
+			AND (
+			DATE_FORMAT(ts.sample_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} OR
+			DATE_FORMAT(ts.sample_date, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+			)
+		</if>
 	</select>
 	<select id="getSampleTools" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(aa.dev_type_name SEPARATOR '、') AS sampleTools
@@ -137,6 +144,9 @@
 			tsd.dev_module like concat('%', #{keyWord}, '%')
 			)
 		</if>
+		<if test="startTime != null and endTime!=''">
+			AND DATE_FORMAT(te.create_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+		</if>
 		GROUP BY tsd.dev_type_name,tsd.department_id,ted.is_hg
 		)aa
 		LEFT JOIN tb_certificate tc on tc.exper_id=aa.id and tc.dev_type=aa.sampleTools
diff --git a/src/main/resources/static/js/testReport/child/testReportForm.js b/src/main/resources/static/js/testReport/child/testReportForm.js
index 361e328..5598d9e 100644
--- a/src/main/resources/static/js/testReport/child/testReportForm.js
+++ b/src/main/resources/static/js/testReport/child/testReportForm.js
@@ -1,4 +1,4 @@
-let form, layer,  table, tableIns;
+let form, layer,  table, tableIns, laydate;
 let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10
 let orgData,selectOrgId;
 let idParam;
@@ -9,9 +9,15 @@ function setParams(params){
         form = layui.form;
         layer = layui.layer;
         table = layui.table;
+        laydate = layui.laydate;
         layui.form.render();
         pages(1, 10, 1);
         getToolsSelected();
+        laydate.render({
+            elem: '#ID-laydate-rangeLinked',
+            range: ['#startTime', '#endTime'],
+            rangeLinked: true // 开启日期范围选择时的区间联动标注模式 ---  2.8+ 新增
+        });
     })
 }
 
@@ -221,6 +227,8 @@ function getReqParams(page, limit, type) {
             id: idParam,
             sampleTools: selectedText,
             keyWord:$('#keyWord').val(),
+            startTime: $('#startTime').val(),
+            endTime: $('#endTime').val(),
             reportCode:$('#reportCode').val()
         };
     } else {
@@ -230,6 +238,8 @@ function getReqParams(page, limit, type) {
             id: idParam,
             sampleTools: selectedText,
             keyWord: '',
+            startTime: '',
+            endTime: '',
             reportCode:''
         };
     }
diff --git a/src/main/resources/static/js/testReport/testReportMge.js b/src/main/resources/static/js/testReport/testReportMge.js
index ee76a9e..2a98bec 100644
--- a/src/main/resources/static/js/testReport/testReportMge.js
+++ b/src/main/resources/static/js/testReport/testReportMge.js
@@ -1,4 +1,4 @@
-let form, layer,  table, tableIns;
+let form, layer,  table, tableIns, laydate;
 let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10
 let orgData,selectOrgId;
 let quanju = new Array();//全局
@@ -8,7 +8,13 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
     form = layui.form;
     layer = layui.layer;
     table = layui.table;
+    laydate = layui.laydate;
     layui.form.render();
+    laydate.render({
+        elem: '#ID-laydate-rangeLinked',
+        range: ['#startTime', '#endTime'],
+        rangeLinked: true
+    });
     pages(1, 10, 1);
     getToolsSelected();
 })
@@ -172,7 +178,8 @@ function getReqParams(page, limit, type) {
             page: page + "",
             limit: limit + "",
             sampleTools: selectedText,
-            collectSamplesUser:$('#collectSamplesUser').val(),
+            startTime: $('#startTime').val(),
+            endTime: $('#endTime').val(),
             keyWord:$('#keyWord').val()
         };
     } else {
@@ -180,7 +187,8 @@ function getReqParams(page, limit, type) {
             page: '1',
             limit: '10',
             sampleTools: '',
-            collectSamplesUser: '',
+            startTime: '',
+            endTime: '',
             keyWord: ''
         };
     }
diff --git a/src/main/resources/static/pages/testReport/child/testReportForm.html b/src/main/resources/static/pages/testReport/child/testReportForm.html
index a0a0b3d..a462cdc 100644
--- a/src/main/resources/static/pages/testReport/child/testReportForm.html
+++ b/src/main/resources/static/pages/testReport/child/testReportForm.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../../js/layui-v2.6.8/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../js/layui-v2.9.14/layui/css/layui.css">
     <link rel="stylesheet" href="../../../js/layui-v2.6.8/dtree/dtree.css">
     <link rel="stylesheet" href="../../../js/layui-v2.6.8/dtree/font/dtreefont.css">
     <link rel="stylesheet" href="../../../css/table-common2.css">
     <script src="../../../js/libs/jquery-2.1.1.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
+    <script src="../../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../../js/publicJs.js"></script>
     <script src="../../../js/commonUtils.js"></script>
     <script src="../../../js/openIframe.js"></script>
@@ -28,6 +28,20 @@
                     </div>
                 </div>
 
+                <div class="layui-inline">
+                    <div class="layui-inline" id="ID-laydate-rangeLinked">
+                        <div class="layui-input-inline">
+                            <input type="text" autocomplete="off" readonly id="startTime" class="layui-input"
+                                   placeholder="开始日期">
+                        </div>
+                        <div class="layui-form-mid">-</div>
+                        <div class="layui-input-inline">
+                            <input type="text" autocomplete="off" readonly id="endTime" class="layui-input"
+                                   placeholder="结束日期">
+                        </div>
+                    </div>
+                </div>
+
                 <div class="layui-inline" style="padding: 0 0 0 10px;">
                     <div class="layui-input-inline">
                         <input type="text" id="reportCode" maxlength="30" class="layui-input" placeholder="请输入报告编号">
diff --git a/src/main/resources/static/pages/testReport/testReportMge.html b/src/main/resources/static/pages/testReport/testReportMge.html
index 54eca93..59e7639 100644
--- a/src/main/resources/static/pages/testReport/testReportMge.html
+++ b/src/main/resources/static/pages/testReport/testReportMge.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="../../js/layui-v2.6.8/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../js/layui-v2.9.14/layui/css/layui.css">
     <link rel="stylesheet" href="../../js/layui-v2.6.8/dtree/dtree.css">
     <link rel="stylesheet" href="../../js/layui-v2.6.8/dtree/font/dtreefont.css">
     <link rel="stylesheet" href="../../css/table-common2.css">
     <script src="../../js/libs/jquery-2.1.1.min.js" charset="UTF-8" type="text/javascript"></script>
-    <script src="../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
+    <script src="../../js/layui-v2.9.14/layui/layui.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../js/publicJs.js"></script>
     <script src="../../js/dict.js"></script>
     <script src="../../js/commonUtils.js"></script>
@@ -29,9 +29,17 @@
                     </div>
                 </div>
 
-                <div class="layui-inline" style="padding: 0 0 0 10px;">
-                    <div class="layui-input-inline">
-                        <input type="text" id="collectSamplesUser" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入收样人">
+                <div class="layui-inline">
+                    <div class="layui-inline" id="ID-laydate-rangeLinked">
+                        <div class="layui-input-inline">
+                            <input type="text" autocomplete="off" readonly id="startTime" class="layui-input"
+                                   placeholder="开始日期">
+                        </div>
+                        <div class="layui-form-mid">-</div>
+                        <div class="layui-input-inline">
+                            <input type="text" autocomplete="off" readonly id="endTime" class="layui-input"
+                                   placeholder="结束日期">
+                        </div>
                     </div>
                 </div>