From 655f2ef2ae37182e61863c353de0faf8f35f8704 Mon Sep 17 00:00:00 2001
From: Limy <1353020654@qq.com>
Date: Fri, 19 Feb 2021 17:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nanjing/ReportDataController.java         | 45 +++++++++++
 .../nanjing/StatisticStProductController.java |  1 +
 .../templates/nanjing/Report/Report.html      | 75 +++++++++++++++++++
 .../com/ruoyi/nanjing/domain/ReportData.java  | 74 ++++++++++++++++++
 .../nanjing/mapper/TBdProducttypeMapper.java  |  2 +
 .../service/ITBdProducttypeService.java       |  2 +
 .../impl/TBdProducttypeServiceImpl.java       |  5 ++
 .../mapper/nanjing/TBdProducttypeMapper.xml   | 18 +++++
 8 files changed, 222 insertions(+)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java
 create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
 create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java

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
new file mode 100644
index 00000000..6ec7bd94
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/ReportDataController.java
@@ -0,0 +1,45 @@
+package com.ruoyi.web.controller.nanjing;
+
+import com.ruoyi.common.core.controller.BaseController;
+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;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/nanjing/reportData")
+public class ReportDataController extends BaseController {
+
+    private String prefix = "nanjing/Report";
+    @Autowired
+    private ITBdProducttypeService producttypeService;
+    @RequiresPermissions("nanjing:report:view")
+    @GetMapping()
+    public String stationProduct(ModelMap map)
+    {
+        return prefix + "/Report";
+    }
+
+    @PostMapping("/report")
+    @ResponseBody
+    public List<ReportData> reportData(String begin,String end,String barcode)
+    {
+        Map map = new HashMap<String,Object>();
+        map.put("begin",begin);
+        map.put("end",end);
+        map.put("barcode",barcode);
+        List<ReportData> reportDataList = producttypeService.selectReport(map);
+        return reportDataList;
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java
index 58289231..4605d6a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java
@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.nanjing;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.nanjing.domain.QsStation;
+import com.ruoyi.nanjing.domain.ReportData;
 import com.ruoyi.nanjing.domain.TBdProductinfo;
 import com.ruoyi.nanjing.service.ITBdProductinfoService;
 import com.ruoyi.nanjing.service.ITBdProducttypeService;
diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
new file mode 100644
index 00000000..eec70c7b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/nanjing/Report/Report.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('产品条码信息')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li class="select-time">
+                            <label>时间区间： </label>
+                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
+                        </li>
+                        <li>
+                            <label>产品条码:</label>
+                            <input type="text"  id="barcode" name="barcode"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                       </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    function searchAll(){
+        // console.log("点击查询按钮事件执行...");
+        var url =  ctx + "nanjing/reportData/report";
+        $('#bootstrap-table').bootstrapTable('destroy');
+        $('#bootstrap-table').bootstrapTable({
+            method:"post",
+            url: url,
+            pagination: true,
+            search: true,
+            contentType : "application/x-www-form-urlencoded",
+            queryParams:  {
+                begin:$('#beginTime').val(),
+                end:$('#endTime').val(),
+                barcode:$('#barcode').val()
+            },
+            modalName: "条码信息查询",
+            columns: [
+                {
+                    field: 'id',
+                    title: '序号'
+                },
+                {
+                    field: 'barcode',
+                    title: '系统条码'
+                },
+                {
+                    field: 'parameaning',
+                    title: '参数名'
+                },
+                {
+                    field:'value',
+                    title:'参数值'
+                },
+            ]
+        })
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
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
new file mode 100644
index 00000000..edfc5460
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/ReportData.java
@@ -0,0 +1,74 @@
+package com.ruoyi.nanjing.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+public class ReportData extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String barcode;
+    private String parameaning;
+    private String value;
+    private long id;
+    private Date beginTime;
+    private Date endTime;
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public String getParameaning() {
+        return parameaning;
+    }
+
+    public void setParameaning(String parameaning) {
+        this.parameaning = parameaning;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ReportData{" +
+                "barcode='" + barcode + '\'' +
+                ", parameaning='" + parameaning + '\'' +
+                ", value='" + value + '\'' +
+                ", id=" + id +
+                '}';
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java
index 1951f1ab..535ac4b6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java
@@ -35,4 +35,6 @@ public interface TBdProducttypeMapper
     List<QsStation> selectStationQs(Map map);
 
     List<QsStation> selectAllQs(Map map);
+
+    List<ReportData> selectReport(Map map);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java
index d1120383..4a04bf4f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java
@@ -39,4 +39,6 @@ public interface ITBdProducttypeService
     List<QsStation> selectAllQs(Map map);
 
     List<QsStation> selectNodeQs(Map map);
+
+    List<ReportData> selectReport(Map map);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java
index fb61484a..75e417c0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java
@@ -81,4 +81,9 @@ public class TBdProducttypeServiceImpl implements ITBdProducttypeService
     public List<QsStation> selectNodeQs(Map map) {
         return tBdProducttypeMapper.selectStationQs(map);
     }
+
+    @Override
+    public List<ReportData> selectReport(Map map) {
+        return tBdProducttypeMapper.selectReport(map);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml
index 370acb98..af773526 100644
--- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml
@@ -51,6 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ero" column="异常数量"/>
         <result property="allRate" column="合格率"/>
     </resultMap>
+
+    <resultMap id="repo" type="com.ruoyi.nanjing.domain.ReportData">
+        <result property="id" column="id"/>
+        <result property="barcode" column="Barcode"/>
+        <result property="parameaning" column="parameaning"/>
+        <result property="value" column="value"/>
+    </resultMap>
     <sql id="selectTBdProducttypeVo">
         select ID, ProductTypeID, ProductTypeName from T_BD_ProductType
     </sql>
@@ -142,6 +149,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         }
     </select>
 
+    <select id="selectReport" parameterType="map" statementType="CALLABLE" resultMap="repo">
+        {
+            call begin_date3
+            (
+                #{begin,mode=IN,jdbcType=DATE},
+                #{end,mode=IN,jdbcType=DATE},
+                #{barcode,mode=IN,jdbcType=VARCHAR}
+            )
+        }
+    </select>
+
 
     <!--    <insert id="insertTBdProducttype" parameterType="TBdProducttype">-->
 <!--        insert into T_BD_ProductType-->