DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
jhd
2026-07-04 10:29:39 +08:00
parent dde554c081 ca0de0fcd6
commit 827555aa43
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
View File

@@ -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()) {

6
klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
View File

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