update

工位参数查询-全部字段排序

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

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,

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
             (