youxiw2000 / bsthLineProfiles · Commits

Commit 01f75beb4cba9d75a3de87756bc7a3c3e6c3c70c

Authored by yiming
1 parent 61127237
build: skipped

1 线路基本信息 加个新增功能 

2 修改时 性质字段改必选
3 权证到期提醒（临近四个月提醒）
4 按权证导出和按照实际导出
Inline Side-by-side
Showing 4 changed files with 200 additions and 269 deletions
bsthLineProfiles/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
  View file @01f75be
1 1 package com.ruoyi.common.utils.poi;
2 2  
3   -import java.io.File;
4   -import java.io.FileOutputStream;
5   -import java.io.IOException;
6   -import java.io.InputStream;
7   -import java.io.OutputStream;
8   -import java.lang.reflect.Field;
9   -import java.math.BigDecimal;
10   -import java.text.DecimalFormat;
11   -import java.util.ArrayList;
12   -import java.util.Arrays;
13   -import java.util.Comparator;
14   -import java.util.Date;
15   -import java.util.HashMap;
16   -import java.util.List;
17   -import java.util.Map;
18   -import java.util.Set;
19   -import java.util.UUID;
20   -import java.util.stream.Collectors;
21   -import org.apache.poi.ss.usermodel.BorderStyle;
22   -import org.apache.poi.ss.usermodel.Cell;
23   -import org.apache.poi.ss.usermodel.CellStyle;
24   -import org.apache.poi.ss.usermodel.CellType;
25   -import org.apache.poi.ss.usermodel.ClientAnchor;
26   -import org.apache.poi.ss.usermodel.DataValidation;
27   -import org.apache.poi.ss.usermodel.DataValidationConstraint;
28   -import org.apache.poi.ss.usermodel.DataValidationHelper;
29   -import org.apache.poi.ss.usermodel.DateUtil;
30   -import org.apache.poi.ss.usermodel.Drawing;
31   -import org.apache.poi.ss.usermodel.FillPatternType;
32   -import org.apache.poi.ss.usermodel.Font;
33   -import org.apache.poi.ss.usermodel.HorizontalAlignment;
34   -import org.apache.poi.ss.usermodel.IndexedColors;
35   -import org.apache.poi.ss.usermodel.Row;
36   -import org.apache.poi.ss.usermodel.Sheet;
37   -import org.apache.poi.ss.usermodel.VerticalAlignment;
38   -import org.apache.poi.ss.usermodel.Workbook;
39   -import org.apache.poi.ss.usermodel.WorkbookFactory;
40   -import org.apache.poi.ss.util.CellRangeAddressList;
41   -import org.apache.poi.xssf.streaming.SXSSFWorkbook;
42   -import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
43   -import org.apache.poi.xssf.usermodel.XSSFDataValidation;
44   -import org.slf4j.Logger;
45   -import org.slf4j.LoggerFactory;
46 3 import com.ruoyi.common.exception.BusinessException;
47 4 import com.ruoyi.common.utils.DateUtils;
48 5 import com.ruoyi.common.utils.StringUtils;
... ... @@ -57,6 +14,20 @@ import com.ruoyi.framework.aspectj.lang.annotation.Excels;
57 14 import com.ruoyi.framework.config.RuoYiConfig;
58 15 import com.ruoyi.framework.web.domain.AjaxResult;
59 16 import com.ruoyi.project.system.dict.utils.DictUtils;
  17 +import org.apache.poi.ss.usermodel.*;
  18 +import org.apache.poi.ss.util.CellRangeAddressList;
  19 +import org.apache.poi.xssf.streaming.SXSSFWorkbook;
  20 +import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
  21 +import org.apache.poi.xssf.usermodel.XSSFDataValidation;
  22 +import org.slf4j.Logger;
  23 +import org.slf4j.LoggerFactory;
  24 +
  25 +import java.io.*;
  26 +import java.lang.reflect.Field;
  27 +import java.math.BigDecimal;
  28 +import java.text.DecimalFormat;
  29 +import java.util.*;
  30 +import java.util.stream.Collectors;
60 31  
61 32 /**
62 33 * Excel相关处理
... ... @@ -127,6 +98,8 @@ public class ExcelUtil<T>
127 98 */
128 99 public Class<T> clazz;
129 100  
  101 + private List<String> titles;
  102 +
