youxiw2000 / bsthLineProfiles · Commits

Commit 387647707479c533d5a21f1d82770c62e0a74a09

Authored by yiming
1 parent 717957ab
build: skipped

bf

Inline Side-by-side
Showing 11 changed files with 934 additions and 1350 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
  View file @3876477
@@ -119,8 +119,8 @@ public class RyTask { @@ -119,8 +119,8 @@ public class RyTask {
119 119
120 } 120 }
121 121
122 - public void createLineMonthReport() { 122 + /*public void createLineMonthReport() {
123 System.out.println("生成月报表"); 123 System.out.println("生成月报表");
124 lineService.createLineMonthReport(); 124 lineService.createLineMonthReport();
125 - } 125 + }*/
126 } 126 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @3876477
@@ -265,15 +265,4 @@ public class BsthTLineHistoryController extends BaseController @@ -265,15 +265,4 @@ public class BsthTLineHistoryController extends BaseController
265 265
266 266
267 267
268 - /**  
269 - * 删除【请填写功能名称】  
270 - */  
271 - @RequiresPermissions("system:lineHistory:remove")  
272 - @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)  
273 - @PostMapping( "/remove")  
274 - @ResponseBody  
275 - public AjaxResult remove(String ids)  
276 - {  
277 - return toAjax(bsthTLineService.deleteBsthTLineHistoryByIds(ids));  
278 - }  
279 } 268 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineReportController.java deleted 100644 → 0
  View file @717957a
1 -package com.ruoyi.project.system.line.controller;  
2 -  
3 -import java.io.FileInputStream;  
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.poi.hssf.usermodel.HSSFWorkbook;  
12 -import org.apache.poi.poifs.filesystem.POIFSFileSystem;  
13 -import org.apache.poi.ss.util.WorkbookUtil;  
14 -import org.apache.shiro.authz.annotation.RequiresPermissions;  
15 -import org.springframework.beans.factory.annotation.Autowired;  
16 -import org.springframework.stereotype.Controller;  
17 -import org.springframework.ui.ModelMap;  
18 -import org.springframework.web.bind.annotation.GetMapping;  
19 -import org.springframework.web.bind.annotation.PathVariable;  
20 -import org.springframework.web.bind.annotation.PostMapping;  
21 -import org.springframework.web.bind.annotation.RequestMapping;  
22 -import org.springframework.web.bind.annotation.ResponseBody;  
23 -import com.ruoyi.framework.aspectj.lang.annotation.Log;  
24 -import com.ruoyi.framework.aspectj.lang.enums.BusinessType;  
25 -import com.ruoyi.framework.config.RuoYiConfig;  
26 -import com.ruoyi.project.system.dict.domain.DictData;  
27 -import com.ruoyi.project.system.dict.service.IDictDataService;  
28 -import com.ruoyi.project.system.line.domain.BsthTLine;  
29 -import com.ruoyi.project.system.line.service.IBsthTLineService;  
30 -import com.ruoyi.project.system.user.domain.User;  
31 -import com.ruoyi.project.system.user.service.IUserService;  
32 -import com.ruoyi.project.utils.ExcelUtils;  
33 -import com.ruoyi.framework.web.controller.BaseController;  
34 -import com.ruoyi.framework.web.domain.AjaxResult;  
35 -import com.ruoyi.common.utils.ServletUtils;  
36 -import com.ruoyi.common.utils.poi.ExcelUtil;  
37 -import com.ruoyi.common.utils.security.ShiroUtils;  
38 -import com.ruoyi.framework.web.page.TableDataInfo;  
39 -  
40 -/**  
41 - * 【请填写功能名称】Controller  
42 - *  
43 - * @author ruoyi  
44 - * @date 2021-08-17  
45 - */  
46 -@Controller  
47 -@RequestMapping("/system/lineReport")  
48 -public class BsthTLineReportController extends BaseController  
49 -{  
50 - private String prefix = "system/lineReport";  
51 -  
52 - @Autowired  
53 - private IBsthTLineService bsthTLineService;  
54 -  
55 - @Autowired  
56 - IDictDataService dictDataService;  
57 -  
58 -  
59 - @Autowired  
60 - private IUserService userService;  
61 -  
62 - @RequiresPermissions("system:lineReport:view")  
63 - @GetMapping()  
64 - public String line()  
65 - {  
66 - return prefix + "/line";  
67 - }  
68 -  
69 - /**  
70 - * 查询【请填写功能名称】列表  
71 - */  
72 - @RequiresPermissions("system:lineReport:list")  
73 - @PostMapping("/list")  
74 - @ResponseBody  
75 - public TableDataInfo list(BsthTLine bsthTLine)  
76 - {  
77 - startPage();  
78 - List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);  
79 - return getDataTable(list);  
80 - }  
81 -  
82 -  
83 -  
84 - /**  
85 - * 导出【请填写功能名称】列表  
86 - */  
87 - @RequiresPermissions("system:lineReport:export")  
88 - @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)  
89 - @PostMapping("/export")  
90 - @ResponseBody  
91 - public AjaxResult export(BsthTLine bsthTLine)  
92 - {  
93 - List<BsthTLine> list = bsthTLineService.selectBsthTlineReportList(bsthTLine);  
94 -  
95 - List<DictData> dicts = dictDataService.selectDictDataList(null);  
96 -  
97 - Map<String,List<DictData>> dictMap = new HashMap();  
98 -  
99 - for(DictData d : dicts) {  
100 -  
101 - if(dictMap.get(d.getDictType()) == null) {  
102 - dictMap.put(d.getDictType(), new ArrayList<DictData>());  
103 - }  
104 -  
105 - dictMap.get(d.getDictType()).add(d);  
106 - }  
107 -  
108 - for(BsthTLine line:list) {  
109 -  
110 - Field[] field = line.getClass().getDeclaredFields();  
111 -  
112 - for(int j=0 ; j<field.length ; j++){ //遍历所有属性  
113 - String name = field[j].getName(); //获取属性的名字  
114 -  
115 - String type = name;  
116 -  
117 - if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")) {  
118 - type = "trueFalse";  
119 - }  
120 - if(dictMap.get(type) != null) {  
121 - name = name.substring(0,1).toUpperCase() + name.substring(1);  
122 - try {  
123 - Method param = line.getClass().getMethod("get"+name);  
124 - String value = (String) param.invoke(line);  
125 - if(value != null && value.split(",").length > 0) {  
126 - String result = "";  
127 - for(String str:value.split(",")) {  
128 - for(DictData d:dictMap.get(type)) {  
129 - if(d.getDictValue().equals(str)) {  
130 - result += d.getDictLabel() + ",";  
131 - }  
132 - }  
133 - }  
134 - Method m = line.getClass().getMethod("set"+name, new Class[] {String.class});  
135 -  
136 - if(!result.isEmpty()) {  
137 - m.invoke(line,new Object[] {new String(result.substring(0,result.length()-1))});  
138 - }else {  
139 - m.invoke(line,new Object[] {new String(value)});  
140 - }  
141 - }  
142 - } catch (Exception e) {  
143 - // TODO Auto-generated catch block  
144 - e.printStackTrace();  
145 - }  
146 - }  
147 - }  
148 - }  
149 -  
150 - ExcelUtils e = new ExcelUtils();  
151 - String path = this.getClass().getResource("/").getPath() + "static/export/lineInfoReport.xls";  
152 - String p = RuoYiConfig.getDownloadPath() + "report.xls";  
153 - e.excelLineInfoReport(path, p ,list);  
154 -  
155 - return AjaxResult.success("report.xls");  
156 - }  
157 -  
158 - /**  
159 - * 新增【请填写功能名称】  
160 - */  
161 - @GetMapping("/add")  
162 - public String add()  
163 - {  
164 - return prefix + "/add";  
165 - }  
166 -  
167 - /**  
168 - * 新增保存【请填写功能名称】  
169 - */  
170 - @RequiresPermissions("system:lineReport:add")  
171 - @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)  
172 - @PostMapping("/add")  
173 - @ResponseBody  
174 - public AjaxResult addSave(BsthTLine bsthTLine)  
175 - {  
176 - User loginUser = ShiroUtils.getSysUser();  
177 - bsthTLine.setCreateBy(loginUser.getUserName());  
178 - return toAjax(bsthTLineService.insertBsthTlineReport(bsthTLine));  
179 - }  
180 -  
181 - @GetMapping("/edit/{id}")  
182 - public String edit(@PathVariable("id") Long id, ModelMap mmap)  
183 - {  
184 - BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);  
185 - mmap.put("bsthTLine", bsthTLine);  
186 - return prefix + "/edit";  
187 - }  
188 -  
189 - /**  
190 - * 修改保存【请填写功能名称】  
191 - */  
192 - @RequiresPermissions("system:lineReport:edit")  
193 - @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)  
194 - @PostMapping("/edit")  
195 - @ResponseBody  
196 - public AjaxResult editSave(BsthTLine bsthTLine)  
197 - {  
198 -  
199 -  
200 - User loginUser = ShiroUtils.getSysUser();  
201 -  
202 - bsthTLine.setUpdateBy(loginUser.getUserName());  
203 -  
204 - return toAjax(bsthTLineService.updateBsthTlineReport(bsthTLine));  
205 - }  
206 -  
207 - /**  
208 - * 删除【请填写功能名称】  
209 - */  
210 - @RequiresPermissions("system:line:remove")  
211 - @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)  
212 - @PostMapping( "/remove")  
213 - @ResponseBody  
214 - public AjaxResult remove(String ids)  
215 - {  
216 - return toAjax(bsthTLineService.deleteBsthTlineReportByIds(ids));  
217 - }  
218 -}  
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @3876477
@@ -14,105 +14,66 @@ import org.apache.ibatis.annotations.Mapper; @@ -14,105 +14,66 @@ import org.apache.ibatis.annotations.Mapper;
14 @Mapper 14 @Mapper
15 public interface BsthTLineMapper 15 public interface BsthTLineMapper
16 { 16 {
17 - /**  
18 - * 查询【请填写功能名称】  
19 - *  
20 - * @param id 【请填写功能名称】ID  
21 - * @return 【请填写功能名称】  
22 - */  
23 - public BsthTLine selectBsthTLineById(Long id);  
24 17
25 - /**  
26 - * 查询【请填写功能名称】列表  
27 - *  
28 - * @param bsthTLine 【请填写功能名称】  
29 - * @return 【请填写功能名称】集合  
30 - */  
31 - public List<BsthTLine> selectBsthTLineList(BsthTLine bsthTLine); 18 + List<BsthTLine> selectBsthTLineList(BsthTLine bsthTLine);
32 19
33 - /**  
34 - * 新增【请填写功能名称】  
35 - *  
36 - * @param bsthTLine 【请填写功能名称】  
37 - * @return 结果  
38 - */  
39 - public int insertBsthTLine(BsthTLine bsthTLine); 20 + BsthTLine selectBsthTLineById(Long id);
40 21
41 - /**  
42 - * 修改【请填写功能名称】  
43 - *  
44 - * @param bsthTLine 【请填写功能名称】  
45 - * @return 结果  
46 - */  
47 - public int updateBsthTLine(BsthTLine bsthTLine); 22 + List<BsthTLine> selectBsthTLineByNames(String[] names);
48 23
49 - /**  
50 - * 删除【请填写功能名称】  
51 - *  
52 - * @param id 【请填写功能名称】ID  
53 - * @return 结果  
54 - */  
55 - public int deleteBsthTLineById(Long id); 24 + BsthTLine selectBsthTLineByLineName(String lineName);
56 25
57 - /**  
58 - * 批量删除【请填写功能名称】  
59 - *  
60 - * @param ids 需要删除的数据ID  
61 - * @return 结果  
62 - */  
63 - public int deleteBsthTLineByIds(String[] ids); 26 + int insertBsthTLine(BsthTLine bsthTLine);
64 27
65 - public int saveEditHistory(BsthTLine old); 28 + int updateBsthTLine(BsthTLine bsthTLine);
66 29
67 - public List<BsthTLine> selectBsthTLineHistoryList(BsthTLine bsthTLine); 30 + int updateBsthTLineByLineName(BsthTLine bsthTLine);
68 31
69 - public int updateBsthTLineHistory(BsthTLine bsthTLine); 32 + List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine);
70 33
71 - public int deleteBsthTLineHistoryByIds(String[] ids); 34 + int insertBsthTLineExamine(BsthTLine bsthTLine);
72 35
73 - public int deleteBsthTLineHistoryById(Long id); 36 + BsthTLine selectBsthTLineExamineById(Long id);
74 37
75 - public BsthTLine selectBsthTLineHistoryById(Long id);  
76 -  
77 - public BsthTLine selectBsthTLineHistoryAndisNeedUpdate(BsthTLine bsthTLine); 38 + BsthTLine selectBsthTLineExamineByLineName(String lineName);
78 39
79 - public int createLineMonthReport(BsthTLine line); 40 + int updateBsthTLineExamine(BsthTLine bsthTLine);
80 41
81 - public List<BsthTLine> selectBsthTlineReportList(BsthTLine bsthTLine); 42 + int deleteBsthTLineExamineById(String[] ids);
82 43
83 - public List<BsthTLine> selectBsthTLineHistoryByIds(String[] idarray); 44 + List<BsthTLine> selectBsthTLineHistoryList(BsthTLine bsthTLine);
84 45
85 - public List<BsthTLine> selectBsthTLineByNames(String[] names); 46 + BsthTLine selectBsthTLineHistoryById(Long id);
86 47
87 - public int updateBsthTLineByLineName(BsthTLine bsthTLine); 48 + List<BsthTLine> selectBsthTLineHistoryByIds(String[] idarray);
88 49
89 - public List<BsthTLine> findNeedUpdateHistory(); 50 + int saveEditHistory(BsthTLine old);
90 51
91 - public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine bsthTLine);  
92 -  
93 - public int insertLineEditRepot(LineEditReport lineEditReport);  
94 - 52 + int updateBsthTLineHistory(BsthTLine bsthTLine);
95 53
96 - public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport); 54 + BsthTLine selectBsthTLineHistoryAndisNeedUpdate(BsthTLine bsthTLine);
97 55
98 - public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object); 56 + List<BsthTLine> findNeedUpdateHistory();
99 57
100 - public List<BsthTLine> getListByName(String name); 58 + BsthTLine historyIsExist(String lineName);
101 59
  60 + int insertLineEditRepot(LineEditReport lineEditReport);
102 61
  62 + List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);
103 63
  64 + List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
  65 +
  66 + List<BsthTLine> getListByName(String name);
  67 +
  68 + List<BsthTLine> selectHistoryListNotUpdate(BsthTLine bsthTLine);
  69 +
  70 +
  71 + /*int createLineMonthReport(BsthTLine line);*/
104 72
105 - List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine);  
106 73
107 - int insertBsthTLineExamine(BsthTLine bsthTLine);  
108 74
109 - BsthTLine selectBsthTLineExamineById(Long id);  
110 75
111 - int updateBsthTLineExamine(BsthTLine bsthTLine);  
112 76
113 - int deleteBsthTLineExamineById(String[] ids);  
114 77
115 - BsthTLine selectBsthTLineExamineByLineName(String lineName);  
116 78
117 - BsthTLine selectBsthTLineByLineName(String lineName);  
118 } 79 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @3876477
@@ -14,89 +14,32 @@ import com.ruoyi.project.system.line.domain.LineEditReport; @@ -14,89 +14,32 @@ import com.ruoyi.project.system.line.domain.LineEditReport;
14 */ 14 */
15 public interface IBsthTLineService 15 public interface IBsthTLineService
16 { 16 {
17 - /**  
18 - * 查询【请填写功能名称】  
19 - *  
20 - * @param id 【请填写功能名称】ID  
21 - * @return 【请填写功能名称】  
22 - */  
23 - public BsthTLine selectBsthTLineById(Long id);  
24 17
25 - /**  
26 - * 查询【请填写功能名称】列表  
27 - *  
28 - * @param bsthTLine 【请填写功能名称】  
29 - * @return 【请填写功能名称】集合  
30 - */  
31 - public List<BsthTLine> selectBsthTLineList(BsthTLine bsthTLine); 18 + BsthTLine selectBsthTLineById(Long id);
32 19
33 - /**  
34 - * 新增【请填写功能名称】  
35 - *  
36 - * @param bsthTLine 【请填写功能名称】  
37 - * @return 结果  
38 - */  
39 - public int insertBsthTLine(BsthTLine bsthTLine); 20 + List<BsthTLine> selectBsthTLineList(BsthTLine bsthTLine);
40 21
41 - /**  
42 - * 修改【请填写功能名称】  
43 - *  
44 - * @param bsthTLine 【请填写功能名称】  
45 - * @return 结果  
46 - */  
47 - public int updateBsthTLine(BsthTLine bsthTLine); 22 + int insertBsthTLine(BsthTLine bsthTLine);
48 23
49 - /**  
50 - * 批量删除【请填写功能名称】  
51 - *  
52 - * @param ids 需要删除的数据ID  
53 - * @return 结果  
54 - */  
55 - public int deleteBsthTLineByIds(String ids); 24 + List<BsthTLine> selectBsthTLineHistoryList(BsthTLine bsthTLine);
56 25
57 - /**  
58 - * 删除【请填写功能名称】信息  
59 - *  
60 - * @param id 【请填写功能名称】ID  
61 - * @return 结果  
62 - */  
63 - public int deleteBsthTLineById(Long id); 26 + int insertBsthTLineHistory(BsthTLine bsthTLine);
64 27
65 - public List<BsthTLine> selectBsthTLineHistoryList(BsthTLine bsthTLine); 28 + int updateBsthTLineHistory(BsthTLine bsthTLine);
66 29
67 - public int insertBsthTLineHistory(BsthTLine bsthTLine); 30 + BsthTLine selectBsthTLineHistoryById(Long id);
68 31
69 - public int updateBsthTLineHistory(BsthTLine bsthTLine); 32 + int updateToLineInfo(String rows);
70 33
71 - public int deleteBsthTLineHistoryByIds(String ids); 34 + void findNeedUpdateHistory();
72 35
73 - int deleteBsthTLineHistoryById(Long id); 36 + List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare);
74 37
75 - public BsthTLine selectBsthTLineHistoryById(Long id); 38 + List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);
76 39
77 - public int createLineMonthReport(); 40 + List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);
78 41
79 - public List<BsthTLine> selectBsthTlineReportList(BsthTLine bsthTLine);  
80 -  
81 - public int insertBsthTlineReport(BsthTLine bsthTLine);  
82 -  
83 - public BsthTLine selectBsthTlineReportById(Long id);  
84 -  
85 - public int updateBsthTlineReport(BsthTLine bsthTLine);  
86 -  
87 - public int deleteBsthTlineReportByIds(String ids);  
88 -  
89 - public int updateToLineInfo(String rows);  
90 -  
91 - public void findNeedUpdateHistory();  
92 -  
93 - public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare);  
94 -  
95 - public List<LineEditReport> selectLineEditReportList(LineEditReport lineEditReport);  
96 -  
97 - public List<BsthTLine> selectBsthTLineHistoryListGroupByLineName(Object object);  
98 -  
99 - public List<BsthTLine> getListByName(String object); 42 + List<BsthTLine> getListByName(String object);
100 43
101 44
102 45
@@ -120,4 +63,6 @@ public interface IBsthTLineService @@ -120,4 +63,6 @@ public interface IBsthTLineService
120 BsthTLine selectBsthTLineExamineByLineName(String lineName); 63 BsthTLine selectBsthTLineExamineByLineName(String lineName);
121 64
122 boolean lineNameIsExist(String lineName); 65 boolean lineNameIsExist(String lineName);
  66 +
  67 + /*int createLineMonthReport();*/
