bf

yiming
1 parent 461ec576
Showing 3 changed files with 45 additions and 19 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/historyReport/historyReport.html
@@ -52,6 +52,7 @@ import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.project.utils.ExcelUtils;
  
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 @Controller
@@ -200,8 +201,7 @@ public class BsthTLineHistoryReportController extends BaseController
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @RequestMapping("/export2")
     @ResponseBody
-    public void export(HttpServletResponse response,BsthTLine bsthTLine) throws NoSuchFieldException {
-
+    public void export(HttpServletResponse response, BsthTLine bsthTLine, HttpServletRequest request) throws NoSuchFieldException {
         //查询变更记录
         List<LineHistoryReport> list =bsthTLineService.getLineHistoryReport(bsthTLine);
  
@@ -1075,6 +1075,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
 			<if test="historyId != null  and historyId != ''"> and history_id is not null</if>
 			<if test="updateStatus != null  and updateStatus != ''"> and update_status #{updateStatus}</if>
+			<if test="lineUpdateType != null  and lineUpdateType != ''"> and line_update_type =#{lineUpdateType}</if>
 		</where>
 	</select>
  
@@ -1777,6 +1778,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			   h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,h2.night_parking nightParkingOld,h2.start_date startDateOld,
 			   h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
 		FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
+		<where>
+			<if test="createTimeStr != null  and createTimeStr != ''"> and h1.create_time >= #{createTimeStr}</if>
+			<if test="createTimeEnd != null  and createTimeEnd != ''"> and h1.create_time &lt;= #{createTimeEnd}</if>
+			<if test="lineName != null  and lineName != ''"> and h1.line_name =#{lineName}</if>
+			<if test="lineUpdateType != null  and lineUpdateType != ''"> and h1.line_update_type =#{lineUpdateType}</if>
+		</where>
 	</select>
  
 </mapper>
 \ No newline at end of file
@@ -17,22 +17,24 @@
                             </li> -->
                             <li>
                                 <label>线路名：</label>
-                                <input type="text" name="lineName"/>
+                                <input type="text" name="lineName" id="lineName"/>
                             </li>
                             <li>
                                 <label>性质：</label>
-                                <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}">
+                                <select name="lineUpdateType" id="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}">
 									<option value=""></option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
 										th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
-                                <label>开通日期：</label>
-                                <input type="text" name="startDate" autocomplete="off"/>
+                            <li ><label>审批日期：</label>
+                            <li class="select-time">
+                                <input type="text" class="time-input" id="createTimeStr" placeholder="开始时间" name="params[beginTime]" lay-key="1">
+                                <span>-</span>
+                                <input type="text" class="time-input" id="createTimeEnd" placeholder="结束时间" name="params[endTime]" lay-key="2">
+                            </li>
                             </li>
                             <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>
                             </li>
@@ -74,12 +76,20 @@
         	}
  
         	dicts = allDicts;
-        	
-        	
+
+            function queryParams(params) {
+                var search = $.table.queryParams(params);
+                var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 23:59':'';
+                var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':'';
+                search.createTimeStr=createTimeStr;
+                search.createTimeEnd=createTimeEnd;
+                return search;
+            }
             var options = {
                 url: prefix + "/list",
                 exportUrl: prefix + "/export",
                 modalName: "线路档案修改月报表",
+                queryParams: queryParams,
                 columns: [{
                     checkbox: true
                 },
@@ -150,17 +160,26 @@
             };
             $.table.init(options);
         });
-        
-		$("input[name='startDate']").datetimepicker({
-			format : "yyyy-mm",
-			startView: 3,
-			minView : 3,
-			maxView : 3,
-			autoclose : true
-		});
+
+    $("input[name='createTimeStr']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+    $("input[name='createTimeEnd']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
     function report(){
+        var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 23:59':'';
+        var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':'';
+        var lineName=$('#lineName').val();
+        var lineUpdateType=$('#lineUpdateType').val();
+
         $.modal.confirm("确定导出统计报表吗？", function() {
-            location.href ="/system/historyReport/export2";
+            location.href ="/system/historyReport/export2?createTimeStr="+createTimeStr+'&createTimeEnd='+createTimeEnd
+                +'&lineName='+lineName+'&lineUpdateType='+lineUpdateType;
         });
     }
     </script>