Commit 20974f33bf3826d79f372d8ae7969c22543ea843
1 parent
763143c5
路单数据(统计) 添加是否电车的搜索项
Showing
1 changed file
with
5 additions
and
1 deletions
src/main/java/com/bsth/controller/calc/CalcExportController.java
| @@ -158,10 +158,14 @@ public class CalcExportController { | @@ -158,10 +158,14 @@ public class CalcExportController { | ||
| 158 | if(map.get("fgsdmSing")!=null){ | 158 | if(map.get("fgsdmSing")!=null){ |
| 159 | fgsdmSing=map.get("fgsdmSing").toString().trim(); | 159 | fgsdmSing=map.get("fgsdmSing").toString().trim(); |
| 160 | } | 160 | } |
| 161 | + String sfdc=""; | ||
| 162 | + if(map.get("sfdc")!=null){ | ||
| 163 | + sfdc=map.get("sfdc").toString().trim(); | ||
| 164 | + } | ||
| 161 | 165 | ||
| 162 | Map<String, Object> resMap = new HashMap<String, Object>(); | 166 | Map<String, Object> resMap = new HashMap<String, Object>(); |
| 163 | List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>(); | 167 | List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>(); |
| 164 | - List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing); | 168 | + List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc); |
| 165 | 169 | ||
| 166 | Map<String, Object> temp = new HashMap<String, Object>(); | 170 | Map<String, Object> temp = new HashMap<String, Object>(); |
| 167 | temp.put("i", "序号"); | 171 | temp.put("i", "序号"); |