youxiw2000 / bsthLineProfiles · Commits

Commit 7556340d8ab170c1892f019bc4dbde81e8fc1023

Authored by yiming
1 parent 581e9a52
build: skipped

bf

Inline Side-by-side
Showing 4 changed files with 19 additions and 31 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
  View file @7556340
... ... @@ -113,7 +113,7 @@ public class BsthTLineAddController extends BaseController
113 113 bl.setLineName(bsthTLine.getLineName());
114 114 bl=bsthTLineService.selectBsthTLineExamineByLineName(bl);
115 115 if(bl==null){
116   - bsthTLine.setLineUpdateType("3");
  116 + bsthTLine.setLineUpdateType("0");
117 117 return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
118 118 }else {
119 119 bsthTLine.setId(bl.getId());
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
  View file @7556340
... ... @@ -85,6 +85,7 @@ public class BsthTLineHistoryReportController extends BaseController
85 85 Map<String,List<DictData>> dictMap = new HashMap();
86 86 List<String> titles=new ArrayList<>();
87 87 titles.add("lineName");
  88 + titles.add("lineUpdateType");
88 89 for(DictData d : dicts) {
89 90 if(dictMap.get(d.getDictType()) == null) {
90 91 dictMap.put(d.getDictType(), new ArrayList<DictData>());
... ... @@ -106,13 +107,16 @@ public class BsthTLineHistoryReportController extends BaseController
106 107 String v =f.get(line)==null?"":f.get(line).toString();
107 108 String vo=f2.get(line)==null?"":f2.get(line).toString();
108 109 //如果没变置空
109   - if(v.equals(vo)){
110   - f.set(line, null);
111   - f2.set(line, null);
112   - }else {
113   - titles.add(name);
114   - titles.add(name+"Old");
  110 + if(!"lineUpdateType".equals(name)){
  111 + if(v.equals(vo)){
  112 + f.set(line, null);
  113 + f2.set(line, null);
  114 + }else {
  115 + titles.add(name);
  116 + titles.add(name+"Old");
  117 + }
115 118 }
  119 +
116 120 v =f.get(line)==null?"":f.get(line).toString();
117 121 vo=f2.get(line)==null?"":f2.get(line).toString();
118 122 //编码转换
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
  View file @7556340
... ... @@ -22,6 +22,11 @@ public class LineHistoryReport extends BaseEntity
22 22 @Excel(name = "线路名称")
23 23 private String lineName;
24 24  
  25 + @Excel(name = "性质")
  26 + private String lineUpdateType;
  27 +
  28 + private String lineUpdateTypeOld;
  29 +
25 30 @Excel(name = "公司")
26 31 private String company;
27 32 @Excel(name = "原公司")
... ... @@ -366,15 +371,8 @@ public class LineHistoryReport extends BaseEntity
366 371 @Excel(name = "原启用日期", width = 30, dateFormat = "yyyy-MM-dd")
367 372 private Date startDateOld;
368 373  
369   - @Excel(name = "夜间停车场")
370   - private String nightParking;
371   - @Excel(name = "原夜间停车场")
372   - private String nightParkingOld;
373 374  
374   - @Excel(name = "性质")
375   - private String lineUpdateType;
376   - @Excel(name = "原性质")
377   - private String lineUpdateTypeOld;
  375 +
378 376  
379 377 //营收类型（公交线路/机场专线/特约车线路/零星特约车线路/交通车线路/团客车线路/其他线路
380 378 @Excel(name = "营收类型")
... ... @@ -1433,21 +1431,7 @@ public class LineHistoryReport extends BaseEntity
1433 1431 this.startDateOld = startDateOld;
1434 1432 }
1435 1433  
1436   - public String getNightParking() {
1437   - return nightParking;
1438   - }
1439   -
1440   - public void setNightParking(String nightParking) {
1441   - this.nightParking = nightParking;
1442   - }
1443 1434  
1444   - public String getNightParkingOld() {
1445   - return nightParkingOld;
1446   - }
1447   -
1448   - public void setNightParkingOld(String nightParkingOld) {
1449   - this.nightParkingOld = nightParkingOld;
1450   - }
1451 1435  
1452 1436 public String getLineUpdateType() {
1453 1437 return lineUpdateType;
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @7556340
... ... @@ -1764,7 +1764,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1764 1764 h1.car_plate carPlate,h1.number_person numberPerson,h1.number_person_driver numberPersonDriver,h1.number_person_sales numberPersonSales,
1765 1765 h1.bus_ev_number busEvNumber,h1.directions directions,h1.number_of_manage numberOfManage,h1.halfway_station halfwayStation,
1766 1766 h1.full_customer_percent fullCustomerPercent,h1.low_customer_percent lowCustomerPercent,h1.divide_level divideLevel,
1767   - 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,
  1767 + h1.has_timelists hasTimelists,h1.is_metro isMetro,h1.metro_time metroTime,h1.cold_bonus_type coldBonusType,h1.start_date startDate,
1768 1768 h1.line_update_type lineUpdateType,h1.revenue_type revenueType,
1769 1769 h2.id idOld,h2.line_name lineNameOld,h2.company companyOld,h2.f_company fCompanyOld,h2.p_line_id pLineIdOld,
1770 1770 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;
1782 1782 h2.car_plate carPlateOld,h2.number_person numberPersonOld,h2.number_person_driver numberPersonDriverOld,h2.number_person_sales numberPersonSalesOld,
1783 1783 h2.bus_ev_number busEvNumberOld,h2.directions directionsOld,h2.number_of_manage numberOfManageOld,h2.halfway_station halfwayStationOld,
1784 1784 h2.full_customer_percent fullCustomerPercentOld,h2.low_customer_percent lowCustomerPercentOld,h2.divide_level divideLevelOld,
1785   - 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,
  1785 + h2.has_timelists hasTimelistsOld,h2.is_metro isMetroOld,h2.metro_time metroTimeOld,h2.cold_bonus_type coldBonusTypeOld,h2.start_date startDateOld,
1786 1786 h2.line_update_type lineUpdateTypeOld,h2.revenue_type revenueTypeOld
1787 1787 FROM bsth_t_line_history h1 LEFT JOIN bsth_t_line_history h2 on h1.history_id=h2.id
1788 1788 <where>
... ...