130 103 public ExcelUtil(Class<T> clazz)
131 104 {
132 105 this.clazz = clazz;
... ... @@ -965,17 +938,21 @@ public class ExcelUtil&lt;T&gt;
965 938 // 单注解
966 939 if (field.isAnnotationPresent(Excel.class))
967 940 {
968   - putToField(field, field.getAnnotation(Excel.class));
  941 + if(titles==null || titles.size()==0 || (titles!=null&&titles.contains(field.getName()))){
  942 + putToField(field, field.getAnnotation(Excel.class));
  943 + }
969 944 }
970 945  
971 946 // 多注解
972 947 if (field.isAnnotationPresent(Excels.class))
973 948 {
974   - Excels attrs = field.getAnnotation(Excels.class);
975   - Excel[] excels = attrs.value();
976   - for (Excel excel : excels)
977   - {
978   - putToField(field, excel);
  949 + if(titles==null || titles.size()==0 || (titles!=null&&titles.contains(field.getName()))){
  950 + Excels attrs = field.getAnnotation(Excels.class);
  951 + Excel[] excels = attrs.value();
  952 + for (Excel excel : excels)
  953 + {
  954 + putToField(field, excel);
  955 + }
979 956 }
980 957 }
981 958 }
... ... @@ -1119,4 +1096,7 @@ public class ExcelUtil&lt;T&gt;
1119 1096 }
1120 1097 return true;
1121 1098 }
  1099 + public void setTitles(List<String> list){
  1100 + this.titles=list;
  1101 + }
1122 1102 }
1123 1103 \ No newline at end of file
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
  View file @01f75be
1 1 package com.ruoyi.project.system.line.controller;
2 2  
3   -import java.io.File;
4   -import java.lang.reflect.Field;
5   -import java.lang.reflect.Method;
6   -import java.util.ArrayList;
7   -import java.util.HashMap;
8   -import java.util.List;
9   -import java.util.Map;
10   -
11   -import org.apache.shiro.authz.annotation.RequiresPermissions;
12   -import org.springframework.beans.factory.annotation.Autowired;
13   -import org.springframework.stereotype.Controller;
14   -import org.springframework.ui.ModelMap;
15   -import org.springframework.web.bind.annotation.GetMapping;
16   -import org.springframework.web.bind.annotation.PathVariable;
17   -import org.springframework.web.bind.annotation.PostMapping;
18   -import org.springframework.web.bind.annotation.RequestMapping;
19   -import org.springframework.web.bind.annotation.RequestParam;
20   -import org.springframework.web.bind.annotation.ResponseBody;
  3 +import com.ruoyi.common.utils.poi.ExcelUtil;
  4 +import com.ruoyi.common.utils.security.ShiroUtils;
21 5 import com.ruoyi.framework.aspectj.lang.annotation.Log;
22 6 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
  7 +import com.ruoyi.framework.web.controller.BaseController;
  8 +import com.ruoyi.framework.web.domain.AjaxResult;
  9 +import com.ruoyi.framework.web.page.TableDataInfo;
23 10 import com.ruoyi.project.system.dict.domain.DictData;
24 11 import com.ruoyi.project.system.dict.service.IDictDataService;
25 12 import com.ruoyi.project.system.line.domain.BsthTLine;
26 13 import com.ruoyi.project.system.line.service.IBsthTLineService;
27 14 import com.ruoyi.project.system.user.domain.User;
28 15 import com.ruoyi.project.system.user.service.IUserService;
29   -import com.ruoyi.framework.web.controller.BaseController;
30   -import com.ruoyi.framework.web.domain.AjaxResult;
31   -import com.ruoyi.common.utils.ServletUtils;
32   -import com.ruoyi.common.utils.poi.ExcelUtil;
33   -import com.ruoyi.common.utils.security.ShiroUtils;
34   -import com.ruoyi.framework.web.page.TableDataInfo;
  16 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  17 +import org.springframework.beans.factory.annotation.Autowired;
  18 +import org.springframework.stereotype.Controller;
  19 +import org.springframework.ui.ModelMap;
  20 +import org.springframework.web.bind.annotation.*;
  21 +
  22 +import java.io.File;
  23 +import java.lang.reflect.Field;
  24 +import java.lang.reflect.Method;
  25 +import java.util.ArrayList;
  26 +import java.util.HashMap;
  27 +import java.util.List;
  28 +import java.util.Map;
