From 0596a7b79ff2233576cb5820bb9b5bf9007a850b Mon Sep 17 00:00:00 2001
From: Limy <1353020654@qq.com>
Date: Fri, 12 Mar 2021 15:36:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=8D=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2-=E5=85=A8=E9=83=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/nanjing/StationParaInfoController.java  | 1 +
 .../templates/nanjing/StationParaInfo/StationParaInfo.html | 7 ++++---
 .../main/resources/mapper/nanjing/TSyTracestateMapper.xml  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java
index 3c330721..f6f74b30 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java
@@ -21,6 +21,7 @@ import java.io.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Controller
 @RequestMapping("/nanjing/selectStationPara")
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html
index 9b6f5a86..cdb228be 100644
--- a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html
@@ -66,15 +66,16 @@
             success: function (json) {
                 console.log(json);
                 var columnsArray1 = [];
-
+                //
                 columnsArray1.push({field : "序号",title : "序号",colspan: 1,rowspan: 1});
                 columnsArray1.push({field : "产品码",title : "产品码",colspan: 1,rowspan: 1});
                 columnsArray1.push({field : "状态",title : "状态",colspan: 1,rowspan: 1});
                 columnsArray1.push({field : "记录时间",title : "记录时间",colspan: 1,rowspan: 1});
+                columnsArray1.push({field : "工位名称",title : "工位名称",colspan: 1,rowspan: 1});
                 if(json.total>0) {
                     for (var i = 0; i < (Object.keys(json.rows[0])).length; i++) {//Object.keys(obj) 获取key名称
                         var property = (Object.keys(json.rows[0]))[i];
-                        if(property!='产品码'&&property!='记录时间'&&property!='序号'&&property!='状态') {
+                        if(property!='产品码'&&property!='记录时间'&&property!='序号'&&property!='状态'&&property!='工位名称') {
                             columnsArray1.push({
                                 "title": property,
                                 "field": property,
@@ -145,7 +146,7 @@
                     toolbar: "#toolbar",
                     singleSelect: false,
                     clickToSelect: true,
-                    sortName: "记录时间",
+                    sortName: "序号",
                     sortOrder: "desc",
                     pageSize: 50,
                     pageNumber: 1,
diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml
index e4bf4536..42a33038 100644
--- a/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml
@@ -121,7 +121,7 @@
             )
         }
     </select>
-    <select id="selectStationPara" statementType="CALLABLE" parameterType="map" resultType="map" >
+    <select id="selectStationPara" statementType="CALLABLE" parameterType="map" resultType="java.util.LinkedHashMap" >
         {
             call pro_SelectSemiStationParaData
             (