update

Report. 添加工位

ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java

@@ -53,7 +53,6 @@ public class ReportDataController extends BaseController {
         //去重
         //条码List
         List<String> barcodeList = barcodes.stream().distinct().collect(Collectors.toList());
-
         //参数List
         List<String> paraNameList = paraName.stream().distinct().collect(Collectors.toList());
         //工位名集合
@@ -69,15 +68,14 @@ public class ReportDataController extends BaseController {
             for (String station:stationList) {
                 for(String param:paraNameList){
                     for (ReportData rpd:reportDataList) {
-//                        if (rpd.getBarcode().equals(item)&&rpd.getStationName().equals(station)){
+                        map1.put("beginTime",rpd.getBeginTime());
-//                            map1.put(station,rpd.getStationName());
-//                        }
                         if (rpd.getBarcode().equals(item)&&rpd.getStationName().equals(station)&&rpd.getParameaning().equals(param)){
                             if(rpd.getValue()==null){
                                 rpd.setValue("-");
                             }
-                            map1.put(station,param);
+                            String paramName = rpd.getStationName()+"-"+rpd.getParameaning();
-                            map1.put(param,rpd.getValue());
+//                            map1.put(station,param);
+                            map1.put(paramName,rpd.getValue());
                             break;
                         }
                     }

ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html

@@ -51,32 +51,30 @@
             processData: false,
             contentType: false,
             success: function (json) {
-                var coulmnsData = [];
+                // var coulmnsData = [];
                 var columnsArray = [];
-                columnsArray.push({field : "barcode",title : "产品条码",colspan: 1,rowspan: 2});
+                columnsArray.push({field : "barcode",title : "产品条码",colspan: 1,rowspan: 1});
-                var columns = [];
+                columnsArray.push({field : "beginTime",title : "时间",colspan: 1,rowspan: 1});
+                // var columns = [];
                 if(json.length>0){
                     // console.log(Object.keys(json[0]).length);
                     for (var i = 0; i < (Object.keys(json[0])).length; i++) {//Object.keys(obj) 获取key名称
                         var property = (Object.keys(json[0]))[i];
-                        if(property!='barcode'){
+                        if(property!='barcode'&&property!='beginTime'){
                             columnsArray.push({
                                 "title": property,
                                 "field": property,
                                 switchable: true,
                                 align:"center",
                             }
-                            columns.push({
-                                "title": property,
-                                "field": property,
-                            })
                             );
                         }
+
                     }
                 }
-                coulmnsData.push(columnsArray);
+                // coulmnsData.push(columnsArray);
-                coulmnsData.push(columns);
+                // coulmnsData.push(columns);
-                // console.log(columnsArray);
+                console.log(columnsArray);
                 $('#bootstrap-table').bootstrapTable('destroy').bootstrapTable({
                     id: "bootstrap-table",
                     data:json,

ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java

@@ -1,5 +1,6 @@
 package com.ruoyi.nanjing.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.util.Date;
@@ -11,7 +12,8 @@ public class ReportData extends BaseEntity {
     private String parameaning;
     private String value;
     private long id;
-    private Date beginTime;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
     private Date endTime;
     private String stationName;
 
@@ -55,11 +57,11 @@ public class ReportData extends BaseEntity {
         this.id = id;
     }
 
-    public Date getBeginTime() {
+    public String getBeginTime() {
         return beginTime;
     }
 
-    public void setBeginTime(Date beginTime) {
+    public void setBeginTime(String beginTime) {
         this.beginTime = beginTime;
     }