bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
cwchen 2025-07-25 16:46:24 +08:00
parent c47b9ffbea
commit d952c24666
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mappers/backstage/DigitalSignageMapper.xml
View File

@ -133,7 +133,7 @@
LEFT JOIN ( LEFT JOIN (
SELECT tower_id,next_tower_id SELECT tower_id,next_tower_id
FROM tb_three_span tts FROM tb_three_span tts
WHERE tts.span_type = '1' WHERE tts.span_type = '1' AND tts.is_active = '1'
GROUP BY tower_id,next_tower_id GROUP BY tower_id,next_tower_id
) B ON (tt.id = B.tower_id) OR (tt.id = B.next_tower_id) ) B ON (tt.id = B.tower_id) OR (tt.id = B.next_tower_id)
LEFT JOIN ( LEFT JOIN (

20
src/main/resources/mappers/backstage/ProProgressMapper.xml
View File

@ -149,16 +149,16 @@
<!--查询工程杆塔进度--> <!--查询工程杆塔进度-->
<select id="getTowerProgress" <select id="getTowerProgress"
resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo"> resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
SELECT COUNT(IF(tower_progress &gt;= 1, 1, NULL)) AS num1, SELECT COUNT(IF(tower_progress = 1, 1, NULL)) AS num1,
COUNT(IF(tower_progress &gt;= 2, 1, NULL)) AS num2, COUNT(IF(tower_progress = 2, 1, NULL)) AS num2,
COUNT(IF(tower_progress &gt;= 3, 1, NULL)) AS num3, COUNT(IF(tower_progress = 3, 1, NULL)) AS num3,
COUNT(IF(tower_progress &gt;= 4, 1, NULL)) AS num4, COUNT(IF(tower_progress = 4, 1, NULL)) AS num4,
COUNT(IF(tower_progress &gt;= 5, 1, NULL)) AS num5, COUNT(IF(tower_progress = 5, 1, NULL)) AS num5,
COUNT(IF(tower_progress &gt;= 6, 1, NULL)) AS num6, COUNT(IF(tower_progress = 6, 1, NULL)) AS num6,
COUNT(IF(tower_progress &gt;= 7, 1, NULL)) AS num7, COUNT(IF(tower_progress = 7, 1, NULL)) AS num7,
COUNT(IF(tower_progress &gt;= 8, 1, NULL)) AS num8, COUNT(IF(tower_progress = 8, 1, NULL)) AS num8,
COUNT(IF(tower_progress &gt;= 9, 1, NULL)) AS num9, COUNT(IF(tower_progress = 9, 1, NULL)) AS num9,
COUNT(IF(tower_progress &gt;= 10, 1, NULL)) AS num10, COUNT(IF(tower_progress = 10, 1, NULL)) AS num10,
COUNT(*) AS towerNum COUNT(*) AS towerNum
FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1' FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1'
</select> </select>

5
src/main/resources/static/js/basic/lineManagement/child/threeSpanFormTemp.js
View File

@ -284,7 +284,7 @@ function loadTowerOptions() {
params = { params = {
encryptedData: encryptCBC(JSON.stringify(params)), encryptedData: encryptCBC(JSON.stringify(params)),
}; };
ajaxRequest(url, "POST", params, true, null, function (result) { ajaxRequest(url, "POST", params, false, null, function (result) {
if (result.code === 200) { if (result.code === 200) {
let options = '<option value="">选择杆塔</option>'; let options = '<option value="">选择杆塔</option>';
// 保存杆塔列表数据 // 保存杆塔列表数据
@ -314,7 +314,7 @@ function getThreeSpanById() {
url, url,
"POST", "POST",
params, params,
true, false,
null, null,
function (result) { function (result) {
layer.close(loadingMsg); layer.close(loadingMsg);
@ -442,6 +442,7 @@ function setFormData(data) {
form.render("select"); form.render("select");
} }
} }
layui.form.render();
} }
function saveData2() { function saveData2() {