bf

yiming
1 parent 7831c5c7
Showing 5 changed files with 61 additions and 24 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
@@ -295,35 +295,27 @@ public class BsthTLine extends BaseEntity
     private String coldBonusType;
     /** 月度营收 */
-    @Excel(name = "月度营收")
     private Long revenuesMonth;
     /** 月度人次 */
-    @Excel(name = "月度人次")
     private Long personMonth;
     /** 月度里程 */
-    @Excel(name = "月度里程")
     private Long mileageMonth;
     /** 百公里人次 */
-    @Excel(name = "百公里人次")
     private Long personMonthAvg;
     /** 营收 */
-    @Excel(name = "营收")
     private Long revenues;
     /** 人次 */
-    @Excel(name = "人次")
     private Long persons;
     /** 里程 */
-    @Excel(name = "里程")
     private Long mileages;
     /** 百公里人次 */
-    @Excel(name = "百公里人次")
     private Long personAvg;
     /** 开通日期（无） */
@@ -350,7 +342,9 @@ public class BsthTLine extends BaseEntity
     private String revenueType;
+    private String createTimeStr;
+    private String createTimeEnd;
     public void setId(Long id)
     {
@@ -1147,6 +1141,21 @@ public class BsthTLine extends BaseEntity
         this.revenueType = revenueType;
     }
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
+    public String getCreateTimeEnd() {
+        return createTimeEnd;
+    }
+
+    public void setCreateTimeEnd(String createTimeEnd) {
+        this.createTimeEnd = createTimeEnd;
+    }
     @Override
     public String toString() {
@@ -684,6 +684,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="examineStatus == 'true' "> and examine_status in(0,1)</if>
 			<if test="examineStatus == 'false' "> and examine_status =2</if>
 			<if test="examineType != null  and examineType != ''"> and examine_type = #{examineType}</if>
+			<if test="createTimeStr != null  and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
+			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
 		</where>
 	</select>
@@ -460,13 +460,13 @@
                     </select>
                 </div>
                 <!---------------------------------->
-                <label class="col-sm-1 control-label">启用时间：</label>
+                <!--<label class="col-sm-1 control-label">启用时间：</label>
                 <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
-                </div>
+                </div>-->
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">备注：</label>
                 <div class="col-sm-2">
@@ -479,7 +479,7 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">启用时间：</label>
+				<!--<label class="col-sm-1 control-label">启用时间：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
@@ -487,7 +487,7 @@
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
-				</div>
+				</div>-->
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">备注：</label>
 				<div class="col-sm-2">
@@ -3,6 +3,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 <th:block th:include="include :: header('线路档案信息')" />
+<th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="gray-bg">
 	<div class="container-div" id="context">
@@ -11,12 +12,31 @@
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<li><label>公司：</label> <input type="text" name="company" />
+							<div class="form-group">
+							<li class="col-sm-3"><label>公司：</label> <input type="text" name="company" />
 							</li>
-							<li><label>分公司：</label> <input type="text" name="fCompany" />
+							<li class="col-sm-3"><label>分公司：</label> <input type="text" name="fCompany" />
 							</li>
-							<li><label>线路名称：</label> <input type="text" name="lineName" />
+							<li class="col-sm-3"><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
+							<li class="col-sm-3"><label>申请开始：</label>
+								<div class="input-group date">
+									<input name="createTimeStr" id="createTimeStr" class="form-control" placeholder="yyyy-MM-dd" type="text"
+										   autocomplete="off">
+									<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+								</div>
+							</li>
+							</div>
+							<div class="form-group">
+							<li class="col-sm-3"><label>申请结束：</label>
+								<div class="input-group date">
+									<input name="createTimeEnd" id="createTimeEnd" class="form-control" placeholder="yyyy-MM-dd" type="text"
+										   autocomplete="off">
+									<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+								</div>
+							</li>
+							</div>
+
 							<li>
 								<el-button size="mini" type="primary" icon="el-icon-search"  onClick="$.table.search();">搜索</el-button>
 								<el-button size="mini" icon="el-icon-refresh"  onClick="$.form.reset();">重置</el-button>
@@ -27,11 +47,6 @@
 				</form>
 			</div>
-			<!--<div class="btn-group-sm" id="toolbar" role="group">
-
-				<el-button plain size="mini" type="primary" icon="el-icon-plus"  onClick="add(this);"  shiro:hasPermission="system:line:add">新增</el-button>
-
-			</div>-->
 			<div class="col-sm-12 select-table table-striped">
 				<table id="bootstrap-table"></table>
@@ -39,6 +54,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: datetimepicker-js" />
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
@@ -67,10 +83,6 @@
 	<script th:inline="javascript">
-	/*	function add(obj){
-			if($(obj)[0].className.indexOf("disabled") == -1)
-				$.operate.add();
-		}*/
 		new Vue({
 			el: '#context',
@@ -83,6 +95,10 @@
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
 			search.examineStatus ='true';
+			var createTimeStr=$('#createTimeStr').val();
+			var createTimeEnd=$('#createTimeEnd').val();
+			search.createTimeStr=createTimeStr;
+			search.createTimeEnd=createTimeEnd;
 			return search;
 		}
@@ -530,6 +546,16 @@
 		});
 		layer.full(index);
 	}
+	$("input[name='createTimeStr']").datetimepicker({
+		format: "yyyy-mm-dd",
+		minView: "month",
+		autoclose: true
+	});
+	$("input[name='createTimeEnd']").datetimepicker({
+		format: "yyyy-mm-dd",
+		minView: "month",
+		autoclose: true
+	});
 	</script>
 	<style>
 .col_checkbox {