35 29  
36 30 /**
37 31 * 【请填写功能名称】Controller
... ... @@ -95,13 +89,15 @@ public class BsthTLineController extends BaseController
95 89 @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
96 90 @PostMapping("/export")
97 91 @ResponseBody
98   - public AjaxResult export(BsthTLine bsthTLine)
99   - {
  92 + public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
  93 +
100 94 List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
101 95  
102 96 List<DictData> dicts = dictDataService.selectDictDataList(null);
103 97  
104 98 Map<String,List<DictData>> dictMap = new HashMap();
  99 +
  100 + List<String> titles=new ArrayList<>();
105 101  
106 102 for(DictData d : dicts) {
107 103  
... ... @@ -115,15 +111,31 @@ public class BsthTLineController extends BaseController
115 111 for(BsthTLine line:list) {
116 112  
117 113 Field[] field = line.getClass().getDeclaredFields();
118   -
119   -
  114 +
  115 + String isWarrant=bsthTLine.getIsWarrant();
  116 + if("0".equals(isWarrant)){//现实
  117 + for (Field f : field) {
  118 + String fName=f.getName();
  119 + if(!"isWarrantStartTime".equals(fName) && !"isWarrantEndTime".equals(fName) && !"warrantVehiclesLarge".equals(fName) && !"warrantVehiclesMiddle".equals(fName) && !"number_of_manage".equals(fName)){
  120 + titles.add(fName);
  121 + }
  122 + }
  123 + }else if("1".equals(isWarrant)){//权证
  124 + for (Field f : field) {
  125 + String fName=f.getName();
  126 + if(!"vehiclesNumber".equals(fName) && !"numberVehiclesLarge".equals(fName) && !"numberVehiclesMiddle".equals(fName) ){
  127 + titles.add(fName);
  128 + }
  129 + }
  130 + }
  131 +
120 132  
121 133 for(int j=0 ; j<field.length ; j++){ //遍历所有属性
122 134 String name = field[j].getName(); //获取属性的名字
123 135  
124 136 String type = name;
125 137  
126   - if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")) {
  138 + if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) {
127 139 type = "trueFalse";
128 140 }
129 141  
... ... @@ -172,9 +184,10 @@ public class BsthTLineController extends BaseController
172 184  
173 185  
174 186 }
175   -
176   -
  187 +
  188 +
177 189 ExcelUtil<BsthTLine> util = new ExcelUtil<BsthTLine>(BsthTLine.class);
  190 + util.setTitles(titles);
178 191 return util.exportExcel(list, "line");
179 192 }
180 193  
... ... @@ -191,7 +204,7 @@ public class BsthTLineController extends BaseController
191 204 * 新增保存【请填写功能名称】
192 205 */
193 206 @RequiresPermissions("system:line:add")
194   - @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
  207 + @Log(title = "新增线路基本信息", businessType = BusinessType.INSERT)
195 208 @PostMapping("/add")
196 209 @ResponseBody
197 210 public AjaxResult addSave(BsthTLine bsthTLine)
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @01f75be
1 1 package com.ruoyi.project.system.line.domain;
2 2  
3   -import java.util.Date;
4 3 import com.fasterxml.jackson.annotation.JsonFormat;
5   -import org.apache.commons.lang3.builder.ToStringBuilder;
6   -import org.apache.commons.lang3.builder.ToStringStyle;
7 4 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
8 5 import com.ruoyi.framework.web.domain.BaseEntity;
9 6  
  7 +import java.util.Date;
  8 +
10 9 /**
11 10 * 【请填写功能名称】对象 bsth_t_line
12 11 *
... ... @@ -137,10 +136,20 @@ public class BsthTLine extends BaseEntity
137 136 @Excel(name = "停车场")
138 137 private String park;
139 138  
140   - /** 是否权证 */
  139 + /** 是否权证 0-否 1-是*/
