bf

yiming
1 parent 581e9a52
Showing 4 changed files with 19 additions and 31 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
@@ -113,7 +113,7 @@ public class BsthTLineAddController extends BaseController
         bl.setLineName(bsthTLine.getLineName());
         bl=bsthTLineService.selectBsthTLineExamineByLineName(bl);
         if(bl==null){
-            bsthTLine.setLineUpdateType("3");
+            bsthTLine.setLineUpdateType("0");
             return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
         }else {
             bsthTLine.setId(bl.getId());
@@ -85,6 +85,7 @@ public class BsthTLineHistoryReportController extends BaseController
         Map<String,List<DictData>> dictMap = new HashMap();
         List<String> titles=new ArrayList<>();
         titles.add("lineName");
+        titles.add("lineUpdateType");
         for(DictData d : dicts) {
             if(dictMap.get(d.getDictType()) == null) {
                 dictMap.put(d.getDictType(), new ArrayList<DictData>());
@@ -106,13 +107,16 @@ public class BsthTLineHistoryReportController extends BaseController
                         String v =f.get(line)==null?"":f.get(line).toString();
                         String vo=f2.get(line)==null?"":f2.get(line).toString();
                         //如果没变置空
-                        if(v.equals(vo)){
-                            f.set(line, null);
-                            f2.set(line, null);
-                        }else {
-                            titles.add(name);
-                            titles.add(name+"Old");
+                        if(!"lineUpdateType".equals(name)){
+                            if(v.equals(vo)){
+                                f.set(line, null);
+                                f2.set(line, null);
+                            }else {
+                                titles.add(name);
+                                titles.add(name+"Old");
+                            }
                         }
+
                         v =f.get(line)==null?"":f.get(line).toString();
                         vo=f2.get(line)==null?"":f2.get(line).toString();
                         //编码转换
@@ -22,6 +22,11 @@ public class LineHistoryReport extends BaseEntity
 	@Excel(name = "线路名称")
 	private String lineName;
+	@Excel(name = "性质")
+	private String lineUpdateType;
+
+	private String lineUpdateTypeOld;
+
 	@Excel(name = "公司")
 	private String company;
 	@Excel(name = "原公司")
@@ -366,15 +371,8 @@ public class LineHistoryReport extends BaseEntity
 	@Excel(name = "原启用日期", width = 30, dateFormat = "yyyy-MM-dd")
 	private Date startDateOld;
-	@Excel(name = "夜间停车场")
-	private String nightParking;
-	@Excel(name = "原夜间停车场")
-	private String nightParkingOld;
-	@Excel(name = "性质")
-	private String lineUpdateType;
-	@Excel(name = "原性质")
-	private String lineUpdateTypeOld;
+
 	//营收类型（公交线路/机场专线/特约车线路/零星特约车线路/交通车线路/团客车线路/其他线路
 	@Excel(name = "营收类型")
@@ -1433,21 +1431,7 @@ public class LineHistoryReport extends BaseEntity
 		this.startDateOld = startDateOld;
 	}
-	public String getNightParking() {
-		return nightParking;
-	}
-
-	public void setNightParking(String nightParking) {
-		this.nightParking = nightParking;
-	}
-	public String getNightParkingOld() {
-		return nightParkingOld;
-	}
-
-	public void setNightParkingOld(String nightParkingOld) {
-		this.nightParkingOld = nightParkingOld;
-	}
 	public String getLineUpdateType() {
 		return lineUpdateType;
@@ -1764,7 +1764,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		       h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
 		       h1.bus_ev_number busEvNumber,h1.directions directions,h1.number_of_manage numberOfManage,h1.halfway_station halfwayStation,
 		       h1.full_customer_percent fullCustomerPercent,h1.low_customer_percent lowCustomerPercent,h1.divide_level divideLevel,
-		       h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,h1.night_parking nightParking,h1.start_date startDate,
+		       h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,h1.start_date startDate,
 			   h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
 			   h2.id  idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
 			   h2.service_type serviceTypeOld,h2.line_level lineLevelOld,h2.line_type lineTypeOld,h2.district districtOld,
@@ -1782,7 +1782,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			   h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
 			   h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.number_of_manage numberOfManageOld,h2.halfway_station halfwayStationOld,
 			   h2.full_customer_percent fullCustomerPercentOld,h2.low_customer_percent lowCustomerPercentOld,h2.divide_level divideLevelOld,
-			   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.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,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>