排序修改,样式修改

This commit is contained in:
cwchen 2024-09-20 18:01:38 +08:00
parent c8a8ec0a21
commit fd50ae3a21
5 changed files with 37 additions and 31 deletions

View File

@ -52,6 +52,7 @@
</update>
<select id="list" resultType="com.bonus.aqgqj.basis.entity.dto.SamplesManageDto">
SELECT * FROM (
SELECT ts.id,
tc.custom_name as customName,
ts.sample_user as sampleUser,
@ -80,6 +81,8 @@
)
</if>
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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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>