feat(acid): 支持按热卷号搜索实绩数据
- 修改前端界面将搜索选项从"按钢卷号"扩展为"按钢卷号/热卷号" - 更新搜索标签从"钢卷号"改为"钢卷号/热卷号" - 将输入框占位符从"EXCOILID"更新为"子卷号或热卷号" - 修改后端SQL查询逻辑同时支持EXCOILID和HOT_COILID字段搜索 - 为两个查询方法添加热卷号搜索条件支持
This commit is contained in:
@@ -513,7 +513,7 @@ public class SqlServerApiClient {
|
|||||||
params.put("endRow", endRow);
|
params.put("endRow", endRow);
|
||||||
StringBuilder where = new StringBuilder();
|
StringBuilder where = new StringBuilder();
|
||||||
if (coilId != null && !coilId.trim().isEmpty()) {
|
if (coilId != null && !coilId.trim().isEmpty()) {
|
||||||
where.append(" AND UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%'");
|
where.append(" AND (UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%' OR UPPER(HOT_COILID) LIKE '%' || UPPER(:coilId) || '%')");
|
||||||
params.put("coilId", coilId.trim());
|
params.put("coilId", coilId.trim());
|
||||||
}
|
}
|
||||||
if (startDate != null && !startDate.trim().isEmpty()) {
|
if (startDate != null && !startDate.trim().isEmpty()) {
|
||||||
@@ -533,7 +533,7 @@ public class SqlServerApiClient {
|
|||||||
Map<String, Object> params = new java.util.HashMap<>();
|
Map<String, Object> params = new java.util.HashMap<>();
|
||||||
StringBuilder where = new StringBuilder();
|
StringBuilder where = new StringBuilder();
|
||||||
if (coilId != null && !coilId.trim().isEmpty()) {
|
if (coilId != null && !coilId.trim().isEmpty()) {
|
||||||
where.append(" AND UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%'");
|
where.append(" AND (UPPER(EXCOILID) LIKE '%' || UPPER(:coilId) || '%' OR UPPER(HOT_COILID) LIKE '%' || UPPER(:coilId) || '%')");
|
||||||
params.put("coilId", coilId.trim());
|
params.put("coilId", coilId.trim());
|
||||||
}
|
}
|
||||||
if (startDate != null && !startDate.trim().isEmpty()) {
|
if (startDate != null && !startDate.trim().isEmpty()) {
|
||||||
|
|||||||
@@ -172,10 +172,10 @@
|
|||||||
<div class="search-panel">
|
<div class="search-panel">
|
||||||
<div class="panel-title">查找</div>
|
<div class="panel-title">查找</div>
|
||||||
<div class="search-type-group">
|
<div class="search-type-group">
|
||||||
<el-radio v-model="searchType" label="coil">按钢卷号</el-radio>
|
<el-radio v-model="searchType" label="coil">按钢卷号/热卷号</el-radio>
|
||||||
<div v-if="searchType === 'coil'" class="search-field">
|
<div v-if="searchType === 'coil'" class="search-field">
|
||||||
<span class="search-label">钢卷号:</span>
|
<span class="search-label">钢卷号/热卷号:</span>
|
||||||
<el-input v-model="searchCoilId" size="mini" style="width:140px" placeholder="EXCOILID" />
|
<el-input v-model="searchCoilId" size="mini" style="width:140px" placeholder="子卷号或热卷号" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="search-type-group">
|
<div class="search-type-group">
|
||||||
|
|||||||
Reference in New Issue
Block a user