第二次提交

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

@@ -19,10 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Controller
 @RequestMapping("/nanjing/StatisticQtProduct")
@@ -47,10 +44,15 @@ public class StatisticQtProductController extends BaseController {
     public TableDataInfo list(QtProduct qtProduct)
     {
 //        startPage();
+        Date beginTime = qtProduct.getBeginTime();
+        System.out.println(beginTime);
         Map map = new HashMap<String,Object>();
         map.put("beginTime",qtProduct.getBeginTime());
+//        map.put("beginTime",null);
         map.put("endTime",qtProduct.getEndTime());
-        map.put("productType",qtProduct.getProductType());
+//        map.put("endTime",null);
+        map.put("productType","");
+//        map.put("productType",qtProduct.getProductType());
         map.put("productId","");
         map.put("shiftId","");
         map.put("groupId","");

ruoyi-admin/src/main/resources/templates/nanjing/SubStation/add.html

@@ -80,7 +80,11 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">是否ng：</label>
                 <div class="col-sm-8">
-                    <input name="isNGStation" class="form-control" type="text">
+                    <select name="isNGStation" class="form-control m-b">
+                        <option value="1"> 是</option>
+                        <option value="0"> 否</option>
+                    </select>
+<!--                    <input name="isNGStation" class="form-control" type="text">-->
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/nanjing/baseDeviceInfo/add.html

@@ -25,10 +25,16 @@
                 <input name="deviceSpe" class="form-control" type="text">
             </div>
         </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">设备类型：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="deviceType" class="from-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">设备类型：</label>
             <div class="col-sm-8">
-                <input name="deviceType" class="from-control" type="text">
+                <input name="deviceType" class="form-control" type="text">
             </div>
         </div>
 

ruoyi-admin/src/main/resources/templates/nanjing/baseDeviceInfo/edit.html

@@ -26,9 +26,15 @@
                     <input name="deviceSpe" class="form-control" type="text" th:field="*{deviceSpe}">
                 </div>
             </div>
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-3 control-label">设备类型：</label>-->
+<!--                <input name="deviceType" class="from-control" type="text">-->
+<!--            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">设备类型：</label>
-                <input name="deviceType" class="from-control" type="text">
+                <div class="col-sm-8">
+                    <input name="deviceType" class="form-control" type="text" th:field="*{deviceType}">
+                </div>
             </div>
 
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/nanjing/repair_parts/edit.html

@@ -56,6 +56,19 @@
                 $.operate.save(prefix + "/edit", $('#form-parts-edit').serialize());
             }
         }
+        /* cron表达式生成 */
+        function cron() {
+            var url = ctx + "monitor/job" + '/cron';
+            var height = $(window).height() - 10;
+            top.layer.open({
+                maxmin: true,
+                title: "Cron表达式生成器",
+                type: 2,
+                area: ['800px', height + "px"], //宽高
+                shadeClose: true,
+                content: url
+            });
+        }
     </script>
 </body>
 </html>

ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             }
     </select>
 
-    <select id="selectQtProductList" parameterType="map" resultMap="qtProduct" statementType="CALLABLE">
+    <select id="selectQtProductList" parameterType="map"  statementType="CALLABLE" resultMap="qtProduct">
         {
             call pro_StatisticOfProductQty
             (