From 6cfbe887d28c407c3eee1a925a9e4ce0db077a3e Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Tue, 9 Mar 2021 19:07:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20Report.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing/ReportDataController.java | 10 ++++------ .../templates/nanjing/Report/Report.html | 20 +++++++++---------- .../com/ruoyi/nanjing/domain/ReportData.java | 8 +++++--- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java index 192df853..259e899a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java @@ -53,7 +53,6 @@ public class ReportDataController extends BaseController { //去重 //条码List List barcodeList = barcodes.stream().distinct().collect(Collectors.toList()); - //参数List List 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(station,rpd.getStationName()); -// } + map1.put("beginTime",rpd.getBeginTime()); if (rpd.getBarcode().equals(item)&&rpd.getStationName().equals(station)&&rpd.getParameaning().equals(param)){ if(rpd.getValue()==null){ rpd.setValue("-"); } - map1.put(station,param); - map1.put(param,rpd.getValue()); + String paramName = rpd.getStationName()+"-"+rpd.getParameaning(); +// map1.put(station,param); + map1.put(paramName,rpd.getValue()); break; } } diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html index dd335540..3eb7dde3 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html +++ b/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}); - var columns = []; + columnsArray.push({field : "barcode",title : "产品条码",colspan: 1,rowspan: 1}); + 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(columns); - // console.log(columnsArray); + // coulmnsData.push(columnsArray); + // coulmnsData.push(columns); + console.log(columnsArray); $('#bootstrap-table').bootstrapTable('destroy').bootstrapTable({ id: "bootstrap-table", data:json, diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java index 84a2c3aa..ae8c347f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java +++ b/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; } From a0f1f92f1eac74db6b62459779f79ededf528fbb Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Wed, 10 Mar 2021 08:50:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=8D=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2-=E5=AF=BC=E5=87=BA=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/nanjing/ReportDataController.java | 2 -- .../ruoyi/web/controller/nanjing/StationParaInfoController.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java index 259e899a..2a26276a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java @@ -2,9 +2,7 @@ package com.ruoyi.web.controller.nanjing; import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.nanjing.domain.Demo; import com.ruoyi.nanjing.domain.ReportData; -import com.ruoyi.nanjing.domain.TBdProductinfo; import com.ruoyi.nanjing.service.ITBdProducttypeService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; 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 b6ac2a68..b8ecd8bd 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 @@ -5,7 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.ExcelUtil; +//import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.nanjing.domain.ParaAllShow; import com.ruoyi.nanjing.domain.ProRpList; import com.ruoyi.nanjing.domain.TBdProductinfo;