123 } 68 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @3876477
@@ -5,6 +5,7 @@ import java.util.Date; @@ -5,6 +5,7 @@ import java.util.Date;
5 import java.util.HashMap; 5 import java.util.HashMap;
6 import java.util.List; 6 import java.util.List;
7 import java.util.Map; 7 import java.util.Map;
  8 +import java.util.stream.Collectors;
8 9
9 import com.ruoyi.common.utils.DateUtils; 10 import com.ruoyi.common.utils.DateUtils;
10 import com.ruoyi.common.utils.security.ShiroUtils; 11 import com.ruoyi.common.utils.security.ShiroUtils;
@@ -68,60 +69,8 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -68,60 +69,8 @@ public class BsthTLineServiceImpl implements IBsthTLineService
68 return bsthTLineMapper.insertBsthTLine(bsthTLine); 69 return bsthTLineMapper.insertBsthTLine(bsthTLine);
69 } 70 }
70 71
71 - /**  
72 - * 修改【请填写功能名称】  
73 - *  
74 - * @param bsthTLine 【请填写功能名称】  
75 - * @return 结果  
76 - */  
77 - @Override  
78 - public int updateBsthTLine(BsthTLine bsthTLine)  
79 - {  
80 - if(bsthTLine.getStartDate() != null) {  
81 -  
82 - BsthTLine line = bsthTLineMapper.selectBsthTLineById(bsthTLine.getId());  
83 -  
84 - line.setCreateBy(bsthTLine.getUpdateBy());  
85 - line.setUpdateStatus("1");  
86 - bsthTLineMapper.saveEditHistory(line);  
87 -  
88 - bsthTLine.setId(line.getId());  
89 -  
90 -  
91 - return bsthTLineMapper.updateBsthTLineHistory(bsthTLine);  
92 - }  
93 - return bsthTLineMapper.updateBsthTLine(bsthTLine);  
94 - }  
95 -  
96 - /**  
97 - * 删除【请填写功能名称】对象  
98 - *  
99 - * @param ids 需要删除的数据ID  
100 - * @return 结果  
101 - */  
102 - @Override  
103 - public int deleteBsthTLineByIds(String ids)  
104 - {  
105 - return bsthTLineMapper.deleteBsthTLineByIds(Convert.toStrArray(ids));  
106 - }  
107 72
108 - /**  
109 - * 删除【请填写功能名称】信息  
110 - *  
111 - * @param id 【请填写功能名称】ID  
112 - * @return 结果  
113 - */  
114 - @Override  
115 - public int deleteBsthTLineById(Long id)  
116 - {  
117 - return bsthTLineMapper.deleteBsthTLineById(id);  
118 - }  
119 73
120 - @Override  
121 - public int deleteBsthTLineHistoryById(Long id)  
122 - {  
123 - return bsthTLineMapper.deleteBsthTLineHistoryById(id);  
124 - }  
125 74
126 75
127 @Override 76 @Override
@@ -140,11 +89,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -140,11 +89,6 @@ public class BsthTLineServiceImpl implements IBsthTLineService
140 return bsthTLineMapper.updateBsthTLineHistory(bsthTLine); 89 return bsthTLineMapper.updateBsthTLineHistory(bsthTLine);
141 } 90 }
142 91
143 - @Override  
144 - public int deleteBsthTLineHistoryByIds(String ids) {  
145 - // TODO Auto-generated method stub  
146 - return bsthTLineMapper.deleteBsthTLineHistoryByIds(Convert.toStrArray(ids));  
147 - }  
148 92
149 @Override 93 @Override
150 public BsthTLine selectBsthTLineHistoryById(Long id) { 94 public BsthTLine selectBsthTLineHistoryById(Long id) {
@@ -152,7 +96,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -152,7 +96,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
152 return bsthTLineMapper.selectBsthTLineHistoryById(id); 96 return bsthTLineMapper.selectBsthTLineHistoryById(id);
153 } 97 }
154 98
155 - @Override 99 + /*@Override
156 public int createLineMonthReport() { 100 public int createLineMonthReport() {
157 101
158 List<BsthTLine> list = bsthTLineMapper.selectBsthTLineList(null); 102 List<BsthTLine> list = bsthTLineMapper.selectBsthTLineList(null);
@@ -170,12 +114,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -170,12 +114,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
170 } 114 }
171 115
172 return count; 116 return count;
173 - } 117 + }*/
  118 +
174 119
175 - @Override  
176 - public List<BsthTLine> selectBsthTlineReportList(BsthTLine bsthTLine) {  
177 - return bsthTLineMapper.selectBsthTlineReportList(bsthTLine);  
178 - }  
179 120
180 @Override 121 @Override
181 public void findNeedUpdateHistory() { 122 public void findNeedUpdateHistory() {
@@ -196,10 +137,10 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -196,10 +137,10 @@ public class BsthTLineServiceImpl implements IBsthTLineService
196 137
197 } 138 }
198 139
  140 +/*
199 @Override 141 @Override
200 @Transactional 142 @Transactional
201 public int updateToLineInfo(String ids) { 143 public int updateToLineInfo(String ids) {
202 -  
203 String[] idarray = ids.split(","); 144 String[] idarray = ids.split(",");
204 145
205 List<BsthTLine > historys = bsthTLineMapper.selectBsthTLineHistoryByIds(idarray); 146 List<BsthTLine > historys = bsthTLineMapper.selectBsthTLineHistoryByIds(idarray);
@@ -277,32 +218,77 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -277,32 +218,77 @@ public class BsthTLineServiceImpl implements IBsthTLineService
277 218
278 return lines.size(); 219 return lines.size();
279 } 220 }
280 -  
281 - 221 +*/
282 222
283 @Override 223 @Override
284 - public int insertBsthTlineReport(BsthTLine bsthTLine) {  
285 - // TODO Auto-generated method stub  
286 - return 0;  
287 - } 224 + @Transactional
  225 + public int updateToLineInfo(String ids) {
  226 + //查出待更新的数据
  227 + String[] idarray = ids.split(",");
  228 + List<BsthTLine > historys = bsthTLineMapper.selectBsthTLineHistoryByIds(idarray);
  229 + Map<String,List<BsthTLine >> historyMap=historys.stream().collect(Collectors.groupingBy(h->h.getLineName()));
288 230
289 - @Override  
290 - public BsthTLine selectBsthTlineReportById(Long id) {  
291 - // TODO Auto-generated method stub  
292 - return null;  
293 - } 231 + //查出原始数据
  232 + String[] names = new String[historys.size()];
  233 + for(int i =0;i < historys.size();i++) {
  234 + names[i] = historys.get(i).getLineName();
  235 + }
  236 + List<BsthTLine > lines = bsthTLineMapper.selectBsthTLineByNames(names);
  237 + Map<String,List<BsthTLine >> lineMap=lines.stream().collect(Collectors.groupingBy(l->l.getLineName()));
294 238
295 - @Override  
296 - public int updateBsthTlineReport(BsthTLine bsthTLine) {  
297 - // TODO Auto-generated method stub  
298 - return 0;  
299 - } 239 + if(lines.size() != historys.size()) {
  240 + return 0;
  241 + }
300 242
301 - @Override  
302 - public int deleteBsthTlineReportByIds(String ids) {  
303 - // TODO Auto-generated method stub  
304 - return 0; 243 + //记录historyReport
  244 + Map<String,LineEditReport> reportList = new HashMap<>();
  245 + historyMap.forEach((k,v)->{
  246 + BsthTLine history=historyMap.get(k).get(0);
  247 + BsthTLine line=lineMap.get(k).get(0);
  248 +
  249 +
  250 + LineEditReport lineEditReport=new LineEditReport();
  251 + lineEditReport.setCompany(line.getCompany());
  252 + lineEditReport.setLineName(line.getLineName());
  253 + lineEditReport.setLineUpdateType(history.getLineUpdateType());
  254 + lineEditReport.setLineDistanceBefore(line.getLineDistance());
  255 + lineEditReport.setLineDistance(history.getLineDistance());
  256 + lineEditReport.setStartEnd(history.getStartEnd());
  257 + lineEditReport.setStartEndBefore(line.getStartEnd());
  258 + lineEditReport.setVehiclesNumber(history.getVehiclesNumber());
  259 + lineEditReport.setNumberPerson(history.getNumberPerson());
  260 + lineEditReport.setStartDate(history.getStartDate());
  261 + lineEditReport.setCreateTime(history.getCreateTime());
  262 + lineEditReport.setVehiclesNumberBefore(line.getVehiclesNumber());
  263 + lineEditReport.setNumberPersonBefore(line.getNumberPerson());
  264 +
  265 + //判断是否当前记录
  266 + BsthTLine bl=bsthTLineMapper.historyIsExist(line.getLineName());
  267 + if(bl!=null){//存在改为历史
  268 + bl.setUpdateStatus("-1");
  269 + bsthTLineMapper.updateBsthTLineHistory(bl);
  270 + }else {//不存在把运营数据插入
  271 + bl.setUpdateStatus("-1");
  272 + bsthTLineMapper.saveEditHistory(line);
  273 + }
  274 +
  275 + //更新运营数据
  276 + Date d = new Date();
  277 + d.setHours(d.getHours() - 1);
  278 + history.setStartDate(d);
  279 + bsthTLineMapper.updateBsthTLineByLineName(history);
  280 +
  281 + //把待处理改为当前
  282 + history.setUpdateStatus("0");
  283 + bsthTLineMapper.updateBsthTLineHistory(history);
  284 +
  285 + reportList.put(k,lineEditReport);
  286 + bsthTLineMapper.insertLineEditRepot(lineEditReport);
  287 + });
  288 + return lines.size();
305 } 289 }
  290 +
  291 +
306 292
307 @Override 293 @Override
308 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare) { 294 public List<BsthTLine> selectHistoryListNotUpdate(BsthTLine compare) {
@@ -401,9 +387,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -401,9 +387,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
401 }else{//变更 387 }else{//变更
402 if("2".equals(bsthTLine.getExamineStatus())){//通过 388 if("2".equals(bsthTLine.getExamineStatus())){//通过
403 //在历史表记录原始数据 389 //在历史表记录原始数据
404 - bsthTLine=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId()); 390 + bsthTLine=bsthTLineMapper.selectBsthTLineExamineById(bsthTLine.getId());//新数据
405 String id=bsthTLine.getId().toString(); 391 String id=bsthTLine.getId().toString();
406 - bl = bsthTLineMapper.selectBsthTLineByNames(new String[]{bsthTLine.getLineName()}).get(0); 392 + bl = bsthTLineMapper.selectBsthTLineByNames(new String[]{bsthTLine.getLineName()}).get(0);//原始数据
407 bl.setCreateBy(bsthTLine.getUpdateBy()); 393 bl.setCreateBy(bsthTLine.getUpdateBy());
408 bsthTLineMapper.saveEditHistory(bl); 394 bsthTLineMapper.saveEditHistory(bl);
409 if(bsthTLine.getStartDate() != null) {//设置了启用时间 395 if(bsthTLine.getStartDate() != null) {//设置了启用时间
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @3876477
@@ -20,8 +20,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -20,8 +20,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
20 <result property="inoutDistrict" column="inout_district" /> 20 <result property="inoutDistrict" column="inout_district" />
21 <result property="serviceState" column="service_state" /> 21 <result property="serviceState" column="service_state" />
22 <result property="busType" column="bus_type" /> 22 <result property="busType" column="bus_type" />
23 - <result property="airConditionerType"  
24 - column="air_conditioner_type" /> 23 + <result property="airConditionerType" column="air_conditioner_type" />
25 <result property="sellTicketType" column="sell_ticket_type" /> 24 <result property="sellTicketType" column="sell_ticket_type" />
26 <result property="serviceTime" column="service_time" /> 25 <result property="serviceTime" column="service_time" />
27 <result property="lineDistance" column="line_distance" /> 26 <result property="lineDistance" column="line_distance" />
@@ -58,31 +57,22 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -58,31 +57,22 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
58 <result property="travelTimeUp" column="travel_time_up" /> 57 <result property="travelTimeUp" column="travel_time_up" />
59 <result property="travelTimeDown" column="travel_time_down" /> 58 <result property="travelTimeDown" column="travel_time_down" />
60 <result property="travelIntervalUp" column="travel_interval_up" /> 59 <result property="travelIntervalUp" column="travel_interval_up" />
61 - <result property="travelIntervalDown"  
62 - column="travel_interval_down" />  
63 - <result property="warrantVehiclesLarge"  
64 - column="warrant_vehicles_large" />  
65 - <result property="warrantVehiclesMiddle"  
66 - column="warrant_vehicles_middle" /> 60 + <result property="travelIntervalDown" column="travel_interval_down" />
  61 + <result property="warrantVehiclesLarge" column="warrant_vehicles_large" />
  62 + <result property="warrantVehiclesMiddle" column="warrant_vehicles_middle" />
67 <result property="vehiclesNumber" column="vehicles_number" /> 63 <result property="vehiclesNumber" column="vehicles_number" />
68 - <result property="numberVehiclesLarge"  
69 - column="number_vehicles_large" />  
70 - <result property="numberVehiclesMiddle"  
71 - column="number_vehicles_middle" /> 64 + <result property="numberVehiclesLarge" column="number_vehicles_large" />
  65 + <result property="numberVehiclesMiddle" column="number_vehicles_middle" />
72 <result property="carPlate" column="car_plate" /> 66 <result property="carPlate" column="car_plate" />
73 <result property="numberPerson" column="number_person" /> 67 <result property="numberPerson" column="number_person" />
74 - <result property="numberPersonDriver"  
75 - column="number_person_driver" />  
76 - <result property="numberPersonSales"  
77 - column="number_person_sales" /> 68 + <result property="numberPersonDriver" column="number_person_driver" />
  69 + <result property="numberPersonSales" column="number_person_sales" />
78 <result property="busEvNumber" column="bus_ev_number" /> 70 <result property="busEvNumber" column="bus_ev_number" />
79 <result property="directions" column="directions" /> 71 <result property="directions" column="directions" />
80 <result property="numberOfManage" column="number_of_manage" /> 72 <result property="numberOfManage" column="number_of_manage" />
81 <result property="halfwayStation" column="halfway_station" /> 73 <result property="halfwayStation" column="halfway_station" />
82 - <result property="fullCustomerPercent"  
83 - column="full_customer_percent" />  
84 - <result property="lowCustomerPercent"  
85 - column="low_customer_percent" /> 74 + <result property="fullCustomerPercent" column="full_customer_percent" />
  75 + <result property="lowCustomerPercent" column="low_customer_percent" />
86 <result property="divideLevel" column="divide_level" /> 76 <result property="divideLevel" column="divide_level" />
87 <result property="hasTimelists" column="has_timelists" /> 77 <result property="hasTimelists" column="has_timelists" />
88 <result property="isMetro" column="is_metro" /> 78 <result property="isMetro" column="is_metro" />
@@ -108,6 +98,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -108,6 +98,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
108 <result property="examineType" column="examine_type" /> 98 <result property="examineType" column="examine_type" />
109 </resultMap> 99 </resultMap>
110 100
  101 +
111 <resultMap type="LineEditReport" id="LineEditReportResult"> 102 <resultMap type="LineEditReport" id="LineEditReportResult">
112 <result property="id" column="id" /> 103 <result property="id" column="id" />
113 <result property="lineName" column="line_name" /> 104 <result property="lineName" column="line_name" />
@@ -128,102 +119,23 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -128,102 +119,23 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
128 119
129 120
130 <sql id="selectBsthTLineVo"> 121 <sql id="selectBsthTLineVo">
131 - select id, event_id, line_id, line_name, company,  
132 - f_company, p_line_id,  
133 - service_type, line_level, line_type, district,  
134 - inout_district,  
135 - service_state, bus_type, air_conditioner_type,  
136 - sell_ticket_type,  
137 - service_time, line_distance, line_code, warrant_year,  
138 - warrant_start_time, warrant_end_time, plan_cancel_time, cancel_time,  
139 - cancel_reason, remark, is_logic_delete, create_time, update_by,  
140 - update_time, create_by, time_schedule, park, is_warrant,isWarrant_start_time,isWarrant_end_time, road_type,  
141 - ticket_price, first_station, start_end, first_time, last_station,  
142 - last_time, mileage_up, mileage_down, average_mileage, station_up,  
143 - station_down, travel_time_up, travel_time_down, travel_interval_up,  
144 - travel_interval_down, warrant_vehicles_large, warrant_vehicles_middle,  
145 - vehicles_number, number_vehicles_large, number_vehicles_middle,  
146 - car_plate, number_person, number_person_driver, number_person_sales,  
147 - bus_ev_number, directions, number_of_manage, halfway_station,  
148 - full_customer_percent, low_customer_percent, divide_level,  
149 - has_timelists, is_metro, metro_time, cold_bonus_type, revenues_month,  
150 - person_month, mileage_month, person_month_avg, revenues, persons,  
151 - mileages, person_avg, night_parking,files from bsth_t_line 122 + select * from bsth_t_line
152 </sql> 123 </sql>
153 124
  125 + <sql id="selectBsthTLineExamineVo">
  126 + select * from bsth_t_line_examine
  127 + </sql>
154 128
155 <sql id="selectBsthTLineHistoryVo"> 129 <sql id="selectBsthTLineHistoryVo">
156 select * from bsth_t_line_history 130 select * from bsth_t_line_history
157 </sql> 131 </sql>
158 132
159 - <sql id="selectBsthTLineReportVo">  
160 - select * from bsth_t_line_report  
161 - </sql>  
162 -  
163 - <sql id="selectLineEditReportVo"> 133 + <sql id="selectLineEditReportVo">
164 select * from bsth_t_line_history_report 134 select * from bsth_t_line_history_report
165 </sql> 135 </sql>
166 -  
167 -  
168 - <select id="selectLineEditReportList" parameterType="LineEditReport"  
169 - resultMap="LineEditReportResult">  
170 - <include refid="selectLineEditReportVo" />  
171 - <where>  
172 - <if test="lineName != null and lineName != ''">and line_name like concat('%', #{lineName}, '%') </if>  
173 - <if test="company != null and company != ''">and company = #{company}</if>  
174 - <if test="lineDistance != null and lineDistance != ''">and line_distance = #{lineDistance}</if>  
175 - <if test="startEnd != null and startEnd != ''">and start_end = #{startEnd}</if>  
176 - <if test="vehiclesNumber != null and vehiclesNumber != ''">and vehicles_number = #{vehiclesNumber}</if>  
177 - <if test="numberPerson != null and numberPerson != ''">and number_person = #{numberPerson}</if>  
178 - <if test="lineDistanceBefore != null and lineDistanceBefore != ''">and line_distance_before = #{lineDistanceBefore}</if>  
179 - <if test="startEndBefore != null and startEndBefore != ''">and start_end_before = #{startEndBefore}</if>  
180 - <if test="vehiclesNumberBefore != null and vehiclesNumberBefore != ''">and vehicles_number_before = #{vehiclesNumberBefore}</if>  
181 - <if test="numberPersonBefore != null and numberPersonBefore != ''">and number_person_before = #{numberPersonBefore}</if>  
182 - <if test="createTime != null ">and create_time = #{createTime}</if>  
183 - <if test="startDate != null ">and start_date > STR_TO_DATE(CONCAT(#{startDate},"-01"),"%Y-%m-%d")</if>  
184 - <if test="startDate == null ">and start_date > DATE_FORMAT(sysdate(),"%Y-%m-01")</if>  
185 - <if test="lineUpdateType != null and lineUpdateType != ''" >and line_update_type = #{lineUpdateType}</if>  
186 - </where>  
187 - </select>  
188 -  
189 - <insert id="insertLineEditRepot" parameterType="LineEditReport"  
190 - useGeneratedKeys="true" keyProperty="id">  
191 - insert into bsth_t_line_history_report  
192 - <trim prefix="(" suffix=")" suffixOverrides=",">  
193 - <if test="lineName != null">line_name,</if>  
194 - <if test="company != null">company,</if>  
195 - <if test="lineDistance != null">line_distance,</if>  
196 - <if test="startEnd != null">start_end,</if>  
197 - <if test="vehiclesNumber != null">vehicles_number,</if>  
198 - <if test="numberPerson != null">number_person,</if>  
199 - <if test="lineDistanceBefore != null">line_distance_before,</if>  
200 - <if test="startEndBefore != null">start_end_before,</if>  
201 - <if test="vehiclesNumberBefore != null">vehicles_number_before,</if>  
202 - <if test="numberPersonBefore != null">number_person_before,</if>  
203 - <if test="createTime != null">create_time,</if>  
204 - <if test="startDate != null">start_date,</if>  
205 - <if test="lineUpdateType != null">line_update_type,</if>  
206 - </trim>  
207 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
208 - <if test="lineName != null">#{lineName},</if>  
209 - <if test="company != null">#{company},</if>  
210 - <if test="lineDistance != null">#{lineDistance},</if>  
211 - <if test="startEnd != null">#{startEnd},</if>  
212 - <if test="vehiclesNumber != null">#{vehiclesNumber},</if>  
213 - <if test="numberPerson != null">#{numberPerson},</if>  
214 - <if test="lineDistanceBefore != null">#{lineDistanceBefore},</if>  
215 - <if test="startEndBefore != null">#{startEndBefore},</if>  
216 - <if test="vehiclesNumberBefore != null">#{vehiclesNumberBefore},</if>  
217 - <if test="numberPersonBefore != null">#{numberPersonBefore},</if>  
218 - <if test="createTime != null">#{createTime},</if>  
219 - <if test="startDate != null">#{startDate},</if>  
220 - <if test="lineUpdateType != null">#{lineUpdateType},</if>  
221 - </trim>  
222 - </insert>  
223 -  
224 136
225 <select id="selectBsthTLineList" parameterType="BsthTLine" 137 <select id="selectBsthTLineList" parameterType="BsthTLine"
226 - resultMap="BsthTLineResult"> 138 + resultMap="BsthTLineResult">
227 <include refid="selectBsthTLineVo" /> 139 <include refid="selectBsthTLineVo" />
228 <where> 140 <where>
229 <if test="eventId != null "> and event_id = #{eventId}</if> 141 <if test="eventId != null "> and event_id = #{eventId}</if>
@@ -239,8 +151,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -239,8 +151,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
239 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if> 151 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
240 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if> 152 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
241 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if> 153 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
242 - <if  
243 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if> 154 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
244 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if> 155 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
245 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if> 156 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
246 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if> 157 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
@@ -272,16 +183,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -272,16 +183,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
272 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if> 183 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
273 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if> 184 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
274 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if> 185 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
275 - <if  
276 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
277 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
278 - </if>  
279 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
280 - </if> 186 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  187 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  188 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
281 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if> 189 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
282 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if> 190 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
283 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
284 - </if> 191 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
285 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if> 192 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
286 <if test="numberPerson != null "> and number_person = #{numberPerson}</if> 193 <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
287 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if> 194 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
@@ -310,25 +217,35 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -310,25 +217,35 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
310 </where> 217 </where>
311 </select> 218 </select>
312 219
  220 +
313 <select id="selectBsthTLineById" parameterType="Long" 221 <select id="selectBsthTLineById" parameterType="Long"
314 - resultMap="BsthTLineResult"> 222 + resultMap="BsthTLineResult">
315 <include refid="selectBsthTLineVo" /> 223 <include refid="selectBsthTLineVo" />
316 where id = #{id} 224 where id = #{id}
317 </select> 225 </select>
318 226
  227 +
319 <select id="selectBsthTLineByNames" parameterType="String" 228 <select id="selectBsthTLineByNames" parameterType="String"
320 - resultMap="BsthTLineResult"> 229 + resultMap="BsthTLineResult">
321 select * from bsth_t_line where line_name in 230 select * from bsth_t_line where line_name in
322 <foreach item="id" collection="array" open="(" separator="," 231 <foreach item="id" collection="array" open="(" separator=","
323 - close=")"> 232 + close=")">
324 #{id} 233 #{id}
325 </foreach> 234 </foreach>
326 </select> 235 </select>
327 236
328 237
329 238
  239 + <select id="selectBsthTLineByLineName" parameterType="String"
  240 + resultMap="BsthTLineResult">
  241 + <include refid="selectBsthTLineVo" />
  242 + where line_name= #{lineName}
  243 + </select>
  244 +
  245 +
  246 +
330 <insert id="insertBsthTLine" parameterType="BsthTLine" 247 <insert id="insertBsthTLine" parameterType="BsthTLine"
331 - useGeneratedKeys="true" keyProperty="id"> 248 + useGeneratedKeys="true" keyProperty="id">
332 insert into bsth_t_line 249 insert into bsth_t_line
333 <trim prefix="(" suffix=")" suffixOverrides=","> 250 <trim prefix="(" suffix=")" suffixOverrides=",">
334 <if test="eventId != null">event_id,</if> 251 <if test="eventId != null">event_id,</if>
@@ -407,8 +324,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -407,8 +324,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
407 <if test="persons != null">persons,</if> 324 <if test="persons != null">persons,</if>
408 <if test="mileages != null">mileages,</if> 325 <if test="mileages != null">mileages,</if>
409 <if test="personAvg != null">person_avg,</if> 326 <if test="personAvg != null">person_avg,</if>
410 - <if test="startDate != null">start_date,</if>  
411 <if test="nightParking != null">night_parking,</if> 327 <if test="nightParking != null">night_parking,</if>
  328 + <if test="files != null">files,</if>
  329 + <if test="startDate != null">start_date,</if>
  330 + <if test="startReason != null">start_reason,</if>
  331 + <if test="lineUpdateType != null">line_update_type,</if>
  332 + <if test="revenueType != null">revenue_type,</if>
412 create_time, 333 create_time,
413 </trim> 334 </trim>
414 <trim prefix="values (" suffix=")" suffixOverrides=","> 335 <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -488,97 +409,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -488,97 +409,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
488 <if test="persons != null">#{persons},</if> 409 <if test="persons != null">#{persons},</if>
489 <if test="mileages != null">#{mileages},</if> 410 <if test="mileages != null">#{mileages},</if>
490 <if test="personAvg != null">#{personAvg},</if> 411 <if test="personAvg != null">#{personAvg},</if>
491 - <if test="startDate != null">#{startDate},</if>  
492 <if test="nightParking != null">#{nightParking},</if> 412 <if test="nightParking != null">#{nightParking},</if>
  413 + <if test="files != null">#{files},</if>
  414 + <if test="startDate != null">#{startDate},</if>
  415 + <if test="startReason != null">#{startReason},</if>
  416 + <if test="lineUpdateType != null">#{lineUpdateType},</if>
  417 + <if test="revenueType != null">#{revenueType},</if>
493 sysdate(), 418 sysdate(),
494 </trim> 419 </trim>
495 </insert> 420 </insert>
496 421
497 - <update id="updateBsthTLineByLineName" parameterType="BsthTLine">  
498 - update bsth_t_line  
499 - <trim prefix="SET" suffixOverrides=",">  
500 - <if test="eventId != null">event_id = #{eventId},</if>  
501 - <if test="lineId != null">line_id = #{lineId},</if>  
502 - <if test="company != null">company = #{company},</if>  
503 - <if test="fCompany != null">f_company = #{fCompany},</if>  
504 - <if test="pLineId != null">p_line_id = #{pLineId},</if>  
505 - <if test="serviceType != null">service_type = #{serviceType},</if>  
506 - <if test="lineLevel != null">line_level = #{lineLevel},</if>  
507 - <if test="lineType != null">line_type = #{lineType},</if>  
508 - <if test="district != null">district = #{district},</if>  
509 - <if test="inoutDistrict != null">inout_district = #{inoutDistrict},</if>  
510 - <if test="serviceState != null">service_state = #{serviceState},</if>  
511 - <if test="busType != null">bus_type = #{busType},</if>  
512 - <if test="airConditionerType != null">air_conditioner_type = #{airConditionerType},</if>  
513 - <if test="sellTicketType != null">sell_ticket_type = #{sellTicketType},</if>  
514 - <if test="serviceTime != null">service_time = #{serviceTime},</if>  
515 - <if test="lineDistance != null">line_distance = #{lineDistance},</if>  
516 - <if test="lineCode != null">line_code = #{lineCode},</if>  
517 - <if test="warrantYear != null">warrant_year = #{warrantYear},</if>  
518 - <if test="warrantStartTime != null">warrant_start_time = #{warrantStartTime},</if>  
519 - <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>  
520 - <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>  
521 - <if test="cancelTime != null">cancel_time = #{cancelTime},</if>  
522 - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>  
523 - <if test="remark != null">remark = #{remark},</if>  
524 - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>  
525 - <if test="updateBy != null">update_by = #{updateBy},</if>  
526 - update_time = sysdate(),  
527 - <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>  
528 - <if test="park != null">park = #{park},</if>  
529 - <if test="isWarrant != null">is_warrant = #{isWarrant},</if>  
530 - <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>  
531 - <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>  
532 - <if test="roadType != null">road_type = #{roadType},</if>  
533 - <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>  
534 - <if test="firstStation != null">first_station = #{firstStation},</if>  
535 - <if test="startEnd != null">start_end = #{startEnd},</if>  
536 - <if test="firstTime != null">first_time = #{firstTime},</if>  
537 - <if test="lastStation != null">last_station = #{lastStation},</if>  
538 - <if test="lastTime != null">last_time = #{lastTime},</if>  
539 - <if test="mileageUp != null">mileage_up = #{mileageUp},</if>  
540 - <if test="mileageDown != null">mileage_down = #{mileageDown},</if>  
541 - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>  
542 - <if test="stationUp != null">station_up = #{stationUp},</if>  
543 - <if test="stationDown != null">station_down = #{stationDown},</if>  
544 - <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>  
545 - <if test="travelTimeDown != null">travel_time_down = #{travelTimeDown},</if>  
546 - <if test="travelIntervalUp != null">travel_interval_up = #{travelIntervalUp},</if>  
547 - <if test="travelIntervalDown != null">travel_interval_down = #{travelIntervalDown},</if>  
548 - <if test="warrantVehiclesLarge != null">warrant_vehicles_large = #{warrantVehiclesLarge},</if>  
549 - <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle = #{warrantVehiclesMiddle},</if>  
550 - <if test="vehiclesNumber != null">vehicles_number = #{vehiclesNumber},</if>  
551 - <if test="numberVehiclesLarge != null">number_vehicles_large = #{numberVehiclesLarge},</if>  
552 - <if test="numberVehiclesMiddle != null">number_vehicles_middle = #{numberVehiclesMiddle},</if>  
553 - <if test="carPlate != null">car_plate = #{carPlate},</if>  
554 - <if test="numberPerson != null">number_person = #{numberPerson},</if>  
555 - <if test="numberPersonDriver != null">number_person_driver = #{numberPersonDriver},</if>  
556 - <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>  
557 - <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>  
558 - <if test="directions != null">directions = #{directions},</if>  
559 - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>  
560 - <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>  
561 - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>  
562 - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>  
563 - <if test="divideLevel != null">divide_level = #{divideLevel},</if>  
564 - <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>  
565 - <if test="isMetro != null">is_metro = #{isMetro},</if>  
566 - <if test="metroTime != null">metro_time = #{metroTime},</if>  
567 - <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>  
568 - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>  
569 - <if test="personMonth != null">person_month = #{personMonth},</if>  
570 - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>  
571 - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>  
572 - <if test="revenues != null">revenues = #{revenues},</if>  
573 - <if test="persons != null">persons = #{persons},</if>  
574 - <if test="mileages != null">mileages = #{mileages},</if>  
575 - <if test="personAvg != null">person_avg = #{personAvg},</if>  
576 - <if test="startDate != null">start_date = #{startDate},</if>  
577 - <if test="nightParking != null">night_parking = #{nightParking},</if>  
578 - <if test="files != null">files = #{files},</if>  
579 - </trim>  
580 - where line_name = #{lineName}  
581 - </update> 422 +
582 423
583 <update id="updateBsthTLine" parameterType="BsthTLine"> 424 <update id="updateBsthTLine" parameterType="BsthTLine">
584 update bsth_t_line 425 update bsth_t_line
@@ -663,47 +504,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -663,47 +504,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
663 <if test="startDate != null">start_date = #{startDate},</if> 504 <if test="startDate != null">start_date = #{startDate},</if>
664 <if test="nightParking != null">night_parking = #{nightParking},</if> 505 <if test="nightParking != null">night_parking = #{nightParking},</if>
665 <if test="files != null">files = #{files},</if> 506 <if test="files != null">files = #{files},</if>
  507 + <if test="revenueType != null">revenue_type = #{revenueType},</if>
  508 + <if test="startReason != null">start_reason = #{startReason},</if>
  509 + <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
666 </trim> 510 </trim>
667 where id = #{id} 511 where id = #{id}
668 </update> 512 </update>
669 513
670 - <delete id="deleteBsthTLineById" parameterType="Long">  
671 - delete from  
672 - bsth_t_line where id = #{id}  
673 - </delete>  
674 -  
675 - <delete id="deleteBsthTLineByIds" parameterType="String">  
676 - delete from bsth_t_line where id in  
677 - <foreach item="id" collection="array" open="(" separator=","  
678 - close=")">  
679 - #{id}  
680 - </foreach>  
681 - </delete>  
682 -  
683 -  
684 -  
685 - <!-- history -->  
686 -  
687 - <delete id="deleteBsthTLineHistoryById" parameterType="Long">  
688 - delete  
689 - from bsth_t_line_history where id = #{id}  
690 - </delete>  
691 -  
692 - <delete id="deleteBsthTLineHistoryByIds" parameterType="String">  
693 - delete from bsth_t_line_history where id in  
694 - <foreach item="id" collection="array" open="(" separator=","  
695 - close=")">  
696 - #{id}  
697 - </foreach>  
698 - </delete>  
699 514
700 -  
701 - <update id="updateBsthTLineHistory" parameterType="BsthTLine">  
702 - update bsth_t_line_history 515 + <update id="updateBsthTLineByLineName" parameterType="BsthTLine">
  516 + update bsth_t_line
703 <trim prefix="SET" suffixOverrides=","> 517 <trim prefix="SET" suffixOverrides=",">
704 <if test="eventId != null">event_id = #{eventId},</if> 518 <if test="eventId != null">event_id = #{eventId},</if>
705 <if test="lineId != null">line_id = #{lineId},</if> 519 <if test="lineId != null">line_id = #{lineId},</if>
706 - <if test="lineName != null">line_name = #{lineName},</if>  
707 <if test="company != null">company = #{company},</if> 520 <if test="company != null">company = #{company},</if>
708 <if test="fCompany != null">f_company = #{fCompany},</if> 521 <if test="fCompany != null">f_company = #{fCompany},</if>
709 <if test="pLineId != null">p_line_id = #{pLineId},</if> 522 <if test="pLineId != null">p_line_id = #{pLineId},</if>
@@ -732,6 +545,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -732,6 +545,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
732 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if> 545 <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
733 <if test="park != null">park = #{park},</if> 546 <if test="park != null">park = #{park},</if>
734 <if test="isWarrant != null">is_warrant = #{isWarrant},</if> 547 <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  548 + <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
  549 + <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
735 <if test="roadType != null">road_type = #{roadType},</if> 550 <if test="roadType != null">road_type = #{roadType},</if>
736 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if> 551 <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
737 <if test="firstStation != null">first_station = #{firstStation},</if> 552 <if test="firstStation != null">first_station = #{firstStation},</if>
@@ -776,20 +591,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -776,20 +591,19 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
776 <if test="persons != null">persons = #{persons},</if> 591 <if test="persons != null">persons = #{persons},</if>
777 <if test="mileages != null">mileages = #{mileages},</if> 592 <if test="mileages != null">mileages = #{mileages},</if>
778 <if test="personAvg != null">person_avg = #{personAvg},</if> 593 <if test="personAvg != null">person_avg = #{personAvg},</if>
779 - <if test="startDate != null">start_date = #{startDate},</if>  
780 - <if test="startReason != null ">start_reason = #{startReason},</if>  
781 <if test="nightParking != null">night_parking = #{nightParking},</if> 594 <if test="nightParking != null">night_parking = #{nightParking},</if>
782 - <if test="updateStatus != null ">update_status = #{updateStatus},</if>  
783 - <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>  
784 <if test="files != null">files = #{files},</if> 595 <if test="files != null">files = #{files},</if>
  596 + <if test="startDate != null">start_date = #{startDate},</if>
  597 + <if test="startReason != null">start_reason = #{startReason},</if>
  598 + <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
  599 + <if test="revenueType != null">revenue_type = #{revenueType},</if>
785 </trim> 600 </trim>
786 - where id = #{id} 601 + where line_name = #{lineName}
787 </update> 602 </update>
788 603
789 -  
790 - <select id="selectBsthTlineReportList" parameterType="BsthTLine"  
791 - resultMap="BsthTLineResult">  
792 - <include refid="selectBsthTLineReportVo" /> 604 + <select id="selectBsthTLineExamineList" parameterType="BsthTLine"
  605 + resultMap="BsthTLineResult">
  606 + <include refid="selectBsthTLineExamineVo" />
793 <where> 607 <where>
794 <if test="eventId != null "> and event_id = #{eventId}</if> 608 <if test="eventId != null "> and event_id = #{eventId}</if>
795 <if test="lineId != null "> and line_id = #{lineId}</if> 609 <if test="lineId != null "> and line_id = #{lineId}</if>
@@ -804,8 +618,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -804,8 +618,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
804 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if> 618 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
805 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if> 619 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
806 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if> 620 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
807 - <if  
808 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if> 621 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
809 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if> 622 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
810 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if> 623 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
811 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if> 624 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
@@ -817,6 +630,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -817,6 +630,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
817 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if> 630 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
818 <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if> 631 <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
819 <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if> 632 <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  633 + <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
  634 + <if test="updateTime != null "> and update_time = #{updateTime}</if>
820 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if> 635 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
821 <if test="park != null and park != ''"> and park = #{park}</if> 636 <if test="park != null and park != ''"> and park = #{park}</if>
822 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if> 637 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
@@ -835,16 +650,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -835,16 +650,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
835 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if> 650 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
836 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if> 651 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
837 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if> 652 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
838 - <if  
839 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
840 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
841 - </if>  
842 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
843 - </if> 653 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  654 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  655 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
844 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if> 656 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
845 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if> 657 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
846 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
847 - </if> 658 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
848 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if> 659 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
849 <if test="numberPerson != null "> and number_person = #{numberPerson}</if> 660 <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
850 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if> 661 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
@@ -870,400 +681,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -870,400 +681,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
870 <if test="personAvg != null "> and person_avg = #{personAvg}</if> 681 <if test="personAvg != null "> and person_avg = #{personAvg}</if>
871 <if test="startDate != null "> and start_date = #{startDate}</if> 682 <if test="startDate != null "> and start_date = #{startDate}</if>
872 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if> 683 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
873 - <if test="createTime != null"> DATE_FORMAT(create_time,'%Y-%m') =  
874 - DATE_FORMAT(#{createTime},'%Y-%m')</if>  
875 - <if test="createTime == null"> DATE_FORMAT(create_time,'%Y-%m') =  
876 - DATE_FORMAT(sysdate(),'%Y-%m')</if> 684 + <if test="examineStatus == 'true' "> and examine_status in(0,1)</if>
  685 + <if test="examineStatus == 'false' "> and examine_status =2</if>
  686 + <if test="examineType != null and examineType != ''"> and examine_type = #{examineType}</if>
877 </where> 687 </where>
878 </select> 688 </select>
879 689
880 - <select id="selectBsthTLineHistoryAndisNeedUpdate"  
881 - parameterType="BsthTLine" resultMap="BsthTLineResult">  
882 - <include refid="selectBsthTLineHistoryVo" />  
883 - <where>  
884 - <if test="eventId != null "> and event_id = #{eventId}</if>  
885 - <if test="lineId != null "> and line_id = #{lineId}</if>  
886 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>  
887 - <if test="company != null and company != ''"> and company = #{company}</if>  
888 - <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>  
889 - <if test="pLineId != null "> and p_line_id = #{pLineId}</if>  
890 - <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>  
891 - <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>  
892 - <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>  
893 - <if test="district != null and district != ''"> and district = #{district}</if>  
894 - <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>  
895 - <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>  
896 - <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>  
897 - <if  
898 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>  
899 - <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>  
900 - <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>  
901 - <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>  
902 - <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>  
903 - <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>  
904 - <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>  
905 - <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>  
906 - <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>  
907 - <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>  
908 - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>  
909 - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>  
910 - <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>  
911 - <if test="park != null and park != ''"> and park = #{park}</if>  
912 - <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>  
913 - <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>  
914 - <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>  
915 - <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>  
916 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
917 - <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>  
918 - <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>  
919 - <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>  
920 - <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>  
921 - <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>  
922 - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>  
923 - <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>  
924 - <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>  
925 - <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>  
926 - <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>  
927 - <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>  
928 - <if  
929 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
930 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
931 - </if>  
932 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
933 - </if>  
934 - <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>  
935 - <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>  
936 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
937 - </if>  
938 - <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>  
939 - <if test="numberPerson != null "> and number_person = #{numberPerson}</if>  
940 - <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>  
941 - <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>  
942 - <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>  
943 - <if test="directions != null and directions != ''"> and directions = #{directions}</if>  
944 - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>  
945 - <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>  
946 - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>  
947 - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>  
948 - <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>  
949 - <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>  
950 - <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>  
951 - <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>  
952 - <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>  
953 - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>  
954 - <if test="personMonth != null "> and person_month = #{personMonth}</if>  
955 - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>  
956 - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>  
957 - <if test="revenues != null "> and revenues = #{revenues}</if>  
958 - <if test="persons != null "> and persons = #{persons}</if>  
959 - <if test="mileages != null "> and mileages = #{mileages}</if>  
960 - <if test="personAvg != null "> and person_avg = #{personAvg}</if>  
961 - <if test="startDate != null "> and start_date = #{startDate}</if>  
962 - <if test="startReason != null "> and start_reason = #{startReason}</if>  
963 - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>  
964 - and update_status != "-1"  
965 - </where>  
966 - </select>  
967 -  
968 -  
969 - <select id="selectBsthTLineHistoryList"  
970 - parameterType="BsthTLine" resultMap="BsthTLineResult">  
971 - <include refid="selectBsthTLineHistoryVo" />  
972 - <where>  
973 - <if test="eventId != null "> and event_id = #{eventId}</if>  
974 - <if test="lineId != null "> and line_id = #{lineId}</if>  
975 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>  
976 - <if test="company != null and company != ''"> and company = #{company}</if>  
977 - <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>  
978 - <if test="pLineId != null "> and p_line_id = #{pLineId}</if>  
979 - <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>  
980 - <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>  
981 - <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>  
982 - <if test="district != null and district != ''"> and district = #{district}</if>  
983 - <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>  
984 - <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>  
985 - <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>  
986 - <if  
987 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>  
988 - <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>  
989 - <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>  
990 - <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>  
991 - <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>  
992 - <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>  
993 - <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>  
994 - <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>  
995 - <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>  
996 - <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>  
997 - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>  
998 - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>  
999 - <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>  
1000 - <if test="park != null and park != ''"> and park = #{park}</if>  
1001 - <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>  
1002 - <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>  
1003 - <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>  
1004 - <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>  
1005 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1006 - <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>  
1007 - <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>  
1008 - <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>  
1009 - <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>  
1010 - <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>  
1011 - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>  
1012 - <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>  
1013 - <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>  
1014 - <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>  
1015 - <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>  
1016 - <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>  
1017 - <if  
1018 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
1019 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
1020 - </if>  
1021 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
1022 - </if>  
1023 - <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>  
1024 - <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>  
1025 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
1026 - </if>  
1027 - <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>  
1028 - <if test="numberPerson != null "> and number_person = #{numberPerson}</if>  
1029 - <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>  
1030 - <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>  
1031 - <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>  
1032 - <if test="directions != null and directions != ''"> and directions = #{directions}</if>  
1033 - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>  
1034 - <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>  
1035 - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>  
1036 - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>  
1037 - <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>  
1038 - <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>  
1039 - <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>  
1040 - <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>  
1041 - <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>  
1042 - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>  
1043 - <if test="personMonth != null "> and person_month = #{personMonth}</if>  
1044 - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>  
1045 - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>  
1046 - <if test="revenues != null "> and revenues = #{revenues}</if>  
1047 - <if test="persons != null "> and persons = #{persons}</if>  
1048 - <if test="mileages != null "> and mileages = #{mileages}</if>  
1049 - <if test="personAvg != null "> and person_avg = #{personAvg}</if>  
1050 - <if test="startDate != null "> and start_date > #{startDate}</if>  
1051 - <if test="startReason != null "> and start_reason = #{startReason}</if>  
1052 - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>  
1053 - and update_status != "0"  
1054 - </where>  
1055 - </select>  
1056 -  
1057 - <select id="selectHistoryListNotUpdate"  
1058 - parameterType="BsthTLine" resultMap="BsthTLineResult">  
1059 - <include refid="selectBsthTLineHistoryVo" />  
1060 - <where>  
1061 - <if test="eventId != null "> and event_id = #{eventId}</if>  
1062 - <if test="lineId != null "> and line_id = #{lineId}</if>  
1063 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>  
1064 - <if test="company != null and company != ''"> and company = #{company}</if>  
1065 - <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>  
1066 - <if test="pLineId != null "> and p_line_id = #{pLineId}</if>  
1067 - <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>  
1068 - <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>  
1069 - <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>  
1070 - <if test="district != null and district != ''"> and district = #{district}</if>  
1071 - <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>  
1072 - <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>  
1073 - <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>  
1074 - <if  
1075 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>  
1076 - <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>  
1077 - <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>  
1078 - <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>  
1079 - <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>  
1080 - <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>  
1081 - <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>  
1082 - <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>  
1083 - <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>  
1084 - <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>  
1085 - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>  
1086 - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>  
1087 - <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>  
1088 - <if test="park != null and park != ''"> and park = #{park}</if>  
1089 - <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>  
1090 - <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>  
1091 - <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>  
1092 - <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>  
1093 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1094 - <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>  
1095 - <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>  
1096 - <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>  
1097 - <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>  
1098 - <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>  
1099 - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>  
1100 - <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>  
1101 - <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>  
1102 - <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>  
1103 - <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>  
1104 - <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>  
1105 - <if  
1106 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
1107 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
1108 - </if>  
1109 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
1110 - </if>  
1111 - <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>  
1112 - <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>  
1113 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
1114 - </if>  
1115 - <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>  
1116 - <if test="numberPerson != null "> and number_person = #{numberPerson}</if>  
1117 - <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>  
1118 - <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>  
1119 - <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>  
1120 - <if test="directions != null and directions != ''"> and directions = #{directions}</if>  
1121 - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>  
1122 - <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>  
1123 - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>  
1124 - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>  
1125 - <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>  
1126 - <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>  
1127 - <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>  
1128 - <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>  
1129 - <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>  
1130 - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>  
1131 - <if test="personMonth != null "> and person_month = #{personMonth}</if>  
1132 - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>  
1133 - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>  
1134 - <if test="revenues != null "> and revenues = #{revenues}</if>  
1135 - <if test="persons != null "> and persons = #{persons}</if>  
1136 - <if test="mileages != null "> and mileages = #{mileages}</if>  
1137 - <if test="personAvg != null "> and person_avg = #{personAvg}</if>  
1138 - <if test="startDate != null "> and start_date = #{startDate}</if>  
1139 - <if test="startReason != null "> and start_reason = #{startReason}</if>  
1140 - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>  
1141 - and update_status = "1"  
1142 - </where>  
1143 - </select>  
1144 -  
1145 - <select id="selectBsthTLineHistoryListGroupByLineName" parameterType="BsthTLine" resultMap="BsthTLineResult">  
1146 - <include refid="selectBsthTLineHistoryVo" />  
1147 - <where>  
1148 - <if test="eventId != null "> and event_id = #{eventId}</if>  
1149 - <if test="lineId != null "> and line_id = #{lineId}</if>  
1150 - <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>  
1151 - <if test="company != null and company != ''"> and company = #{company}</if>  
1152 - <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>  
1153 - <if test="pLineId != null "> and p_line_id = #{pLineId}</if>  
1154 - <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>  
1155 - <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>  
1156 - <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>  
1157 - <if test="district != null and district != ''"> and district = #{district}</if>  
1158 - <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>  
1159 - <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>  
1160 - <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>  
1161 - <if  
1162 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>  
1163 - <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>  
1164 - <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>  
1165 - <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>  
1166 - <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>  
1167 - <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>  
1168 - <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>  
1169 - <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>  
1170 - <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>  
1171 - <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>  
1172 - <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>  
1173 - <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>  
1174 - <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>  
1175 - <if test="park != null and park != ''"> and park = #{park}</if>  
1176 - <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>  
1177 - <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>  
1178 - <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>  
1179 - <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>  
1180 - <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>  
1181 - <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>  
1182 - <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>  
1183 - <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>  
1184 - <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>  
1185 - <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>  
1186 - <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>  
1187 - <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>  
1188 - <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>  
1189 - <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>  
1190 - <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>  
1191 - <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>  
1192 - <if  
1193 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
1194 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
1195 - </if>  
1196 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
1197 - </if>  
1198 - <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>  
1199 - <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>  
1200 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
1201 - </if>  
1202 - <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>  
1203 - <if test="numberPerson != null "> and number_person = #{numberPerson}</if>  
1204 - <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>  
1205 - <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>  
1206 - <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>  
1207 - <if test="directions != null and directions != ''"> and directions = #{directions}</if>  
1208 - <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>  
1209 - <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>  
1210 - <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>  
1211 - <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>  
1212 - <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>  
1213 - <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>  
1214 - <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>  
1215 - <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>  
1216 - <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>  
1217 - <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>  
1218 - <if test="personMonth != null "> and person_month = #{personMonth}</if>  
1219 - <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>  
1220 - <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>  
1221 - <if test="revenues != null "> and revenues = #{revenues}</if>  
1222 - <if test="persons != null "> and persons = #{persons}</if>  
1223 - <if test="mileages != null "> and mileages = #{mileages}</if>  
1224 - <if test="personAvg != null "> and person_avg = #{personAvg}</if>  
1225 - <if test="startDate != null "> and start_date > #{startDate}</if>  
1226 - <if test="startReason != null "> and start_reason = #{startReason}</if>  
1227 - <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>  
1228 - </where>  
1229 -  
1230 - group by line_name  
1231 - </select>  
1232 -  
1233 - <select id="getListByName" parameterType="java.lang.String" resultMap="BsthTLineResult">  
1234 - <include refid="selectBsthTLineHistoryVo" />  
1235 - <where>  
1236 - and line_name = #{name}  
1237 - </where>  
1238 - ORDER BY start_date DESC  
1239 - </select>  
1240 -  
1241 - <select id="selectBsthTLineHistoryById" parameterType="Long"  
1242 - resultMap="BsthTLineResult">  
1243 - <include refid="selectBsthTLineHistoryVo" />  
1244 - where id = #{id}  
1245 - </select>  
1246 -  
1247 -  
1248 - <select id="selectBsthTLineHistoryByIds" parameterType="String"  
1249 - resultMap="BsthTLineResult">  
1250 - select * from bsth_t_line_history where id in  
1251 - <foreach item="id" collection="array" open="(" separator=","  
1252 - close=")">  
1253 - #{id}  
1254 - </foreach>  
1255 - </select>  
1256 -  
1257 - <select id="findNeedUpdateHistory" resultMap="BsthTLineResult">  
1258 - select * from  
1259 - bsth_t_line_history where start_date &lt; sysdate() and update_status  
1260 - = "1"  
1261 - </select>  
1262 690
1263 691
1264 - <insert id="saveEditHistory" parameterType="BsthTLine"  
1265 - useGeneratedKeys="true" keyProperty="id">  
1266 - insert into bsth_t_line_history 692 + <insert id="insertBsthTLineExamine" parameterType="BsthTLine"
  693 + useGeneratedKeys="true" keyProperty="id">
  694 + insert into bsth_t_line_examine
1267 <trim prefix="(" suffix=")" suffixOverrides=","> 695 <trim prefix="(" suffix=")" suffixOverrides=",">
1268 <if test="eventId != null">event_id,</if> 696 <if test="eventId != null">event_id,</if>
1269 <if test="lineId != null">line_id,</if> 697 <if test="lineId != null">line_id,</if>
@@ -1295,6 +723,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1295,6 +723,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1295 <if test="timeSchedule != null">time_schedule,</if> 723 <if test="timeSchedule != null">time_schedule,</if>
1296 <if test="park != null">park,</if> 724 <if test="park != null">park,</if>
1297 <if test="isWarrant != null">is_warrant,</if> 725 <if test="isWarrant != null">is_warrant,</if>
  726 + <if test="isWarrantStartTime != null">isWarrant_start_time,</if>
  727 + <if test="isWarrantEndTime != null">isWarrant_end_time,</if>
1298 <if test="roadType != null">road_type,</if> 728 <if test="roadType != null">road_type,</if>
1299 <if test="ticketPrice != null">ticket_price,</if> 729 <if test="ticketPrice != null">ticket_price,</if>
1300 <if test="firstStation != null">first_station,</if> 730 <if test="firstStation != null">first_station,</if>
@@ -1340,9 +770,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1340,9 +770,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1340 <if test="mileages != null">mileages,</if> 770 <if test="mileages != null">mileages,</if>
1341 <if test="personAvg != null">person_avg,</if> 771 <if test="personAvg != null">person_avg,</if>
1342 <if test="startDate != null">start_date,</if> 772 <if test="startDate != null">start_date,</if>
1343 - <if test="startReason != null">start_reason,</if>  
1344 <if test="nightParking != null">night_parking,</if> 773 <if test="nightParking != null">night_parking,</if>
1345 - <if test="updateStatus != null">update_status,</if> 774 + <if test="files != null">files,</if>
  775 + <if test="revenueType != null">revenue_type,</if>
  776 + <if test="examineType != null">examine_type,</if>
  777 + <if test="startReason != null">start_reason,</if>
1346 <if test="lineUpdateType != null">line_update_type,</if> 778 <if test="lineUpdateType != null">line_update_type,</if>
1347 create_time, 779 create_time,
1348 </trim> 780 </trim>
@@ -1377,6 +809,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1377,6 +809,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1377 <if test="timeSchedule != null">#{timeSchedule},</if> 809 <if test="timeSchedule != null">#{timeSchedule},</if>
1378 <if test="park != null">#{park},</if> 810 <if test="park != null">#{park},</if>
1379 <if test="isWarrant != null">#{isWarrant},</if> 811 <if test="isWarrant != null">#{isWarrant},</if>
  812 + <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>
  813 + <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>
1380 <if test="roadType != null">#{roadType},</if> 814 <if test="roadType != null">#{roadType},</if>
1381 <if test="ticketPrice != null">#{ticketPrice},</if> 815 <if test="ticketPrice != null">#{ticketPrice},</if>
1382 <if test="firstStation != null">#{firstStation},</if> 816 <if test="firstStation != null">#{firstStation},</if>
@@ -1422,17 +856,242 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1422,17 +856,242 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1422 <if test="mileages != null">#{mileages},</if> 856 <if test="mileages != null">#{mileages},</if>
1423 <if test="personAvg != null">#{personAvg},</if> 857 <if test="personAvg != null">#{personAvg},</if>
1424 <if test="startDate != null">#{startDate},</if> 858 <if test="startDate != null">#{startDate},</if>
1425 - <if test="startReason != null">#{startReason},</if>  
1426 <if test="nightParking != null">#{nightParking},</if> 859 <if test="nightParking != null">#{nightParking},</if>
1427 - <if test="updateStatus != null">#{updateStatus},</if> 860 + <if test="files != null">#{files},</if>
  861 + <if test="revenueType != null">#{revenueType},</if>
  862 + <if test="examineType != null">#{examineType},</if>
  863 + <if test="startReason != null">#{startReason},</if>
1428 <if test="lineUpdateType != null">#{lineUpdateType},</if> 864 <if test="lineUpdateType != null">#{lineUpdateType},</if>
1429 sysdate(), 865 sysdate(),
1430 </trim> 866 </trim>
1431 </insert> 867 </insert>
1432 868
1433 - <insert id="createLineMonthReport" parameterType="BsthTLine"  
1434 - useGeneratedKeys="true" keyProperty="id">  
1435 - insert into bsth_t_line_report 869 +
  870 +
  871 + <select id="selectBsthTLineExamineById" parameterType="Long"
  872 + resultMap="BsthTLineResult">
  873 + <include refid="selectBsthTLineExamineVo" />
  874 + where id = #{id}
  875 + </select>
  876 +
  877 +
  878 +
  879 + <select id="selectBsthTLineExamineByLineName" parameterType="String"
  880 + resultMap="BsthTLineResult">
  881 + <include refid="selectBsthTLineExamineVo" />
  882 + where line_name= #{lineName}
  883 + </select>
  884 +
  885 +
  886 +
  887 + <update id="updateBsthTLineExamine" parameterType="BsthTLine">
  888 + update bsth_t_line_examine
  889 + <trim prefix="SET" suffixOverrides=",">
  890 + <if test="eventId != null">event_id = #{eventId},</if>
  891 + <if test="lineId != null">line_id = #{lineId},</if>
  892 + <if test="lineName != null">line_name = #{lineName},</if>
  893 + <if test="company != null">company = #{company},</if>
  894 + <if test="fCompany != null">f_company = #{fCompany},</if>
  895 + <if test="pLineId != null">p_line_id = #{pLineId},</if>
  896 + <if test="serviceType != null">service_type = #{serviceType},</if>
  897 + <if test="lineLevel != null">line_level = #{lineLevel},</if>
  898 + <if test="lineType != null">line_type = #{lineType},</if>
  899 + <if test="district != null">district = #{district},</if>
  900 + <if test="inoutDistrict != null">inout_district = #{inoutDistrict},</if>
  901 + <if test="serviceState != null">service_state = #{serviceState},</if>
  902 + <if test="busType != null">bus_type = #{busType},</if>
  903 + <if test="airConditionerType != null">air_conditioner_type = #{airConditionerType},</if>
  904 + <if test="sellTicketType != null">sell_ticket_type = #{sellTicketType},</if>
  905 + <if test="serviceTime != null">service_time = #{serviceTime},</if>
  906 + <if test="lineDistance != null">line_distance = #{lineDistance},</if>
  907 + <if test="lineCode != null">line_code = #{lineCode},</if>
  908 + <if test="warrantYear != null">warrant_year = #{warrantYear},</if>
  909 + <if test="warrantStartTime != null">warrant_start_time = #{warrantStartTime},</if>
  910 + <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
  911 + <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
  912 + <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
  913 + <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
  914 + <if test="remark != null">remark = #{remark},</if>
  915 + <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
  916 + <if test="updateBy != null">update_by = #{updateBy},</if>
  917 + update_time = sysdate(),
  918 + <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
  919 + <if test="park != null">park = #{park},</if>
  920 + <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  921 + <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>
  922 + <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>
  923 + <if test="roadType != null">road_type = #{roadType},</if>
  924 + <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
  925 + <if test="firstStation != null">first_station = #{firstStation},</if>
  926 + <if test="startEnd != null">start_end = #{startEnd},</if>
  927 + <if test="firstTime != null">first_time = #{firstTime},</if>
  928 + <if test="lastStation != null">last_station = #{lastStation},</if>
  929 + <if test="lastTime != null">last_time = #{lastTime},</if>
  930 + <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
  931 + <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
  932 + <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
  933 + <if test="stationUp != null">station_up = #{stationUp},</if>
  934 + <if test="stationDown != null">station_down = #{stationDown},</if>
  935 + <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
  936 + <if test="travelTimeDown != null">travel_time_down = #{travelTimeDown},</if>
  937 + <if test="travelIntervalUp != null">travel_interval_up = #{travelIntervalUp},</if>
  938 + <if test="travelIntervalDown != null">travel_interval_down = #{travelIntervalDown},</if>
  939 + <if test="warrantVehiclesLarge != null">warrant_vehicles_large = #{warrantVehiclesLarge},</if>
  940 + <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle = #{warrantVehiclesMiddle},</if>
  941 + <if test="vehiclesNumber != null">vehicles_number = #{vehiclesNumber},</if>
  942 + <if test="numberVehiclesLarge != null">number_vehicles_large = #{numberVehiclesLarge},</if>
  943 + <if test="numberVehiclesMiddle != null">number_vehicles_middle = #{numberVehiclesMiddle},</if>
  944 + <if test="carPlate != null">car_plate = #{carPlate},</if>
  945 + <if test="numberPerson != null">number_person = #{numberPerson},</if>
  946 + <if test="numberPersonDriver != null">number_person_driver = #{numberPersonDriver},</if>
  947 + <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
  948 + <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
  949 + <if test="directions != null">directions = #{directions},</if>
  950 + <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
  951 + <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
  952 + <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
  953 + <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
  954 + <if test="divideLevel != null">divide_level = #{divideLevel},</if>
  955 + <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
  956 + <if test="isMetro != null">is_metro = #{isMetro},</if>
  957 + <if test="metroTime != null">metro_time = #{metroTime},</if>
  958 + <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
  959 + <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
  960 + <if test="personMonth != null">person_month = #{personMonth},</if>
  961 + <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
  962 + <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
  963 + <if test="revenues != null">revenues = #{revenues},</if>
  964 + <if test="persons != null">persons = #{persons},</if>
  965 + <if test="mileages != null">mileages = #{mileages},</if>
  966 + <if test="personAvg != null">person_avg = #{personAvg},</if>
  967 + <if test="startDate != null">start_date = #{startDate},</if>
  968 + <if test="nightParking != null">night_parking = #{nightParking},</if>
  969 + <if test="files != null">files = #{files},</if>
  970 + <if test="revenueType != null">revenue_type = #{revenueType},</if>
  971 + <if test="examineStatus != null">examine_status = #{examineStatus},</if>
  972 + <if test="startReason != null">start_reason = #{startReason},</if>
  973 + <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
  974 + <if test="startReason != null">start_reason = #{startReason},</if>
  975 + </trim>
  976 + where id = #{id}
  977 + </update>
  978 +
  979 +
  980 +
  981 + <delete id="deleteBsthTLineExamineById" parameterType="String">
  982 + delete from bsth_t_line_examine where id in
  983 + <foreach item="id" collection="array" open="(" separator=","
  984 + close=")">
  985 + #{id}
  986 + </foreach>
  987 + </delete>
  988 +
  989 +
  990 +
  991 + <select id="selectBsthTLineHistoryList"
  992 + parameterType="BsthTLine" resultMap="BsthTLineResult">
  993 + <include refid="selectBsthTLineHistoryVo" />
  994 + <where>
  995 + <if test="eventId != null "> and event_id = #{eventId}</if>
  996 + <if test="lineId != null "> and line_id = #{lineId}</if>
  997 + <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
  998 + <if test="company != null and company != ''"> and company = #{company}</if>
  999 + <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
  1000 + <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
  1001 + <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
  1002 + <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
  1003 + <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
  1004 + <if test="district != null and district != ''"> and district = #{district}</if>
  1005 + <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
  1006 + <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
  1007 + <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
  1008 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
  1009 + <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
  1010 + <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
  1011 + <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
  1012 + <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
  1013 + <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
  1014 + <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
  1015 + <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
  1016 + <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
  1017 + <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
  1018 + <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
  1019 + <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  1020 + <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
  1021 + <if test="park != null and park != ''"> and park = #{park}</if>
  1022 + <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
  1023 + <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
  1024 + <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
  1025 + <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
  1026 + <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
  1027 + <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
  1028 + <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
  1029 + <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
  1030 + <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
  1031 + <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
  1032 + <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
  1033 + <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
  1034 + <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
  1035 + <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
  1036 + <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
  1037 + <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
  1038 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1039 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  1040 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
  1041 + <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
  1042 + <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
  1043 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
  1044 + <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
  1045 + <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
  1046 + <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
  1047 + <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
  1048 + <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
  1049 + <if test="directions != null and directions != ''"> and directions = #{directions}</if>
  1050 + <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
  1051 + <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
  1052 + <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
  1053 + <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
  1054 + <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
  1055 + <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
  1056 + <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
  1057 + <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
  1058 + <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
  1059 + <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
  1060 + <if test="personMonth != null "> and person_month = #{personMonth}</if>
  1061 + <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
  1062 + <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
  1063 + <if test="revenues != null "> and revenues = #{revenues}</if>
  1064 + <if test="persons != null "> and persons = #{persons}</if>
  1065 + <if test="mileages != null "> and mileages = #{mileages}</if>
  1066 + <if test="personAvg != null "> and person_avg = #{personAvg}</if>
  1067 + <if test="startDate != null "> and start_date > #{startDate}</if>
  1068 + <if test="startReason != null "> and start_reason = #{startReason}</if>
  1069 + <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  1070 + and update_status != "0"
  1071 + </where>
  1072 + </select>
  1073 +
  1074 +
  1075 +
  1076 + <select id="selectBsthTLineHistoryById" parameterType="Long"
  1077 + resultMap="BsthTLineResult">
  1078 + <include refid="selectBsthTLineHistoryVo" />
  1079 + where id = #{id}
  1080 + </select>
  1081 +
  1082 + <select id="selectBsthTLineHistoryByIds" parameterType="String"
  1083 + resultMap="BsthTLineResult">
  1084 + select * from bsth_t_line_history where id in
  1085 + <foreach item="id" collection="array" open="(" separator=","
  1086 + close=")">
  1087 + #{id}
  1088 + </foreach>
  1089 + </select>
  1090 +
  1091 +
  1092 + <insert id="saveEditHistory" parameterType="BsthTLine"
  1093 + useGeneratedKeys="true" keyProperty="id">
  1094 + insert into bsth_t_line_history
1436 <trim prefix="(" suffix=")" suffixOverrides=","> 1095 <trim prefix="(" suffix=")" suffixOverrides=",">
1437 <if test="eventId != null">event_id,</if> 1096 <if test="eventId != null">event_id,</if>
1438 <if test="lineId != null">line_id,</if> 1097 <if test="lineId != null">line_id,</if>
@@ -1509,7 +1168,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1509,7 +1168,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1509 <if test="mileages != null">mileages,</if> 1168 <if test="mileages != null">mileages,</if>
1510 <if test="personAvg != null">person_avg,</if> 1169 <if test="personAvg != null">person_avg,</if>
1511 <if test="nightParking != null">night_parking,</if> 1170 <if test="nightParking != null">night_parking,</if>
1512 - <if test="createTime != null">create_time,</if> 1171 + <if test="files != null">files,</if>
  1172 + <if test="startDate != null">start_date,</if>
  1173 + <if test="startReason != null">start_reason,</if>
  1174 + <if test="lineUpdateType != null">line_update_type,</if>
  1175 + <if test="revenueType != null">revenue_type,</if>
  1176 + <if test="updateStatus != null">update_status,</if>
  1177 + create_time,
1513 </trim> 1178 </trim>
1514 <trim prefix="values (" suffix=")" suffixOverrides=","> 1179 <trim prefix="values (" suffix=")" suffixOverrides=",">
1515 <if test="eventId != null">#{eventId},</if> 1180 <if test="eventId != null">#{eventId},</if>
@@ -1587,44 +1252,369 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1587,44 +1252,369 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1587 <if test="mileages != null">#{mileages},</if> 1252 <if test="mileages != null">#{mileages},</if>
1588 <if test="personAvg != null">#{personAvg},</if> 1253 <if test="personAvg != null">#{personAvg},</if>
1589 <if test="nightParking != null">#{nightParking},</if> 1254 <if test="nightParking != null">#{nightParking},</if>
  1255 + <if test="files != null">#{files},</if>
  1256 + <if test="startDate != null">#{startDate},</if>
  1257 + <if test="startReason != null">#{startReason},</if>
  1258 + <if test="lineUpdateType != null">#{lineUpdateType},</if>
  1259 + <if test="revenueType != null">#{revenueType},</if>
  1260 + <if test="updateStatus != null">#{updateStatus},</if>
  1261 + sysdate(),
  1262 + </trim>
  1263 + </insert>
  1264 +
  1265 +
  1266 + <update id="updateBsthTLineHistory" parameterType="BsthTLine">
  1267 + update bsth_t_line_history
  1268 + <trim prefix="SET" suffixOverrides=",">
  1269 + <if test="eventId != null">event_id = #{eventId},</if>
  1270 + <if test="lineId != null">line_id = #{lineId},</if>
  1271 + <if test="lineName != null">line_name = #{lineName},</if>
  1272 + <if test="company != null">company = #{company},</if>
  1273 + <if test="fCompany != null">f_company = #{fCompany},</if>
  1274 + <if test="pLineId != null">p_line_id = #{pLineId},</if>
  1275 + <if test="serviceType != null">service_type = #{serviceType},</if>
  1276 + <if test="lineLevel != null">line_level = #{lineLevel},</if>
  1277 + <if test="lineType != null">line_type = #{lineType},</if>
  1278 + <if test="district != null">district = #{district},</if>
  1279 + <if test="inoutDistrict != null">inout_district = #{inoutDistrict},</if>
  1280 + <if test="serviceState != null">service_state = #{serviceState},</if>
  1281 + <if test="busType != null">bus_type = #{busType},</if>
  1282 + <if test="airConditionerType != null">air_conditioner_type = #{airConditionerType},</if>
  1283 + <if test="sellTicketType != null">sell_ticket_type = #{sellTicketType},</if>
  1284 + <if test="serviceTime != null">service_time = #{serviceTime},</if>
  1285 + <if test="lineDistance != null">line_distance = #{lineDistance},</if>
  1286 + <if test="lineCode != null">line_code = #{lineCode},</if>
  1287 + <if test="warrantYear != null">warrant_year = #{warrantYear},</if>
  1288 + <if test="warrantStartTime != null">warrant_start_time = #{warrantStartTime},</if>
  1289 + <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>
  1290 + <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>
  1291 + <if test="cancelTime != null">cancel_time = #{cancelTime},</if>
  1292 + <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
  1293 + <if test="remark != null">remark = #{remark},</if>
  1294 + <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>
  1295 + <if test="updateBy != null">update_by = #{updateBy},</if>
  1296 + update_time = sysdate(),
  1297 + <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>
  1298 + <if test="park != null">park = #{park},</if>
  1299 + <if test="isWarrant != null">is_warrant = #{isWarrant},</if>
  1300 + <if test="roadType != null">road_type = #{roadType},</if>
  1301 + <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>
  1302 + <if test="firstStation != null">first_station = #{firstStation},</if>
  1303 + <if test="startEnd != null">start_end = #{startEnd},</if>
  1304 + <if test="firstTime != null">first_time = #{firstTime},</if>
  1305 + <if test="lastStation != null">last_station = #{lastStation},</if>
  1306 + <if test="lastTime != null">last_time = #{lastTime},</if>
  1307 + <if test="mileageUp != null">mileage_up = #{mileageUp},</if>
  1308 + <if test="mileageDown != null">mileage_down = #{mileageDown},</if>
  1309 + <if test="averageMileage != null">average_mileage = #{averageMileage},</if>
  1310 + <if test="stationUp != null">station_up = #{stationUp},</if>
  1311 + <if test="stationDown != null">station_down = #{stationDown},</if>
  1312 + <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>
  1313 + <if test="travelTimeDown != null">travel_time_down = #{travelTimeDown},</if>
  1314 + <if test="travelIntervalUp != null">travel_interval_up = #{travelIntervalUp},</if>
  1315 + <if test="travelIntervalDown != null">travel_interval_down = #{travelIntervalDown},</if>
  1316 + <if test="warrantVehiclesLarge != null">warrant_vehicles_large = #{warrantVehiclesLarge},</if>
  1317 + <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle = #{warrantVehiclesMiddle},</if>
  1318 + <if test="vehiclesNumber != null">vehicles_number = #{vehiclesNumber},</if>
  1319 + <if test="numberVehiclesLarge != null">number_vehicles_large = #{numberVehiclesLarge},</if>
  1320 + <if test="numberVehiclesMiddle != null">number_vehicles_middle = #{numberVehiclesMiddle},</if>
  1321 + <if test="carPlate != null">car_plate = #{carPlate},</if>
  1322 + <if test="numberPerson != null">number_person = #{numberPerson},</if>
  1323 + <if test="numberPersonDriver != null">number_person_driver = #{numberPersonDriver},</if>
  1324 + <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>
  1325 + <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>
  1326 + <if test="directions != null">directions = #{directions},</if>
  1327 + <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>
  1328 + <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>
  1329 + <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>
  1330 + <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>
  1331 + <if test="divideLevel != null">divide_level = #{divideLevel},</if>
  1332 + <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>
  1333 + <if test="isMetro != null">is_metro = #{isMetro},</if>
  1334 + <if test="metroTime != null">metro_time = #{metroTime},</if>
  1335 + <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>
  1336 + <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>
  1337 + <if test="personMonth != null">person_month = #{personMonth},</if>
  1338 + <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>
  1339 + <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>
  1340 + <if test="revenues != null">revenues = #{revenues},</if>
  1341 + <if test="persons != null">persons = #{persons},</if>
  1342 + <if test="mileages != null">mileages = #{mileages},</if>
  1343 + <if test="personAvg != null">person_avg = #{personAvg},</if>
  1344 + <if test="nightParking != null">night_parking = #{nightParking},</if>
  1345 + <if test="files != null">files = #{files},</if>
  1346 + <if test="startDate != null">start_date = #{startDate},</if>
  1347 + <if test="startReason != null ">start_reason = #{startReason},</if>
  1348 + <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
  1349 + <if test="revenueType != null">revenue_type = #{revenueType},</if>
  1350 + <if test="updateStatus != null ">update_status = #{updateStatus},</if>
  1351 + </trim>
  1352 + where id = #{id}
  1353 + </update>
  1354 +
  1355 + <select id="selectBsthTLineHistoryAndisNeedUpdate"
  1356 + parameterType="BsthTLine" resultMap="BsthTLineResult">
  1357 + <include refid="selectBsthTLineHistoryVo" />
  1358 + <where>
  1359 + <if test="eventId != null "> and event_id = #{eventId}</if>
  1360 + <if test="lineId != null "> and line_id = #{lineId}</if>
  1361 + <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
  1362 + <if test="company != null and company != ''"> and company = #{company}</if>
  1363 + <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
  1364 + <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
  1365 + <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
  1366 + <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
  1367 + <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
  1368 + <if test="district != null and district != ''"> and district = #{district}</if>
  1369 + <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
  1370 + <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
  1371 + <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
  1372 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
  1373 + <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
  1374 + <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
  1375 + <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
  1376 + <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
  1377 + <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
  1378 + <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
  1379 + <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
  1380 + <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
  1381 + <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
  1382 + <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
  1383 + <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  1384 + <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
  1385 + <if test="park != null and park != ''"> and park = #{park}</if>
  1386 + <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
  1387 + <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
  1388 + <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
  1389 + <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
  1390 + <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
  1391 + <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
  1392 + <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
  1393 + <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
  1394 + <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
  1395 + <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
  1396 + <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
  1397 + <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
  1398 + <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
  1399 + <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
  1400 + <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
  1401 + <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
  1402 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1403 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  1404 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
  1405 + <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
  1406 + <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
  1407 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
  1408 + <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
  1409 + <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
  1410 + <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
  1411 + <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
  1412 + <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
  1413 + <if test="directions != null and directions != ''"> and directions = #{directions}</if>
  1414 + <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
  1415 + <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
  1416 + <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
  1417 + <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
  1418 + <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
  1419 + <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
  1420 + <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
  1421 + <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
  1422 + <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
  1423 + <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
  1424 + <if test="personMonth != null "> and person_month = #{personMonth}</if>
  1425 + <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
  1426 + <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
  1427 + <if test="revenues != null "> and revenues = #{revenues}</if>
  1428 + <if test="persons != null "> and persons = #{persons}</if>
  1429 + <if test="mileages != null "> and mileages = #{mileages}</if>
  1430 + <if test="personAvg != null "> and person_avg = #{personAvg}</if>
  1431 + <if test="startDate != null "> and start_date = #{startDate}</if>
  1432 + <if test="startReason != null "> and start_reason = #{startReason}</if>
  1433 + <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  1434 + and update_status != "-1"
  1435 + </where>
  1436 + </select>
  1437 +
  1438 +
  1439 + <select id="findNeedUpdateHistory" resultMap="BsthTLineResult">
  1440 + select * from
  1441 + bsth_t_line_history where start_date &lt; sysdate() and update_status
  1442 + = "1"
  1443 + </select>
  1444 +
  1445 +
  1446 + <select id="historyIsExist" parameterType="String"
  1447 + resultMap="BsthTLineResult">
  1448 + <include refid="selectBsthTLineHistoryVo" />
  1449 + where line_name= #{lineName} and update_status='0'
  1450 + </select>
  1451 +
  1452 +
  1453 + <insert id="insertLineEditRepot" parameterType="LineEditReport"
  1454 + useGeneratedKeys="true" keyProperty="id">
  1455 + insert into bsth_t_line_history_report
  1456 + <trim prefix="(" suffix=")" suffixOverrides=",">
  1457 + <if test="lineName != null">line_name,</if>
  1458 + <if test="company != null">company,</if>
  1459 + <if test="lineDistance != null">line_distance,</if>
  1460 + <if test="startEnd != null">start_end,</if>
  1461 + <if test="vehiclesNumber != null">vehicles_number,</if>
  1462 + <if test="numberPerson != null">number_person,</if>
  1463 + <if test="lineDistanceBefore != null">line_distance_before,</if>
  1464 + <if test="startEndBefore != null">start_end_before,</if>
  1465 + <if test="vehiclesNumberBefore != null">vehicles_number_before,</if>
  1466 + <if test="numberPersonBefore != null">number_person_before,</if>
  1467 + <if test="createTime != null">create_time,</if>
  1468 + <if test="startDate != null">start_date,</if>
  1469 + <if test="lineUpdateType != null">line_update_type,</if>
  1470 + </trim>
  1471 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  1472 + <if test="lineName != null">#{lineName},</if>
  1473 + <if test="company != null">#{company},</if>
  1474 + <if test="lineDistance != null">#{lineDistance},</if>
  1475 + <if test="startEnd != null">#{startEnd},</if>
  1476 + <if test="vehiclesNumber != null">#{vehiclesNumber},</if>
  1477 + <if test="numberPerson != null">#{numberPerson},</if>
  1478 + <if test="lineDistanceBefore != null">#{lineDistanceBefore},</if>
  1479 + <if test="startEndBefore != null">#{startEndBefore},</if>
  1480 + <if test="vehiclesNumberBefore != null">#{vehiclesNumberBefore},</if>
  1481 + <if test="numberPersonBefore != null">#{numberPersonBefore},</if>
1590 <if test="createTime != null">#{createTime},</if> 1482 <if test="createTime != null">#{createTime},</if>
  1483 + <if test="startDate != null">#{startDate},</if>
  1484 + <if test="lineUpdateType != null">#{lineUpdateType},</if>
1591 </trim> 1485 </trim>
1592 </insert> 1486 </insert>
1593 1487
1594 1488
  1489 + <select id="selectLineEditReportList" parameterType="LineEditReport"
  1490 + resultMap="LineEditReportResult">
  1491 + <include refid="selectLineEditReportVo" />
  1492 + <where>
  1493 + <if test="lineName != null and lineName != ''">and line_name like concat('%', #{lineName}, '%') </if>
  1494 + <if test="company != null and company != ''">and company = #{company}</if>
  1495 + <if test="lineDistance != null and lineDistance != ''">and line_distance = #{lineDistance}</if>
  1496 + <if test="startEnd != null and startEnd != ''">and start_end = #{startEnd}</if>
  1497 + <if test="vehiclesNumber != null and vehiclesNumber != ''">and vehicles_number = #{vehiclesNumber}</if>
  1498 + <if test="numberPerson != null and numberPerson != ''">and number_person = #{numberPerson}</if>
  1499 + <if test="lineDistanceBefore != null and lineDistanceBefore != ''">and line_distance_before = #{lineDistanceBefore}</if>
  1500 + <if test="startEndBefore != null and startEndBefore != ''">and start_end_before = #{startEndBefore}</if>
  1501 + <if test="vehiclesNumberBefore != null and vehiclesNumberBefore != ''">and vehicles_number_before = #{vehiclesNumberBefore}</if>
  1502 + <if test="numberPersonBefore != null and numberPersonBefore != ''">and number_person_before = #{numberPersonBefore}</if>
  1503 + <if test="createTime != null ">and create_time = #{createTime}</if>
  1504 + <if test="startDate != null ">and start_date > STR_TO_DATE(CONCAT(#{startDate},"-01"),"%Y-%m-%d")</if>
  1505 + <if test="startDate == null ">and start_date > DATE_FORMAT(sysdate(),"%Y-%m-01")</if>
  1506 + <if test="lineUpdateType != null and lineUpdateType != ''" >and line_update_type = #{lineUpdateType}</if>
  1507 + </where>
  1508 + </select>
  1509 +
  1510 +
  1511 + <select id="selectBsthTLineHistoryListGroupByLineName" parameterType="BsthTLine" resultMap="BsthTLineResult">
  1512 + <include refid="selectBsthTLineHistoryVo" />
  1513 + <where>
  1514 + <if test="eventId != null "> and event_id = #{eventId}</if>
  1515 + <if test="lineId != null "> and line_id = #{lineId}</if>
  1516 + <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
  1517 + <if test="company != null and company != ''"> and company = #{company}</if>
  1518 + <if test="fCompany != null and fCompany != ''"> and f_company = #{fCompany}</if>
  1519 + <if test="pLineId != null "> and p_line_id = #{pLineId}</if>
  1520 + <if test="serviceType != null and serviceType != ''"> and service_type = #{serviceType}</if>
  1521 + <if test="lineLevel != null and lineLevel != ''"> and line_level = #{lineLevel}</if>
  1522 + <if test="lineType != null and lineType != ''"> and line_type = #{lineType}</if>
  1523 + <if test="district != null and district != ''"> and district = #{district}</if>
  1524 + <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
  1525 + <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
  1526 + <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
  1527 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
  1528 + <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
  1529 + <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
  1530 + <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
  1531 + <if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
  1532 + <if test="warrantYear != null "> and warrant_year = #{warrantYear}</if>
  1533 + <if test="warrantStartTime != null "> and warrant_start_time = #{warrantStartTime}</if>
  1534 + <if test="warrantEndTime != null "> and warrant_end_time = #{warrantEndTime}</if>
  1535 + <if test="planCancelTime != null "> and plan_cancel_time = #{planCancelTime}</if>
  1536 + <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
  1537 + <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
  1538 + <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
  1539 + <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
  1540 + <if test="park != null and park != ''"> and park = #{park}</if>
  1541 + <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
  1542 + <if test="roadType != null and roadType != ''"> and road_type = #{roadType}</if>
  1543 + <if test="ticketPrice != null and ticketPrice != ''"> and ticket_price = #{ticketPrice}</if>
  1544 + <if test="firstStation != null and firstStation != ''"> and first_station = #{firstStation}</if>
  1545 + <if test="startEnd != null and startEnd != ''"> and start_end = #{startEnd}</if>
  1546 + <if test="firstTime != null and firstTime != ''"> and first_time = #{firstTime}</if>
  1547 + <if test="lastStation != null and lastStation != ''"> and last_station = #{lastStation}</if>
  1548 + <if test="lastTime != null and lastTime != ''"> and last_time = #{lastTime}</if>
  1549 + <if test="mileageUp != null and mileageUp != ''"> and mileage_up = #{mileageUp}</if>
  1550 + <if test="mileageDown != null and mileageDown != ''"> and mileage_down = #{mileageDown}</if>
  1551 + <if test="averageMileage != null and averageMileage != ''"> and average_mileage = #{averageMileage}</if>
  1552 + <if test="stationUp != null and stationUp != ''"> and station_up = #{stationUp}</if>
  1553 + <if test="stationDown != null and stationDown != ''"> and station_down = #{stationDown}</if>
  1554 + <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
  1555 + <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
  1556 + <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
  1557 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1558 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  1559 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
  1560 + <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
  1561 + <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
  1562 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
  1563 + <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
  1564 + <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
  1565 + <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
  1566 + <if test="numberPersonSales != null "> and number_person_sales = #{numberPersonSales}</if>
  1567 + <if test="busEvNumber != null "> and bus_ev_number = #{busEvNumber}</if>
  1568 + <if test="directions != null and directions != ''"> and directions = #{directions}</if>
  1569 + <if test="numberOfManage != null and numberOfManage != ''"> and number_of_manage = #{numberOfManage}</if>
  1570 + <if test="halfwayStation != null and halfwayStation != ''"> and halfway_station = #{halfwayStation}</if>
  1571 + <if test="fullCustomerPercent != null "> and full_customer_percent = #{fullCustomerPercent}</if>
  1572 + <if test="lowCustomerPercent != null "> and low_customer_percent = #{lowCustomerPercent}</if>
  1573 + <if test="divideLevel != null and divideLevel != ''"> and divide_level = #{divideLevel}</if>
  1574 + <if test="hasTimelists != null and hasTimelists != ''"> and has_timelists = #{hasTimelists}</if>
  1575 + <if test="isMetro != null and isMetro != ''"> and is_metro = #{isMetro}</if>
  1576 + <if test="metroTime != null and metroTime != ''"> and metro_time = #{metroTime}</if>
  1577 + <if test="coldBonusType != null and coldBonusType != ''"> and cold_bonus_type = #{coldBonusType}</if>
  1578 + <if test="revenuesMonth != null "> and revenues_month = #{revenuesMonth}</if>
  1579 + <if test="personMonth != null "> and person_month = #{personMonth}</if>
  1580 + <if test="mileageMonth != null "> and mileage_month = #{mileageMonth}</if>
  1581 + <if test="personMonthAvg != null "> and person_month_avg = #{personMonthAvg}</if>
  1582 + <if test="revenues != null "> and revenues = #{revenues}</if>
  1583 + <if test="persons != null "> and persons = #{persons}</if>
  1584 + <if test="mileages != null "> and mileages = #{mileages}</if>
  1585 + <if test="personAvg != null "> and person_avg = #{personAvg}</if>
  1586 + <if test="startDate != null "> and start_date > #{startDate}</if>
  1587 + <if test="startReason != null "> and start_reason = #{startReason}</if>
  1588 + <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
  1589 + </where>
  1590 + group by line_name
  1591 + </select>
  1592 +
  1593 +
  1594 + <select id="getListByName" parameterType="java.lang.String" resultMap="BsthTLineResult">
  1595 + <include refid="selectBsthTLineHistoryVo" />
  1596 + <where>
  1597 + and line_name = #{name}
  1598 + </where>
  1599 + ORDER BY start_date DESC
  1600 + </select>
1595 1601
1596 1602
1597 1603
1598 1604
1599 1605
1600 1606
1601 - <sql id="selectBsthTLineExamineVo">  
1602 - select id, event_id, line_id, line_name, company,  
1603 - f_company, p_line_id,  
1604 - service_type, line_level, line_type, district,  
1605 - inout_district,  
1606 - service_state, bus_type, air_conditioner_type,  
1607 - sell_ticket_type,  
1608 - service_time, line_distance, line_code, warrant_year,  
1609 - warrant_start_time, warrant_end_time, plan_cancel_time, cancel_time,  
1610 - cancel_reason, remark, is_logic_delete, create_time, update_by,  
1611 - update_time, create_by, time_schedule, park, is_warrant,isWarrant_start_time,isWarrant_end_time, road_type,  
1612 - ticket_price, first_station, start_end, first_time, last_station,  
1613 - last_time, mileage_up, mileage_down, average_mileage, station_up,  
1614 - station_down, travel_time_up, travel_time_down, travel_interval_up,  
1615 - travel_interval_down, warrant_vehicles_large, warrant_vehicles_middle,  
1616 - vehicles_number, number_vehicles_large, number_vehicles_middle,  
1617 - car_plate, number_person, number_person_driver, number_person_sales,  
1618 - bus_ev_number, directions, number_of_manage, halfway_station,  
1619 - full_customer_percent, low_customer_percent, divide_level,  
1620 - has_timelists, is_metro, metro_time, cold_bonus_type, revenues_month,  
1621 - person_month, mileage_month, person_month_avg, revenues, persons,  
1622 - mileages, person_avg, start_date,night_parking,files,revenue_type,examine_status,examine_type,start_reason,line_update_type from bsth_t_line_examine  
1623 - </sql>  
1624 1607
1625 - <select id="selectBsthTLineExamineList" parameterType="BsthTLine"  
1626 - resultMap="BsthTLineResult">  
1627 - <include refid="selectBsthTLineExamineVo" /> 1608 +
  1609 +
  1610 +
  1611 +
  1612 +
  1613 +
  1614 +
  1615 + <select id="selectHistoryListNotUpdate"
  1616 + parameterType="BsthTLine" resultMap="BsthTLineResult">
  1617 + <include refid="selectBsthTLineHistoryVo" />
1628 <where> 1618 <where>
1629 <if test="eventId != null "> and event_id = #{eventId}</if> 1619 <if test="eventId != null "> and event_id = #{eventId}</if>
1630 <if test="lineId != null "> and line_id = #{lineId}</if> 1620 <if test="lineId != null "> and line_id = #{lineId}</if>
@@ -1639,8 +1629,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1639,8 +1629,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1639 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if> 1629 <if test="inoutDistrict != null and inoutDistrict != ''"> and inout_district = #{inoutDistrict}</if>
1640 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if> 1630 <if test="serviceState != null and serviceState != ''"> and service_state = #{serviceState}</if>
1641 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if> 1631 <if test="busType != null and busType != ''"> and bus_type = #{busType}</if>
1642 - <if  
1643 - test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if> 1632 + <if test="airConditionerType != null and airConditionerType != ''"> and air_conditioner_type = #{airConditionerType}</if>
1644 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if> 1633 <if test="sellTicketType != null and sellTicketType != ''"> and sell_ticket_type = #{sellTicketType}</if>
1645 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if> 1634 <if test="serviceTime != null and serviceTime != ''"> and service_time = #{serviceTime}</if>
1646 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if> 1635 <if test="lineDistance != null "> and line_distance = #{lineDistance}</if>
@@ -1652,8 +1641,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1652,8 +1641,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1652 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if> 1641 <if test="cancelTime != null "> and cancel_time = #{cancelTime}</if>
1653 <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if> 1642 <if test="cancelReason != null and cancelReason != ''"> and cancel_reason = #{cancelReason}</if>
1654 <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if> 1643 <if test="isLogicDelete != null and isLogicDelete != ''"> and is_logic_delete = #{isLogicDelete}</if>
1655 - <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>  
1656 - <if test="updateTime != null "> and update_time = #{updateTime}</if>  
1657 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if> 1644 <if test="timeSchedule != null "> and time_schedule = #{timeSchedule}</if>
1658 <if test="park != null and park != ''"> and park = #{park}</if> 1645 <if test="park != null and park != ''"> and park = #{park}</if>
1659 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if> 1646 <if test="isWarrant != null and isWarrant != ''"> and is_warrant = #{isWarrant}</if>
@@ -1672,16 +1659,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1672,16 +1659,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1672 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if> 1659 <if test="travelTimeUp != null and travelTimeUp != ''"> and travel_time_up = #{travelTimeUp}</if>
1673 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if> 1660 <if test="travelTimeDown != null and travelTimeDown != ''"> and travel_time_down = #{travelTimeDown}</if>
1674 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if> 1661 <if test="travelIntervalUp != null and travelIntervalUp != ''"> and travel_interval_up = #{travelIntervalUp}</if>
1675 - <if  
1676 - test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>  
1677 - <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}  
1678 - </if>  
1679 - <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}  
1680 - </if> 1662 + <if test="travelIntervalDown != null and travelIntervalDown != ''"> and travel_interval_down = #{travelIntervalDown}</if>
  1663 + <if test="warrantVehiclesLarge != null "> and warrant_vehicles_large = #{warrantVehiclesLarge}</if>
  1664 + <if test="warrantVehiclesMiddle != null "> and warrant_vehicles_middle = #{warrantVehiclesMiddle}</if>
1681 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if> 1665 <if test="vehiclesNumber != null "> and vehicles_number = #{vehiclesNumber}</if>
1682 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if> 1666 <if test="numberVehiclesLarge != null "> and number_vehicles_large = #{numberVehiclesLarge}</if>
1683 - <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}  
1684 - </if> 1667 + <if test="numberVehiclesMiddle != null "> and number_vehicles_middle = #{numberVehiclesMiddle}</if>
1685 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if> 1668 <if test="carPlate != null and carPlate != ''"> and car_plate = #{carPlate}</if>
1686 <if test="numberPerson != null "> and number_person = #{numberPerson}</if> 1669 <if test="numberPerson != null "> and number_person = #{numberPerson}</if>
1687 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if> 1670 <if test="numberPersonDriver != null "> and number_person_driver = #{numberPersonDriver}</if>
@@ -1706,17 +1689,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1706,17 +1689,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1706 <if test="mileages != null "> and mileages = #{mileages}</if> 1689 <if test="mileages != null "> and mileages = #{mileages}</if>
1707 <if test="personAvg != null "> and person_avg = #{personAvg}</if> 1690 <if test="personAvg != null "> and person_avg = #{personAvg}</if>
1708 <if test="startDate != null "> and start_date = #{startDate}</if> 1691 <if test="startDate != null "> and start_date = #{startDate}</if>
  1692 + <if test="startReason != null "> and start_reason = #{startReason}</if>
1709 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if> 1693 <if test="nightParking != null and nightParking != ''"> and night_parking = #{nightParking}</if>
1710 - <if test="examineStatus == 'true' "> and examine_status in(0,1)</if>  
1711 - <if test="examineStatus == 'false' "> and examine_status =2</if>  
1712 - <if test="examineType != null and examineType != ''"> and examine_type = #{examineType}</if> 1694 + and update_status = "1"
1713 </where> 1695 </where>
1714 </select> 1696 </select>
1715 1697
1716 1698
1717 - <insert id="insertBsthTLineExamine" parameterType="BsthTLine" 1699 +
  1700 +<!--
  1701 + <insert id="createLineMonthReport" parameterType="BsthTLine"
1718 useGeneratedKeys="true" keyProperty="id"> 1702 useGeneratedKeys="true" keyProperty="id">
1719 - insert into bsth_t_line_examine 1703 + insert into bsth_t_line_report
1720 <trim prefix="(" suffix=")" suffixOverrides=","> 1704 <trim prefix="(" suffix=")" suffixOverrides=",">
1721 <if test="eventId != null">event_id,</if> 1705 <if test="eventId != null">event_id,</if>
1722 <if test="lineId != null">line_id,</if> 1706 <if test="lineId != null">line_id,</if>
@@ -1748,8 +1732,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1748,8 +1732,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1748 <if test="timeSchedule != null">time_schedule,</if> 1732 <if test="timeSchedule != null">time_schedule,</if>
1749 <if test="park != null">park,</if> 1733 <if test="park != null">park,</if>
1750 <if test="isWarrant != null">is_warrant,</if> 1734 <if test="isWarrant != null">is_warrant,</if>
1751 - <if test="isWarrantStartTime != null">isWarrant_start_time,</if>  
1752 - <if test="isWarrantEndTime != null">isWarrant_end_time,</if>  
1753 <if test="roadType != null">road_type,</if> 1735 <if test="roadType != null">road_type,</if>
1754 <if test="ticketPrice != null">ticket_price,</if> 1736 <if test="ticketPrice != null">ticket_price,</if>
1755 <if test="firstStation != null">first_station,</if> 1737 <if test="firstStation != null">first_station,</if>
@@ -1794,14 +1776,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1794,14 +1776,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1794 <if test="persons != null">persons,</if> 1776 <if test="persons != null">persons,</if>
1795 <if test="mileages != null">mileages,</if> 1777 <if test="mileages != null">mileages,</if>
1796 <if test="personAvg != null">person_avg,</if> 1778 <if test="personAvg != null">person_avg,</if>
1797 - <if test="startDate != null">start_date,</if>  
1798 <if test="nightParking != null">night_parking,</if> 1779 <if test="nightParking != null">night_parking,</if>
1799 - <if test="files != null">files,</if>  
1800 - <if test="revenueType != null">revenue_type,</if>  
1801 - <if test="examineType != null">examine_type,</if>  
1802 - <if test="startReason != null">start_reason,</if>  
1803 - <if test="lineUpdateType != null">line_update_type,</if>  
1804 - create_time, 1780 + <if test="createTime != null">create_time,</if>
1805 </trim> 1781 </trim>
1806 <trim prefix="values (" suffix=")" suffixOverrides=","> 1782 <trim prefix="values (" suffix=")" suffixOverrides=",">
1807 <if test="eventId != null">#{eventId},</if> 1783 <if test="eventId != null">#{eventId},</if>
@@ -1834,8 +1810,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1834,8 +1810,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1834 <if test="timeSchedule != null">#{timeSchedule},</if> 1810 <if test="timeSchedule != null">#{timeSchedule},</if>
1835 <if test="park != null">#{park},</if> 1811 <if test="park != null">#{park},</if>
1836 <if test="isWarrant != null">#{isWarrant},</if> 1812 <if test="isWarrant != null">#{isWarrant},</if>
1837 - <if test="isWarrantStartTime != null">#{isWarrantStartTime},</if>  
1838 - <if test="isWarrantEndTime != null">#{isWarrantEndTime},</if>  
1839 <if test="roadType != null">#{roadType},</if> 1813 <if test="roadType != null">#{roadType},</if>
1840 <if test="ticketPrice != null">#{ticketPrice},</if> 1814 <if test="ticketPrice != null">#{ticketPrice},</if>
1841 <if test="firstStation != null">#{firstStation},</if> 1815 <if test="firstStation != null">#{firstStation},</if>
@@ -1880,135 +1854,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1880,135 +1854,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1880 <if test="persons != null">#{persons},</if> 1854 <if test="persons != null">#{persons},</if>
1881 <if test="mileages != null">#{mileages},</if> 1855 <if test="mileages != null">#{mileages},</if>
1882 <if test="personAvg != null">#{personAvg},</if> 1856 <if test="personAvg != null">#{personAvg},</if>
1883 - <if test="startDate != null">#{startDate},</if>  
1884 <if test="nightParking != null">#{nightParking},</if> 1857 <if test="nightParking != null">#{nightParking},</if>
1885 - <if test="files != null">#{files},</if>  
1886 - <if test="revenueType != null">#{revenueType},</if>  
1887 - <if test="examineType != null">#{examineType},</if>  
1888 - <if test="startReason != null">#{startReason},</if>  
1889 - <if test="lineUpdateType != null">#{lineUpdateType},</if>  
1890 - sysdate(),  
1891 - </trim>  
1892 - </insert>  
1893 -  
1894 - <select id="selectBsthTLineExamineById" parameterType="Long"  
1895 - resultMap="BsthTLineResult">  
1896 - <include refid="selectBsthTLineExamineVo" />  
1897 - where id = #{id}  
1898 - </select>  
1899 -  
1900 -  
1901 - <update id="updateBsthTLineExamine" parameterType="BsthTLine">  
1902 - update bsth_t_line_examine  
1903 - <trim prefix="SET" suffixOverrides=",">  
1904 - <if test="eventId != null">event_id = #{eventId},</if>  
1905 - <if test="lineId != null">line_id = #{lineId},</if>  
1906 - <if test="lineName != null">line_name = #{lineName},</if>  
1907 - <if test="company != null">company = #{company},</if>  
1908 - <if test="fCompany != null">f_company = #{fCompany},</if>  
1909 - <if test="pLineId != null">p_line_id = #{pLineId},</if>  
1910 - <if test="serviceType != null">service_type = #{serviceType},</if>  
1911 - <if test="lineLevel != null">line_level = #{lineLevel},</if>  
1912 - <if test="lineType != null">line_type = #{lineType},</if>  
1913 - <if test="district != null">district = #{district},</if>  
1914 - <if test="inoutDistrict != null">inout_district = #{inoutDistrict},</if>  
1915 - <if test="serviceState != null">service_state = #{serviceState},</if>  
1916 - <if test="busType != null">bus_type = #{busType},</if>  
1917 - <if test="airConditionerType != null">air_conditioner_type = #{airConditionerType},</if>  
1918 - <if test="sellTicketType != null">sell_ticket_type = #{sellTicketType},</if>  
1919 - <if test="serviceTime != null">service_time = #{serviceTime},</if>  
1920 - <if test="lineDistance != null">line_distance = #{lineDistance},</if>  
1921 - <if test="lineCode != null">line_code = #{lineCode},</if>  
1922 - <if test="warrantYear != null">warrant_year = #{warrantYear},</if>  
1923 - <if test="warrantStartTime != null">warrant_start_time = #{warrantStartTime},</if>  
1924 - <if test="warrantEndTime != null">warrant_end_time = #{warrantEndTime},</if>  
1925 - <if test="planCancelTime != null">plan_cancel_time = #{planCancelTime},</if>  
1926 - <if test="cancelTime != null">cancel_time = #{cancelTime},</if>  
1927 - <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>  
1928 - <if test="remark != null">remark = #{remark},</if>  
1929 - <if test="isLogicDelete != null">is_logic_delete = #{isLogicDelete},</if>  
1930 - <if test="updateBy != null">update_by = #{updateBy},</if>  
1931 - update_time = sysdate(),  
1932 - <if test="timeSchedule != null">time_schedule = #{timeSchedule},</if>  
1933 - <if test="park != null">park = #{park},</if>  
1934 - <if test="isWarrant != null">is_warrant = #{isWarrant},</if>  
1935 - <if test="isWarrantStartTime != null">isWarrant_start_time = #{isWarrantStartTime},</if>  
1936 - <if test="isWarrantEndTime != null">isWarrant_end_time = #{isWarrantEndTime},</if>  
1937 - <if test="roadType != null">road_type = #{roadType},</if>  
1938 - <if test="ticketPrice != null">ticket_price = #{ticketPrice},</if>  
1939 - <if test="firstStation != null">first_station = #{firstStation},</if>  
1940 - <if test="startEnd != null">start_end = #{startEnd},</if>  
1941 - <if test="firstTime != null">first_time = #{firstTime},</if>  
1942 - <if test="lastStation != null">last_station = #{lastStation},</if>  
1943 - <if test="lastTime != null">last_time = #{lastTime},</if>  
1944 - <if test="mileageUp != null">mileage_up = #{mileageUp},</if>  
1945 - <if test="mileageDown != null">mileage_down = #{mileageDown},</if>  
1946 - <if test="averageMileage != null">average_mileage = #{averageMileage},</if>  
1947 - <if test="stationUp != null">station_up = #{stationUp},</if>  
1948 - <if test="stationDown != null">station_down = #{stationDown},</if>  
1949 - <if test="travelTimeUp != null">travel_time_up = #{travelTimeUp},</if>  
1950 - <if test="travelTimeDown != null">travel_time_down = #{travelTimeDown},</if>  
1951 - <if test="travelIntervalUp != null">travel_interval_up = #{travelIntervalUp},</if>  
1952 - <if test="travelIntervalDown != null">travel_interval_down = #{travelIntervalDown},</if>  
1953 - <if test="warrantVehiclesLarge != null">warrant_vehicles_large = #{warrantVehiclesLarge},</if>  
1954 - <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle = #{warrantVehiclesMiddle},</if>  
1955 - <if test="vehiclesNumber != null">vehicles_number = #{vehiclesNumber},</if>  
1956 - <if test="numberVehiclesLarge != null">number_vehicles_large = #{numberVehiclesLarge},</if>  
1957 - <if test="numberVehiclesMiddle != null">number_vehicles_middle = #{numberVehiclesMiddle},</if>  
1958 - <if test="carPlate != null">car_plate = #{carPlate},</if>  
1959 - <if test="numberPerson != null">number_person = #{numberPerson},</if>  
1960 - <if test="numberPersonDriver != null">number_person_driver = #{numberPersonDriver},</if>  
1961 - <if test="numberPersonSales != null">number_person_sales = #{numberPersonSales},</if>  
1962 - <if test="busEvNumber != null">bus_ev_number = #{busEvNumber},</if>  
1963 - <if test="directions != null">directions = #{directions},</if>  
1964 - <if test="numberOfManage != null">number_of_manage = #{numberOfManage},</if>  
1965 - <if test="halfwayStation != null">halfway_station = #{halfwayStation},</if>  
1966 - <if test="fullCustomerPercent != null">full_customer_percent = #{fullCustomerPercent},</if>  
1967 - <if test="lowCustomerPercent != null">low_customer_percent = #{lowCustomerPercent},</if>  
1968 - <if test="divideLevel != null">divide_level = #{divideLevel},</if>  
1969 - <if test="hasTimelists != null">has_timelists = #{hasTimelists},</if>  
1970 - <if test="isMetro != null">is_metro = #{isMetro},</if>  
1971 - <if test="metroTime != null">metro_time = #{metroTime},</if>  
1972 - <if test="coldBonusType != null">cold_bonus_type = #{coldBonusType},</if>  
1973 - <if test="revenuesMonth != null">revenues_month = #{revenuesMonth},</if>  
1974 - <if test="personMonth != null">person_month = #{personMonth},</if>  
1975 - <if test="mileageMonth != null">mileage_month = #{mileageMonth},</if>  
1976 - <if test="personMonthAvg != null">person_month_avg = #{personMonthAvg},</if>  
1977 - <if test="revenues != null">revenues = #{revenues},</if>  
1978 - <if test="persons != null">persons = #{persons},</if>  
1979 - <if test="mileages != null">mileages = #{mileages},</if>  
1980 - <if test="personAvg != null">person_avg = #{personAvg},</if>  
1981 - <if test="startDate != null">start_date = #{startDate},</if>  
1982 - <if test="nightParking != null">night_parking = #{nightParking},</if>  
1983 - <if test="files != null">files = #{files},</if>  
1984 - <if test="revenueType != null">revenue_type = #{revenueType},</if>  
1985 - <if test="examineStatus != null">examine_status = #{examineStatus},</if>  
1986 - <if test="startReason != null">start_reason = #{startReason},</if>  
1987 - <if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>  
1988 - <if test="startReason != null">start_reason = #{startReason},</if> 1858 + <if test="createTime != null">#{createTime},</if>
1989 </trim> 1859 </trim>
1990 - where id = #{id}  
1991 - </update>  
1992 - 1860 + </insert>-->
1993 1861
1994 - <delete id="deleteBsthTLineExamineById" parameterType="String">  
1995 - delete from bsth_t_line_examine where id in  
1996 - <foreach item="id" collection="array" open="(" separator=","  
1997 - close=")">  
1998 - #{id}  
1999 - </foreach>  
2000 - </delete>  
2001 -  
2002 - <select id="selectBsthTLineExamineByLineName" parameterType="String"  
2003 - resultMap="BsthTLineResult">  
2004 - <include refid="selectBsthTLineExamineVo" />  
2005 - where line_name= #{lineName}  
2006 - </select>  
2007 1862
2008 - <select id="selectBsthTLineByLineName" parameterType="String"  
2009 - resultMap="BsthTLineResult">  
2010 - <include refid="selectBsthTLineVo" />  
2011 - where line_name= #{lineName}  
2012 - </select>  
2013 1863
2014 </mapper> 1864 </mapper>
2015 \ No newline at end of file 1865 \ No newline at end of file
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @3876477
@@ -590,7 +590,28 @@ @@ -590,7 +590,28 @@
590 class="form-control" type="text"> 590 class="form-control" type="text">
591 </div> 591 </div>
592 </div> 592 </div>
593 - 593 + <div class="form-group">
  594 + <label class="col-sm-3 control-label">性质：</label>
  595 + <div class="col-sm-8">
  596 + <select name="lineUpdateType"
  597 + th:with="type=${@dict.getType('lineUpdateType')}" disabled
  598 + class="form-control m-b">
  599 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  600 + th:value="${dict.dictValue}"
  601 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  602 + </select>
  603 + </div>
  604 + </div>
  605 + <div class="form-group">
  606 + <label class="col-sm-3 control-label">营收类型：</label>
  607 + <div class="col-sm-8">
  608 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" disabled class="form-control m-b">
  609 + <option value=""></option>
  610 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  611 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
  612 + </select>
  613 + </div>
  614 + </div>
594 <div class="form-group"> 615 <div class="form-group">
595 <label class="col-sm-3 control-label">启用时间：</label> 616 <label class="col-sm-3 control-label">启用时间：</label>
596 <div class="col-sm-8"> 617 <div class="col-sm-8">
@@ -605,20 +626,9 @@ @@ -605,20 +626,9 @@
605 </div> 626 </div>
606 </div> 627 </div>
607 <div class="form-group"> 628 <div class="form-group">
608 - <label class="col-sm-3 control-label">性质：</label>  
609 - <div class="col-sm-8">  
610 - <select name="lineUpdateType"  
611 - th:with="type=${@dict.getType('lineUpdateType')}" disabled  
612 - class="form-control m-b">  
613 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
614 - th:value="${dict.dictValue}"></option>  
615 - </select>  
616 - </div>  
617 - </div>  
618 - <div class="form-group">  
619 <label class="col-sm-3 control-label">启用原因：</label> 629 <label class="col-sm-3 control-label">启用原因：</label>
620 <div class="col-sm-8"> 630 <div class="col-sm-8">
621 - <textarea name="startReason" class="form-control" disabled></textarea> 631 + <textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea>
622 </div> 632 </div>
623 </div> 633 </div>
624 <div class="form-group"> 634 <div class="form-group">
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @3876477
@@ -646,30 +646,15 @@ @@ -646,30 +646,15 @@
646 class="form-control" type="text"> 646 class="form-control" type="text">
647 </div> 647 </div>
648 </div>--> 648 </div>-->
649 -  
650 - <div class="form-group">  
651 - <label class="col-sm-3 control-label">启用时间：</label>  
652 - <div class="col-sm-8">  
653 - <div class="input-group date">  
654 - <input name="startDate"  
655 - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"  
656 - class="form-control" placeholder="yyyy-MM-dd" type="text"  
657 - autocomplete="off"> <span class="input-group-addon"><i  
658 - class="fa fa-calendar"></i></span>  
659 - </div>  
660 -  
661 - </div>  
662 - </div>  
663 -  
664 <div class="form-group"> 649 <div class="form-group">
665 <label class="col-sm-3 control-label">性质：</label> 650 <label class="col-sm-3 control-label">性质：</label>
666 <div class="col-sm-8"> 651 <div class="col-sm-8">
667 <select name="lineUpdateType" 652 <select name="lineUpdateType"
668 - th:with="type=${@dict.getType('lineUpdateType')}"  
669 - class="form-control m-b"> 653 + th:with="type=${@dict.getType('lineUpdateType')}"
  654 + class="form-control m-b">
670 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 655 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
671 - th:value="${dict.dictValue}"  
672 - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option> 656 + th:value="${dict.dictValue}"
  657 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
673 </select> 658 </select>
674 </div> 659 </div>
675 </div> 660 </div>
@@ -684,6 +669,20 @@ @@ -684,6 +669,20 @@
684 </div> 669 </div>
685 </div> 670 </div>
686 <div class="form-group"> 671 <div class="form-group">
  672 + <label class="col-sm-3 control-label">启用时间：</label>
  673 + <div class="col-sm-8">
  674 + <div class="input-group date">
  675 + <input name="startDate"
  676 + th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
  677 + class="form-control" placeholder="yyyy-MM-dd" type="text"
  678 + autocomplete="off"> <span class="input-group-addon"><i
  679 + class="fa fa-calendar"></i></span>
  680 + </div>
  681 +
  682 + </div>
  683 + </div>
  684 +
  685 + <div class="form-group">
687 <label class="col-sm-3 control-label">启用原因：</label> 686 <label class="col-sm-3 control-label">启用原因：</label>
688 <div class="col-sm-8"> 687 <div class="col-sm-8">
689 <textarea name="startReason" class="form-control">[[*{startReason}]]</textarea> 688 <textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @3876477
@@ -592,6 +592,28 @@ @@ -592,6 +592,28 @@
592 </div> 592 </div>
593 593
594 <div class="form-group"> 594 <div class="form-group">
  595 + <label class="col-sm-3 control-label">性质：</label>
  596 + <div class="col-sm-8">
  597 + <select name="lineUpdateType"
  598 + th:with="type=${@dict.getType('lineUpdateType')}" disabled
  599 + class="form-control m-b">
  600 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
  601 + th:value="${dict.dictValue}"
  602 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  603 + </select>
  604 + </div>
  605 + </div>
  606 + <div class="form-group">
  607 + <label class="col-sm-3 control-label">营收类型：</label>
  608 + <div class="col-sm-8">
  609 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" disabled class="form-control m-b">
  610 + <option value=""></option>
  611 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  612 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
  613 + </select>
  614 + </div>
  615 + </div>
  616 + <div class="form-group">
595 <label class="col-sm-3 control-label">启用时间：</label> 617 <label class="col-sm-3 control-label">启用时间：</label>
596 <div class="col-sm-8"> 618 <div class="col-sm-8">
597 <div class="input-group date"> 619 <div class="input-group date">
@@ -605,17 +627,6 @@ @@ -605,17 +627,6 @@
605 </div> 627 </div>
606 </div> 628 </div>
607 <div class="form-group"> 629 <div class="form-group">
608 - <label class="col-sm-3 control-label">性质：</label>  
609 - <div class="col-sm-8">  
610 - <select name="lineUpdateType"  
611 - th:with="type=${@dict.getType('lineUpdateType')}" disabled  
612 - class="form-control m-b">  
613 - <option th:each="dict : ${type}" th:text="${dict.dictLabel}"  
614 - th:value="${dict.dictValue}"></option>  
615 - </select>  
616 - </div>  
617 - </div>  
618 - <div class="form-group">  
619 <label class="col-sm-3 control-label">启用原因：</label> 630 <label class="col-sm-3 control-label">启用原因：</label>
620 <div class="col-sm-8"> 631 <div class="col-sm-8">
621 <textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea> 632 <textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea>
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @3876477
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <head> 3 <head>
4 <th:block th:include="include :: header('修改【请填写功能名称】')" /> 4 <th:block th:include="include :: header('修改【请填写功能名称】')" />
5 <th:block th:include="include :: datetimepicker-css" /> 5 <th:block th:include="include :: datetimepicker-css" />
  6 +<th:block th:include="include :: bootstrap-fileinput-css" />
6 </head> 7 </head>
7 <body class="white-bg"> 8 <body class="white-bg">
8 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 9 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -617,33 +618,57 @@ @@ -617,33 +618,57 @@
617 </div> 618 </div>
618 </div>--> 619 </div>-->
619 620
620 - <div class="form-group">  
621 - <label class="col-sm-3 control-label">启用时间：</label>  
622 - <div class="col-sm-8">  
623 - <div class="input-group date">  
624 - <input name="startDate"  
625 - th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"  
626 - class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">  
627 - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>  
628 - </div>  
629 621
630 - </div>  
631 - </div>  
632 622
633 <div class="form-group"> 623 <div class="form-group">
634 <label class="col-sm-3 control-label">性质：</label> 624 <label class="col-sm-3 control-label">性质：</label>
635 <div class="col-sm-8"> 625 <div class="col-sm-8">
636 <select name="lineUpdateType" 626 <select name="lineUpdateType"
637 - th:with="type=${@dict.getType('lineUpdateType')}"  
638 - class="form-control m-b"> 627 + th:with="type=${@dict.getType('lineUpdateType')}"
  628 + class="form-control m-b">
639 <option value=""></option> 629 <option value=""></option>
640 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" 630 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
641 - th:value="${dict.dictValue}"  
642 - th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option> 631 + th:value="${dict.dictValue}"
  632 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
  633 + </select>
  634 + </div>
  635 + </div>
  636 + <div class="form-group">
  637 + <label class="col-sm-3 control-label">营收类型：</label>
  638 + <div class="col-sm-8">
  639 + <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
  640 + <option value=""></option>
  641 + <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
  642 + th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
643 </select> 643 </select>
644 </div> 644 </div>
645 </div> 645 </div>
  646 + <div class="form-group">
  647 + <label class="col-sm-3 control-label" name="files">附件：</label>
  648 + <div class="col-sm-8">
  649 + <div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
  650 + <input name="files" type="hidden" th:value="${path}" >
  651 + <a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
  652 + </a>
  653 + <button onclick="deleteFile(this);">删除</button>
  654 + </div>
  655 + <div class="file-loading" id="uploadDiv">
  656 + <input id="fileinput" type="file" multiple>
  657 + </div>
  658 + </div>
  659 + </div>
  660 + <div class="form-group">
  661 + <label class="col-sm-3 control-label">启用时间：</label>
  662 + <div class="col-sm-8">
  663 + <div class="input-group date">
  664 + <input name="startDate"
  665 + th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
  666 + class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
  667 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  668 + </div>
646 669
  670 + </div>
  671 + </div>
647 <div class="form-group"> 672 <div class="form-group">
648 <label class="col-sm-3 control-label">启用原因：</label> 673 <label class="col-sm-3 control-label">启用原因：</label>
649 <div class="col-sm-8"> 674 <div class="col-sm-8">
@@ -654,6 +679,7 @@ @@ -654,6 +679,7 @@
654 </div> 679 </div>
655 <th:block th:include="include :: footer" /> 680 <th:block th:include="include :: footer" />
656 <th:block th:include="include :: datetimepicker-js" /> 681 <th:block th:include="include :: datetimepicker-js" />
  682 + <th:block th:include="include :: bootstrap-fileinput-js" />
657 <script th:inline="javascript"> 683 <script th:inline="javascript">
658 var prefix = ctx + "system/lineHistory"; 684 var prefix = ctx + "system/lineHistory";
659 685
@@ -692,6 +718,31 @@ @@ -692,6 +718,31 @@
692 } 718 }
693 } 719 }
694 }); */ 720 }); */
  721 + $(function() {
  722 +
  723 + $("#fileinput").fileinput({
  724 + 'theme' : 'explorer-fas',
  725 + 'uploadUrl' : '/common/upload',
  726 + overwriteInitial : false,
  727 + initialPreviewAsData : false
  728 + });
  729 +
  730 + $("#fileinput").on("fileuploaded",
  731 + function(event, data, proviewId, index) {
  732 +
  733 + var obj = '<div><input name="files" type="hidden" value='+data.files[index].name + ':' + data.response.url + '>'+
  734 + '<a href='+data.response.url+'>'+ data.files[index].name +
  735 + '</a><button onclick="deleteFile(this);">删除</button></div>';
  736 +
  737 +
  738 + $(".file-input").before(obj);
  739 +
  740 + });
  741 + })
  742 +
  743 + function deleteFile(obj){
  744 + $(obj).parent().remove();
  745 + }
695 $.post("/system/line/findByName", 746 $.post("/system/line/findByName",
696 { 747 {
697 name : $("#lineName").val() 748 name : $("#lineName").val()