141 140 @Excel(name = "是否权证")
142 141 private String isWarrant;
143 142  
  143 + /** 权证开通日期 */
  144 + @JsonFormat(pattern = "yyyy-MM-dd")
  145 + @Excel(name = "权证开通日期", width = 30, dateFormat = "yyyy-MM-dd")
  146 + private Date isWarrantStartTime;
  147 +
  148 + /** 权证到期日期 */
  149 + @JsonFormat(pattern = "yyyy-MM-dd")
  150 + @Excel(name = "权证到期日期", width = 30, dateFormat = "yyyy-MM-dd")
  151 + private Date isWarrantEndTime;
  152 +
144 153 /** 道路类型 */
145 154 @Excel(name = "道路类型")
146 155 private String roadType;
... ... @@ -1054,90 +1063,108 @@ public class BsthTLine extends BaseEntity
1054 1063 this.files = files;
1055 1064 }
1056 1065  
1057   - @Override
  1066 + public Date getIsWarrantStartTime() {
  1067 + return isWarrantStartTime;
  1068 + }
  1069 +
  1070 + public void setIsWarrantStartTime(Date isWarrantStartTime) {
  1071 + this.isWarrantStartTime = isWarrantStartTime;
  1072 + }
  1073 +
  1074 + public Date getIsWarrantEndTime() {
  1075 + return isWarrantEndTime;
  1076 + }
  1077 +
  1078 + public void setIsWarrantEndTime(Date isWarrantEndTime) {
  1079 + this.isWarrantEndTime = isWarrantEndTime;
  1080 + }
  1081 +
  1082 + @Override
