记得上下班打卡 | git大法好,push需谨慎

Commit 84259615 authored by 姜秀龙's avatar 姜秀龙

damai admin

parent 609d1843
...@@ -37,36 +37,36 @@ ...@@ -37,36 +37,36 @@
</div> </div>
</div> </div>
</div> </div>
<div th:each="tickets : ${kylinPerformanceDamaiVo.damaiTickets}"> <!-- <div th:each="tickets : ${kylinPerformanceDamaiVo.damaiTickets}">-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label is-required">票种名称:</label> <!-- <label class="col-sm-3 control-label is-required">票种名称:</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="title" th:value="${tickets.title}" class="form-control" type="text" readonly> <!-- <input name="title" th:value="${tickets.title}" class="form-control" type="text" readonly>-->
<input name="ticketsId" th:value="${tickets.ticketsId}" class="form-control" type="hidden" required> <!-- <input name="ticketsId" th:value="${tickets.ticketsId}" class="form-control" type="hidden" required>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label is-required">是否同步:</label> <!-- <label class="col-sm-3 control-label is-required">是否同步:</label>-->
<div class="col-sm-8" th:if="${tickets.syncDamai==1}"> <!-- <div class="col-sm-8" th:if="${tickets.syncDamai==1}">-->
<div class="radio check-box"> <!-- <div class="radio check-box">-->
<input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" <!-- <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}"-->
checked>同步</label> <!-- checked>同步</label>-->
</div> <!-- </div>-->
<div class="radio check-box"> <!-- <div class="radio check-box">-->
<input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">不同步</label> <!-- <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">不同步</label>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="col-sm-8" th:if="${tickets.syncDamai==0}"> <!-- <div class="col-sm-8" th:if="${tickets.syncDamai==0}">-->
<div class="radio check-box"> <!-- <div class="radio check-box">-->
<input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">同步</label> <!-- <input type="radio" value="1" th:name="'ticket_syncDamai:'+${tickets.ticketsId}">同步</label>-->
</div> <!-- </div>-->
<div class="radio check-box"> <!-- <div class="radio check-box">-->
<input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" checked> <!-- <input type="radio" value="0" th:name="'ticket_syncDamai:'+${tickets.ticketsId}" checked>-->
不同步</label> <!-- 不同步</label>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()"> <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
修改 修改
...@@ -89,15 +89,15 @@ ...@@ -89,15 +89,15 @@
status: parseInt($("input[name^='performance_sync_damai']:checked").val()) status: parseInt($("input[name^='performance_sync_damai']:checked").val())
} }
paramList.push(param) paramList.push(param)
var ticketObj = JSON.parse('[[${kylinPerformanceDamaiVo.damaiTickets}]]'); // var ticketObj = JSON.parse('[[${kylinPerformanceDamaiVo.damaiTickets}]]');
$.each(ticketObj, function (i, damaiTickets) { // $.each(ticketObj, function (i, damaiTickets) {
var param = { // var param = {
id:damaiTickets.ticketsId, // id:damaiTickets.ticketsId,
type:"ticket", // type:"ticket",
status:parseInt($("input[name^='ticket_syncDamai:"+damaiTickets.ticketsId+"']:checked").val()) // status:parseInt($("input[name^='ticket_syncDamai:"+damaiTickets.ticketsId+"']:checked").val())
} // }
paramList.push(param) // paramList.push(param)
}); // });
$.operate.post(prefix + "/damai/change", $.operate.post(prefix + "/damai/change",
{params:JSON.stringify(paramList)}, {params:JSON.stringify(paramList)},
......
...@@ -156,9 +156,9 @@ ...@@ -156,9 +156,9 @@
} else { } else {
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
} }
if (row.syncDamai == 1) { // if (row.syncDamai == 1) {
actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>'); // actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
} // }
return actions.join(''); return actions.join('');
} }
}] }]
......
...@@ -1331,7 +1331,9 @@ GROUP BY user_mobile,tickets_id; ...@@ -1331,7 +1331,9 @@ GROUP BY user_mobile,tickets_id;
SELECT kps.performance_id, kps.is_damai_basic_synced SELECT kps.performance_id, kps.is_damai_basic_synced
FROM kylin_performance_status kps FROM kylin_performance_status kps
LEFT JOIN kylin_performances kp ON kp.performances_id = kps.performance_id LEFT JOIN kylin_performances kp ON kp.performances_id = kps.performance_id
WHERE kps.status IN (3, 6, 7, 8, 9, 10) WHERE 1=1
AND kps.sync_damai = 1
-- AND kps.status IN (3, 6, 7, 8, 9, 10)
AND kp.time_end > NOW() AND kp.time_end > NOW()
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment