bf

yiming
1 parent 32c718c5
Showing 6 changed files with 51 additions and 5 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.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/line.html
@@ -24,6 +24,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.stream.Collectors;
 /**
  * 【请填写功能名称】Controller
@@ -94,6 +95,14 @@ public class BsthTLineController extends BaseController
     public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
         List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
+        List<BsthTLine> lines = bsthTLineService.usedBsthTLineReport(bsthTLine);
+        Map<String,List<BsthTLine>>map=lines.stream().collect(Collectors.groupingBy(BsthTLine::getLineName));
+        for (int i = 0; i < list.size(); i++) {
+            BsthTLine tLine=list.get(i);
+            if(map.get(tLine.getLineName())!=null){
+                list.set(i, map.get(tLine.getLineName()).get(0));
+            }
+        }
         List<DictData> dicts = dictDataService.selectDictDataList(null);
@@ -287,8 +296,15 @@ public class BsthTLineController extends BaseController
     /*
-    
-
+    //查询history整表
+    //按lineName分组
+    //createTime倒序
+    //循环 如果createTime在所选时间内
+    //相邻2条数据进行比较
+    //new Bl 吧有差异的数据记录进去
+    //放入一个list中
+    //按公司和分公司分组
+    循环list统计那些字段有修改进行记录
     *//**
      * 新增弹窗
@@ -78,5 +78,5 @@ public interface BsthTLineMapper
 	List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine);
-
+	List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine);
 }
@@ -67,5 +67,9 @@ public interface IBsthTLineService
 	boolean lineNameIsExistInBsthTLine(String lineName);
 	List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine);
+
+
+	List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine);
+
 	/*int createLineMonthReport();*/
 }
@@ -471,4 +471,10 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		return bsthTLineMapper.selectBsthTLineListAndExamine(bsthTLine);
 	}
+
+	@Override
+	public List<BsthTLine> usedBsthTLineReport(BsthTLine bsthTLine){
+		return bsthTLineMapper.usedBsthTLineReport(bsthTLine);
+	}
+
 }
@@ -213,6 +213,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="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
 		</where>
 	</select>
@@ -1717,4 +1718,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
+	<select id="usedBsthTLineReport" parameterType="BsthTLine" resultMap="BsthTLineResult">
+		SELECT * from bsth_t_line_history
+		WHERE id IN(SELECT max(id) FROM `bsth_t_line_history` where update_status=-1
+		<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
+		GROUP BY line_name)
+
+	</select>
+
+
 </mapper>
 \ No newline at end of file
@@ -4,6 +4,7 @@
 <head>
 	<th:block th:include="include :: header('线路档案信息')" />
 	<th:block th:include="include :: select2-css" />
+	<th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="gray-bg">
 <div class="container-div" id="context">
@@ -193,7 +194,9 @@
 														class="time-input" placeholder="请选择轨交时间" name="metroTime" /></li>
 						<li><label>冷僻补贴：</label> <input type="text"
 														name="coldBonusType" /></li>
-
+						<li><label>日期截点：</label> <input type="text"
+														class="time-input" placeholder="日期截点" name="createTimeEnd" id="createTimeEnd"/>
+						</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>
@@ -243,7 +246,7 @@
 	<!-- /.modal -->
 </div>
-
+<th:block th:include="include :: datetimepicker-js" />
 <script th:inline="javascript">
 	var companyList=[[${companyList}]];
@@ -496,6 +499,7 @@
 		var search = $.table.queryParams(params);
 		search.company=$('#company').select2('val');
 		search.fCompany=$('#fCompany').select2('val');
+		search.createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59:59':'';
 		return search;
 	}
 	var editFlag = [[${@permission.hasPermi('system:line:edit')}]];
@@ -830,6 +834,12 @@
 		}
 		return true;
 	}
+
+	$("input[name='createTimeEnd']").datetimepicker({
+		format : "yyyy-mm-dd",
+		minView : "month",
+		autoclose : true
+	});
 </script>
 <style>