1058 1083 public String toString() {
1059   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
1060   - .append("id", getId())
1061   - .append("eventId", getEventId())
1062   - .append("lineId", getLineId())
1063   - .append("lineName", getLineName())
1064   - .append("company", getCompany())
1065   - .append("FCompany", getFCompany())
1066   - .append("pLineId", getPLineId())
1067   - .append("serviceType", getServiceType())
1068   - .append("lineLevel", getLineLevel())
1069   - .append("lineType", getLineType())
1070   - .append("district", getDistrict())
1071   - .append("inoutDistrict", getInoutDistrict())
1072   - .append("serviceState", getServiceState())
1073   - .append("busType", getBusType())
1074   - .append("airConditionerType", getAirConditionerType())
1075   - .append("sellTicketType", getSellTicketType())
1076   - .append("serviceTime", getServiceTime())
1077   - .append("lineDistance", getLineDistance())
1078   - .append("lineCode", getLineCode())
1079   - .append("warrantYear", getWarrantYear())
1080   - .append("warrantStartTime", getWarrantStartTime())
1081   - .append("warrantEndTime", getWarrantEndTime())
1082   - .append("planCancelTime", getPlanCancelTime())
1083   - .append("cancelTime", getCancelTime())
1084   - .append("cancelReason", getCancelReason())
1085   - .append("remark", getRemark())
1086   - .append("isLogicDelete", getIsLogicDelete())
1087   - .append("createTime", getCreateTime())
1088   - .append("updateBy", getUpdateBy())
1089   - .append("updateTime", getUpdateTime())
1090   - .append("createBy", getCreateBy())
1091   - .append("timeSchedule", getTimeSchedule())
1092   - .append("park", getPark())
1093   - .append("isWarrant", getIsWarrant())
1094   - .append("roadType", getRoadType())
1095   - .append("ticketPrice", getTicketPrice())
1096   - .append("firstStation", getFirstStation())
1097   - .append("startEnd", getStartEnd())
1098   - .append("firstTime", getFirstTime())
1099   - .append("lastStation", getLastStation())
1100   - .append("lastTime", getLastTime())
1101   - .append("mileageUp", getMileageUp())
1102   - .append("mileageDown", getMileageDown())
1103   - .append("averageMileage", getAverageMileage())
1104   - .append("stationUp", getStationUp())
1105   - .append("stationDown", getStationDown())
1106   - .append("travelTimeUp", getTravelTimeUp())
1107   - .append("travelTimeDown", getTravelTimeDown())
1108   - .append("travelIntervalUp", getTravelIntervalUp())
1109   - .append("travelIntervalDown", getTravelIntervalDown())
1110   - .append("warrantVehiclesLarge", getWarrantVehiclesLarge())
1111   - .append("warrantVehiclesMiddle", getWarrantVehiclesMiddle())
1112   - .append("vehiclesNumber", getVehiclesNumber())
1113   - .append("numberVehiclesLarge", getNumberVehiclesLarge())
1114   - .append("numberVehiclesMiddle", getNumberVehiclesMiddle())
1115   - .append("carPlate", getCarPlate())
1116   - .append("numberPerson", getNumberPerson())
1117   - .append("numberPersonDriver", getNumberPersonDriver())
1118   - .append("numberPersonSales", getNumberPersonSales())
1119   - .append("busEvNumber", getBusEvNumber())
1120   - .append("directions", getDirections())
1121   - .append("numberOfManage", getNumberOfManage())
1122   - .append("halfwayStation", getHalfwayStation())
1123   - .append("fullCustomerPercent", getFullCustomerPercent())
1124   - .append("lowCustomerPercent", getLowCustomerPercent())
1125   - .append("divideLevel", getDivideLevel())
1126   - .append("hasTimelists", getHasTimelists())
1127   - .append("isMetro", getIsMetro())
1128   - .append("metroTime", getMetroTime())
1129   - .append("coldBonusType", getColdBonusType())
1130   - .append("revenuesMonth", getRevenuesMonth())
1131   - .append("personMonth", getPersonMonth())
1132   - .append("mileageMonth", getMileageMonth())
1133   - .append("personMonthAvg", getPersonMonthAvg())
1134   - .append("revenues", getRevenues())
1135   - .append("persons", getPersons())
1136   - .append("mileages", getMileages())
1137   - .append("personAvg", getPersonAvg())
1138   - .append("startDate", getStartDate())
1139   - .append("StartReason", getStartReason())
1140   - .append("nightParking", getNightParking())
1141   - .toString();
  1084 + return "BsthTLine{" +
  1085 + "id=" + id +
  1086 + ", eventId='" + eventId + '\'' +
  1087 + ", lineId=" + lineId +
  1088 + ", lineName='" + lineName + '\'' +
  1089 + ", company='" + company + '\'' +
  1090 + ", fCompany='" + fCompany + '\'' +
  1091 + ", pLineId=" + pLineId +
  1092 + ", serviceType='" + serviceType + '\'' +
  1093 + ", lineLevel='" + lineLevel + '\'' +
  1094 + ", lineType='" + lineType + '\'' +
  1095 + ", district='" + district + '\'' +
  1096 + ", inoutDistrict='" + inoutDistrict + '\'' +
  1097 + ", serviceState='" + serviceState + '\'' +
  1098 + ", busType='" + busType + '\'' +
  1099 + ", airConditionerType='" + airConditionerType + '\'' +
  1100 + ", sellTicketType='" + sellTicketType + '\'' +
  1101 + ", serviceTime='" + serviceTime + '\'' +
  1102 + ", lineDistance=" + lineDistance +
  1103 + ", lineCode='" + lineCode + '\'' +
  1104 + ", warrantYear=" + warrantYear +
  1105 + ", warrantStartTime=" + warrantStartTime +
  1106 + ", warrantEndTime=" + warrantEndTime +
  1107 + ", planCancelTime=" + planCancelTime +
  1108 + ", cancelTime=" + cancelTime +
  1109 + ", cancelReason='" + cancelReason + '\'' +
  1110 + ", isLogicDelete='" + isLogicDelete + '\'' +
  1111 + ", updateBy='" + updateBy + '\'' +
  1112 + ", updateTime=" + updateTime +
  1113 + ", timeSchedule=" + timeSchedule +
  1114 + ", park='" + park + '\'' +
  1115 + ", isWarrant='" + isWarrant + '\'' +
  1116 + ", isWarrantStartTime=" + isWarrantStartTime +
  1117 + ", isWarrantEndTime=" + isWarrantEndTime +
  1118 + ", roadType='" + roadType + '\'' +
  1119 + ", ticketPrice='" + ticketPrice + '\'' +
  1120 + ", firstStation='" + firstStation + '\'' +
  1121 + ", startEnd='" + startEnd + '\'' +
  1122 + ", firstTime='" + firstTime + '\'' +
  1123 + ", lastStation='" + lastStation + '\'' +
  1124 + ", lastTime='" + lastTime + '\'' +
  1125 + ", mileageUp='" + mileageUp + '\'' +
  1126 + ", mileageDown='" + mileageDown + '\'' +
  1127 + ", averageMileage='" + averageMileage + '\'' +
  1128 + ", stationUp='" + stationUp + '\'' +
  1129 + ", stationDown='" + stationDown + '\'' +
  1130 + ", travelTimeUp='" + travelTimeUp + '\'' +
  1131 + ", travelTimeDown='" + travelTimeDown + '\'' +
  1132 + ", travelIntervalUp='" + travelIntervalUp + '\'' +
  1133 + ", travelIntervalDown='" + travelIntervalDown + '\'' +
  1134 + ", warrantVehiclesLarge=" + warrantVehiclesLarge +
  1135 + ", warrantVehiclesMiddle=" + warrantVehiclesMiddle +
  1136 + ", vehiclesNumber=" + vehiclesNumber +
  1137 + ", numberVehiclesLarge=" + numberVehiclesLarge +
  1138 + ", numberVehiclesMiddle=" + numberVehiclesMiddle +
  1139 + ", carPlate='" + carPlate + '\'' +
  1140 + ", numberPerson=" + numberPerson +
  1141 + ", numberPersonDriver=" + numberPersonDriver +
  1142 + ", numberPersonSales=" + numberPersonSales +
  1143 + ", busEvNumber=" + busEvNumber +
  1144 + ", directions='" + directions + '\'' +
  1145 + ", numberOfManage='" + numberOfManage + '\'' +
  1146 + ", halfwayStation='" + halfwayStation + '\'' +
  1147 + ", fullCustomerPercent=" + fullCustomerPercent +
  1148 + ", lowCustomerPercent=" + lowCustomerPercent +
  1149 + ", divideLevel='" + divideLevel + '\'' +
  1150 + ", hasTimelists='" + hasTimelists + '\'' +
  1151 + ", isMetro='" + isMetro + '\'' +
  1152 + ", metroTime='" + metroTime + '\'' +
  1153 + ", coldBonusType='" + coldBonusType + '\'' +
  1154 + ", revenuesMonth=" + revenuesMonth +
  1155 + ", personMonth=" + personMonth +
  1156 + ", mileageMonth=" + mileageMonth +
  1157 + ", personMonthAvg=" + personMonthAvg +
  1158 + ", revenues=" + revenues +
  1159 + ", persons=" + persons +
  1160 + ", mileages=" + mileages +
  1161 + ", personAvg=" + personAvg +
  1162 + ", startDate=" + startDate +
  1163 + ", startReason='" + startReason + '\'' +
  1164 + ", lineUpdateType='" + lineUpdateType + '\'' +
  1165 + ", updateStatus='" + updateStatus + '\'' +
  1166 + ", nightParking='" + nightParking + '\'' +
  1167 + ", files='" + files + '\'' +
  1168 + '}';
1142 1169 }
1143 1170 }
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @01f75be
... ... @@ -41,6 +41,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
41 41 <result property="timeSchedule" column="time_schedule" />
42 42 <result property="park" column="park" />
43 43 <result property="isWarrant" column="is_warrant" />
  44 + <result property="isWarrantStartTime" column="isWarrant_start_time" />
  45 + <result property="isWarrantEndTime" column="isWarrant_End_time" />
