排序修改，样式修改

src/main/resources/mappers/basis/SamplesManageMapper.xml

@@ -52,34 +52,37 @@
 	</update>
 
 	<select id="list" resultType="com.bonus.aqgqj.basis.entity.dto.SamplesManageDto">
-		SELECT ts.id,
+		SELECT * FROM (
-		tc.custom_name  as customName,
+			SELECT ts.id,
-		ts.sample_user  as sampleUser,
+			tc.custom_name  as customName,
-		ts.sample_time  as sampleTime,
+			ts.sample_user  as sampleUser,
-		su.user_name    as collectSamplesUser,
+			ts.sample_time  as sampleTime,
-		tsd.create_time as collectSamplesTime,
+			su.user_name    as collectSamplesUser,
-		tt.team_name    as teamName
+			tsd.create_time as collectSamplesTime,
-		FROM tb_sample ts
+			tt.team_name    as teamName
-		LEFT JOIN tb_custom tc
+			FROM tb_sample ts
-		on tc.id = ts.custom_id
+			LEFT JOIN tb_custom tc
-		LEFT JOIN tb_sample_device tsd on tsd.sample_id = ts.id
+			on tc.id = ts.custom_id
-		LEFT JOIN sys_user su on su.id = tsd.create_user
+			LEFT JOIN tb_sample_device tsd on tsd.sample_id = ts.id
-		LEFT JOIN tb_team tt on tt.id = ts.team_id
+			LEFT JOIN sys_user su on su.id = tsd.create_user
-		WHERE ts.del_flag = '0'
+			LEFT JOIN tb_team tt on tt.id = ts.team_id
-		<if test="collectSamplesUser != null and collectSamplesUser != ''">
+			WHERE ts.del_flag = '0'
-			AND su.user_name like concat('%', #{collectSamplesUser}, '%')
+			<if test="collectSamplesUser != null and collectSamplesUser != ''">
-		</if>
+				AND su.user_name like concat('%', #{collectSamplesUser}, '%')
-		<if test="sampleTools != null and sampleTools != ''">
+			</if>
-			and tsd.dev_type_name like concat('%',#{sampleTools}, '%')
+			<if test="sampleTools != null and sampleTools != ''">
-		</if>
+				and tsd.dev_type_name like concat('%',#{sampleTools}, '%')
-		<if test="keyWord != null and keyWord != ''">
+			</if>
-			AND (
+			<if test="keyWord != null and keyWord != ''">
-			    ts.sample_user like concat('%', #{keyWord}, '%') OR
+				AND (
-			    tc.custom_name like concat('%', #{keyWord}, '%') OR
+				ts.sample_user like concat('%', #{keyWord}, '%') OR
+				tc.custom_name like concat('%', #{keyWord}, '%') OR
 				tt.team_name like concat('%', #{keyWord}, '%')
-			)
+				)
-		</if>
+			</if>
-		GROUP BY ts.id
+			GROUP BY ts.id
+	) a
+	ORDER BY a.sampleTime DESC
 	</select>
 	<select id="getSampleTools" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(aa.dev_type_name SEPARATOR '、') AS sampleTools

src/main/resources/mappers/basis/TestReportManageMapper.xml

@@ -60,6 +60,7 @@
 			DATE_FORMAT(ts.sample_date, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
 			)
 		</if>
+		ORDER BY ts.sample_time DESC
 	</select>
 	<select id="getSampleTools" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(aa.dev_type_name SEPARATOR '、') AS sampleTools

src/main/resources/mappers/basis/ToolsManageMapper.xml

@@ -43,6 +43,7 @@
 			tcs.custom_name like concat('%', #{keyWord}, '%')
 			)
 		</if>
+		ORDER BY te.exper_time DESC
 	</select>
 	<select id="getSampleTools" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(aa.dev_type_name SEPARATOR '、') AS sampleTools

src/main/resources/mappers/primaryData/PrimaryDataMapper.xml

@@ -48,7 +48,7 @@
 				AND ts.team_id = -1
 			</if>
 		</if>
-		ORDER BY dispatch_time ASC
+		ORDER BY dispatch_time DESC
 	</select>
 
 	<!--试验详情列表-->

src/main/resources/static/pages/samples/samplesMge.html

@@ -72,13 +72,14 @@
         height: 150px !important;
     }
 
-    .ellipsis {
+    /*.ellipsis {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        max-width: 150px; /* 根据需要调整宽度 */
+        max-width: 150px; !* 根据需要调整宽度 *!
         display: block;
-    }
+        word-break: break-all;
+    }*/
 </style>
 
 <script src="../../js/samples/samplesMge.js" charset="UTF-8" type="text/javascript"></script>