添加查询条件-代码优化-01

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/common/ConstantCommon.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.common;
+
+/**
+ * @author qingsong.han
+ * @description: 公共常量
+ * @create 2020-12-24 9:37
+ */
+public class ConstantCommon {
+
+    /**
+     * 检测类型
+     * 0：粮情；1：油情；2：水分
+     */
+    public static final String CHECK_TYPE = "检测类型不能为空!";
+    /**
+     * 库点编码
+     */
+    public static final String ORGID_NOT_NULL = "组织机构编码不能为空!";
+
+}

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetectionCtrl.js

@@ -115,7 +115,8 @@ angular.module('app.intelligent').controller("humitureDetectionCtrl", function (
 
     // 清空搜索时间
     $scope.emptyTime = function () {
-        $scope.search.time = '';
+        $scope.search.startTime = '';
+        $scope.search.endTime = '';
         $scope.search.vCfCode = '';
         $scope.loadData();
     };

depot-web/src/main/resources/static/app/intelligent/grainDetection/service/temperatureRecordService.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.intelligent').service("temperatureRecordService", function($http, $q, APP_CONFIG) {
+angular.module('app.intelligent').service("temperatureRecordService", function($http, $q, APP_CONFIG, $rootScope) {
     // 测温记录
     // 分页列表数据
     this.getTemperatureRecordPageInfo = function (pageInfo,search,tType) {
@@ -14,7 +14,8 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
                 startTime : search == undefined ? "":search.startTime,
                 endTime : search == undefined ? "":search.endTime,
                 vCfCode : search == undefined ? "":search.vCfCode,
-                tType: tType
+                tType: tType,
+                orgId : $rootScope.orgInfo.orgId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-list.html

@@ -26,7 +26,8 @@
                                             </select>&emsp;
                                         </label>
                                         <label>检测时间:
-                                            <input style="width: 100px;" type="text" ng-model="search.time" name="time" class="form-control" data-smart-datepicker>&nbsp;
+                                            <input style="width: 100px;" type="text" ng-model="search.startTime" name="startTime" class="form-control" data-smart-datepicker>
+                                            --<input style="width: 100px;" type="text" ng-model="search.endTime" name="endTime" class="form-control" data-smart-datepicker>&nbsp;
                                             <a class="btn btn-default btn-sm" ng-click="loadData()"> <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
                                             <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
                                         </label>

depot-web/src/main/resources/static/app/intelligent/grainInspect/controller/grainAnalyzeCtrl.js

@@ -95,7 +95,8 @@ angular.module('app.intelligent').controller("grainAnalyzeCtrl", function($scope
     };
     // 清空
     $scope.emptyTime = function() {
-        $scope.search.time = '';
+        $scope.search.startTime = '';
+        $scope.search.endTime = '';
         $scope.search.vCfCode = '';
         $scope.loadData();
     };

depot-web/src/main/resources/static/app/intelligent/grainInspect/views/grainAnalyze-list.html

@@ -14,25 +14,23 @@
                         <div class="widget-body no-padding">
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
                                 <div class="dt-toolbar">
-                                    <div class="col-xs-12 col-sm-4">
+                                    <div class="col-xs-12 col-sm-10">
                                         <a class="btn btn-default btn-sm" ng-click="grainSituationTrend()"> <i class="fa fa-search"></i>&nbsp;粮情趋势</a>
                                         <a class="btn btn-default btn-sm" ng-click="grainSituationComparison()"> <i class="fa fa-search"></i>&nbsp;粮情对比</a>
                                       <!--  <a class="btn btn-default btn-sm" ng-click="PointAllGrainComparison()"> <i class="fa fa-search"></i>&nbsp;所有点粮情对比</a>-->
-                                    </div>
-                                    <div class="col-xs-12 col-sm-6">
-                                        <div class="form-group">
-                                            <label> 仓房名称:
-                                                <select ng-model="search.vCfCode" class="form-control input-sm"
-                                                        ng-options="store.storehouseCode as store.storehouseName for store in storelist">
-                                                    <option value="">请选择</option>
-                                                </select>&emsp;
-                                            </label>
-                                            <label>
-                                                检测时间:<input style="width: 100px;" type="text" ng-model="search.time" name="time" class="form-control" data-smart-datepicker>&nbsp;
-                                                <a class="btn btn-default btn-sm" ng-click="loadData()"> <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
-                                                <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
-                                            </label>
-                                        </div>
+                                        <label> 仓房名称:
+                                            <select ng-model="search.vCfCode" class="form-control input-sm"
+                                                    ng-options="store.storehouseCode as store.storehouseName for store in storelist">
+                                                <option value="">请选择</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label>
+                                            检测时间:
+                                            <input style="width: 100px;" type="text" ng-model="search.startTime" name="startTime" class="form-control" data-smart-datepicker>
+                                            --<input style="width: 100px;" type="text" ng-model="search.endTime" name="endTime" class="form-control" data-smart-datepicker>&nbsp;
+                                            <a class="btn btn-default btn-sm" ng-click="loadData()"> <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                            <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        </label>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">