44 46 <result property="roadType" column="road_type" />
45 47 <result property="ticketPrice" column="ticket_price" />
46 48 <result property="firstStation" column="first_station" />
... ... @@ -130,7 +132,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
130 132 service_time, line_distance, line_code, warrant_year,
131 133 warrant_start_time, warrant_end_time, plan_cancel_time, cancel_time,
132 134 cancel_reason, remark, is_logic_delete, create_time, update_by,
133   - update_time, create_by, time_schedule, park, is_warrant, road_type,
  135 + update_time, create_by, time_schedule, park, is_warrant,isWarrant_start_time,isWarrant_end_time, road_type,
134 136 ticket_price, first_station, start_end, first_time, last_station,
135 137 last_time, mileage_up, mileage_down, average_mileage, station_up,
136 138 station_down, travel_time_up, travel_time_down, travel_interval_up,
... ... @@ -354,6 +356,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
354 356 <if test="timeSchedule != null">time_schedule,</if>
355 357 <if test="park != null">park,</if>
356 358 <if test="isWarrant != null">is_warrant,</if>
  359 + <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
  360 + <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
357 361 <if test="roadType != null">road_type,</if>
358 362 <if test="ticketPrice != null">ticket_price,</if>
359 363 <if test="firstStation != null">first_station,</if>
... ... @@ -433,6 +437,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
433 437 <if test="timeSchedule != null">#{timeSchedule},</if>
434 438 <if test="park != null">#{park},</if>
435 439 <if test="isWarrant != null">#{isWarrant},</if>
  440 + <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
  441 + <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
