From bdc793aa9d577d0b00ab138ff2fb577269477aa7 Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Tue, 9 Mar 2021 18:24:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20Report.=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing/ReportDataController.java | 49 ++++++++++++++----- .../templates/nanjing/Report/Report.html | 17 ++++--- .../com/ruoyi/nanjing/domain/ReportData.java | 9 ++++ .../mapper/nanjing/TBdProducttypeMapper.xml | 4 +- 4 files changed, 60 insertions(+), 19 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 d439f457..192df853 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,6 +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; @@ -43,31 +44,57 @@ public class ReportDataController extends BaseController { List reportDataList = producttypeService.selectReport(map); List paraName = new ArrayList<>(); - List barcodelist = new ArrayList<>(); + List barcodes = new ArrayList<>(); + List stations = new ArrayList<>(); //取出参数名 - reportDataList.forEach(x->barcodelist.add(x.getBarcode())); + reportDataList.forEach(x->barcodes.add(x.getBarcode())); reportDataList.forEach(x->paraName.add(x.getParameaning())); + reportDataList.forEach(x->stations.add(x.getStationName())); //去重 - List barcodeList = barcodelist.stream().distinct().collect(Collectors.toList()); + //条码List + List barcodeList = barcodes.stream().distinct().collect(Collectors.toList()); + + //参数List List paraNameList = paraName.stream().distinct().collect(Collectors.toList()); + //工位名集合 + List stationList = stations.stream().distinct().collect(Collectors.toList()); + //定义结果集合 List> list = new ArrayList<>(); //定义结果集map Map map1 = new HashMap<>(); + for(String item:barcodeList){ map1.put("barcode",item); - for (String param:paraNameList) { - for (ReportData rpd:reportDataList) { - if (rpd.getBarcode().equals(item)&&rpd.getParameaning().equals(param)){ - if(rpd.getValue()==null){ - rpd.setValue("-"); + 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()); +// } + 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()); + break; } - map1.put(param,rpd.getValue()); -// map1.put(param+"value",rpd.getValue()); - break; } } } +// for (String param:paraNameList) { +// for (ReportData rpd:reportDataList) { +// if (rpd.getBarcode().equals(item)&&rpd.getParameaning().equals(param)){ +// if(rpd.getValue()==null){ +// rpd.setValue("-"); +// } +// map1.put(param,rpd.getValue()); +//// map1.put(param+"value",rpd.getValue()); +// break; +// } +// } +// } //排序的作用 TreeMap treeMap = new TreeMap<>(map1); list.add(treeMap); 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 294eed83..dd335540 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html @@ -51,14 +51,14 @@ processData: false, contentType: false, success: function (json) { - // var coulmnsData = []; + var coulmnsData = []; var columnsArray = []; - columnsArray.push({field : "barcode",title : "产品条码",colspan: 1,rowspan: 1}); - // var columns = []; + columnsArray.push({field : "barcode",title : "产品条码",colspan: 1,rowspan: 2}); + 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];//id username + var property = (Object.keys(json[0]))[i]; if(property!='barcode'){ columnsArray.push({ "title": property, @@ -66,13 +66,16 @@ switchable: true, align:"center", } + columns.push({ + "title": property, + "field": property, + }) ); } - } } - // coulmnsData.push(columnsArray); - // coulmnsData.push(columns); + coulmnsData.push(columnsArray); + coulmnsData.push(columns); // console.log(columnsArray); $('#bootstrap-table').bootstrapTable('destroy').bootstrapTable({ id: "bootstrap-table", 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 edfc5460..84a2c3aa 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 @@ -13,6 +13,15 @@ public class ReportData extends BaseEntity { private long id; private Date beginTime; private Date endTime; + private String stationName; + + public String getStationName() { + return stationName; + } + + public void setStationName(String stationName) { + this.stationName = stationName; + } public String getBarcode() { return barcode; diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml index ece19bef..adce0242 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml @@ -57,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select ID, ProductTypeID, ProductTypeName from T_BD_ProductType @@ -151,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"