bf

yiming
1 parent 244ef0fe
Showing 7 changed files with 23 additions and 15 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/line/map.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
@@ -230,13 +230,17 @@ public class BsthTLineController extends BaseController
     @PostMapping("/findByName")
     @ResponseBody
-    public BsthTLine findByName(String name)
+    public List<BsthTLine> findByName(String name)
     {
         BsthTLine bsthTLine = new BsthTLine();
         bsthTLine.setLineName(name);
-
-        return bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
+        BsthTLine bsthTLineOld=bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
+        BsthTLine bsthTLineNew=bsthTLineService.selectBsthTLineExamineByLineName(name);
+        List<BsthTLine> bsthTLines=new ArrayList<>();
+        bsthTLines.add(bsthTLineOld);
+        bsthTLines.add(bsthTLineNew);
+        return bsthTLines;
     }
     /**
@@ -260,8 +260,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 			lineEditReport.setVehiclesNumber(history.getVehiclesNumber());
 			lineEditReport.setNumberPerson(history.getNumberPerson());
 			if(history.getStartDate()==null){
-				String date=LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"));
-				lineEditReport.setStartDate(new Date(date));
+				lineEditReport.setStartDate(new Date());
 			}else {
 				lineEditReport.setStartDate(history.getStartDate());
 			}
@@ -681,8 +681,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="personAvg != null "> and person_avg = #{personAvg}</if>
 			<if test="startDate != null "> and start_date = #{startDate}</if>
 			<if test="nightParking != null  and nightParking != ''"> and night_parking = #{nightParking}</if>
-			<if test="examineStatus == 'true' "> and examine_status in(0,1)</if>
-			<if test="examineStatus == 'false' "> and examine_status =2</if>
+			<if test="examineStatus != null"> and examine_status = #{examineStatus}</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>
@@ -45,7 +45,7 @@ body, html, #container {
 			<li role="presentation"><a onclick="show('station','road')" role="tab" data-toggle="tab">道路查询</a></li>
 		</ul>
-		<div id="station">
+		<form id="station">
 			<div class="row">
 				<h4></h4>
 				<label class="col-sm-3"><h4>&nbsp;&nbsp;站点</h4></label>
@@ -73,9 +73,9 @@ body, html, #container {
 				<button type="button" class="el-button el-button--default el-button--mini" onclick="$.form.reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
 				</div>
 			</div>
-		</div>
+		</form>
-		<div id="road" style="display:none;">
+		<form id="road" style="display:none;">
 			<div class="row">
 				<h4></h4>
 				<label class="col-sm-3"><h4>&nbsp;&nbsp;路名</h4></label>
@@ -90,11 +90,10 @@ body, html, #container {
 					<button type="button" class="el-button el-button--primary el-button--mini" onclick="searchRoad();"><!----><i class="el-icon-search"></i><span>搜索</span></button>
 				</div>
 				<div class="col-sm-4">
-					<button type="button" class="el-button el-button--default el-button--mini" onclick="$.form.reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
+					<button type="button" class="el-button el-button--default el-button--mini" onclick="reset();"><!----><i class="el-icon-refresh"></i><span>清除站点结果</span></button>
 				</div>
 			</div>
-		</div>
-
+		</form>
 	</div>
@@ -82,7 +82,6 @@
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
-			search.examineStatus ='true';
 			search.examineType='0';
 			return search;
 		}
@@ -249,6 +248,9 @@
 				{
 					field: 'lastStation',
 					title: '末站'
+				},{
+					field: 'examineStatus',
+					title: '审核状态'
 				}];
@@ -94,7 +94,7 @@
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
-			search.examineStatus ='true';
+			search.examineStatus='0';
 			var createTimeStr=$('#createTimeStr').val();
 			var createTimeEnd=$('#createTimeEnd').val();
 			search.createTimeStr=createTimeStr;
@@ -591,12 +591,17 @@
 							},
 							function(data) {
 								var bsthTLineOld=data[0];
+								console.log(bsthTLineOld)
+
 								var bsthTLineNew=data[1];
+								console.log(bsthTLineNew)
 								if(bsthTLineNew!=null){
 									for(let i  in bsthTLineOld){
 										var o=bsthTLineOld[i]==null?'':bsthTLineOld[i];
 										var n=bsthTLineNew[i]==null?'':bsthTLineNew[i];
 										if(o!=n){
+											console.log(o)
+											console.log(n)
 											i=i=='fcompany'?'fCompany':i;
 											i=i=='plineId'?'pLineId':i;
 											var input=document.getElementsByName(i)[0];