436 442 <if test="roadType != null">#{roadType},</if>
437 443 <if test="ticketPrice != null">#{ticketPrice},</if>
438 444 <if test="firstStation != null">#{firstStation},</if>
... ... @@ -516,6 +522,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
516 522 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
517 523 <if test="park != null">park = #{park},</if>
518 524 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  525 + <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
  526 + <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
519 527 <if test="roadType != null">road_type = #{roadType},</if>
520 528 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
521 529 <if test="firstStation != null">first_station = #{firstStation},</if>
... ... @@ -601,6 +609,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
601 609 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
602 610 <if test="park != null">park = #{park},</if>
603 611 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  612 + <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
  613 + <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
604 614 <if test="roadType != null">road_type = #{roadType},</if>
605 615 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
606 616 <if test="firstStation != null">first_station = #{firstStation},</if>
... ... @@ -1039,105 +1049,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1039 1049 </where>
1040 1050 </select>
1041 1051  
1042   - <select id="selectBsthTLineHistoryListGroupByLineName"
1043   - parameterType="BsthTLine" resultMap="BsthTLineResult">
1044   - <include refid="selectBsthTLineHistoryVo" />
1045   - <where>
1046   - <if test="eventId != null "> and event_id = #{eventId}</if>
1047   - <if test="lineId != null "> and line_id = #{lineId}</if>
1048   - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
1049   - <if test="company != null and company != ''"> and company = #{company}</if>
1050   - <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
1051   - <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
1052   - <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
1053   - <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
1054   - <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
1055   - <if test="district != null and district != ''"> and district = #{district}</if>
1056   - <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
1057   - <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
1058   - <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
1059   - <if
1060   - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
1061   - <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
1062   - <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
1063   - <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
1064   - <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
1065   - <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
1066   - <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
1067   - <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
1068   - <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
1069   - <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1070   - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1071   - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1072   - <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1073   - <if test="park != null and park != ''"> and park = #{park}</if>
1074   - <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
1075   - <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
1076   - <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
1077   - <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
1078   - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
1079   - <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
1080   - <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
1081   - <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
1082   - <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
1083   - <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
1084   - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
1085   - <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
1086   - <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
1087   - <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
1088   - <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
1089   - <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
1090   - <if
1091   - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
1092   - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}
1093   - </if>
1094   - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}
1095   - </if>
1096   - <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
1097   - <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
1098   - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}
1099   - </if>
1100   - <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
1101   - <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
1102   - <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
1103   - <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
1104   - <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
1105   - <if test="directions != null and directions != ''"> and directions = #{directions}</if>
1106   - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
1107   - <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
1108   - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
1109   - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
1110   - <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
1111   - <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
1112   - <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
1113   - <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
1114   - <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
1115   - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
1116   - <if test="personMonth != null "> and person_month = #{personMonth}</if>
1117   - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
1118   - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
1119   - <if test="revenues != null "> and revenues = #{revenues}</if>
1120   - <if test="persons != null "> and persons = #{persons}</if>
1121   - <if test="mileages != null "> and mileages = #{mileages}</if>
1122   - <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1123   - <if test="startDate != null "> and start_date > #{startDate}</if>
1124   - <if test="startReason != null "> and start_reason = #{startReason}</if>
1125   - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1126   - </where>
1127   -
1128   - group by line_name
1129   - </select>
1130   -
1131   - <select id="getListByName" parameterType="java.lang.String" resultMap="BsthTLineResult">
1132   - <include refid="selectBsthTLineHistoryVo" />
1133   - <where>
1134   - and line_name = #{name}
1135   - </where>
1136   - ORDER BY start_date DESC
1137   - </select>
1138   -
1139   -
1140   -
1141 1052 <select id="selectHistoryListNotUpdate"
1142 1053 parameterType="BsthTLine" resultMap="BsthTLineResult">
1143 1054 <include refid="selectBsthTLineHistoryVo" />
... ...