Commit 5710d930dd6bc5af4abd3b2f220ba3e208ad2499

Authored by 廖磊
1 parent a86bbb3a

字典表加油类型条件修改

src/main/java/com/bsth/controller/jdtest/JdTestController.java
@@ -40,7 +40,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ @@ -40,7 +40,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{
40 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), 40 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
41 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 41 sdfSimple = new SimpleDateFormat("yyyyMMdd");
42 Map<String, Object> dMap=new HashMap<>(); 42 Map<String, Object> dMap=new HashMap<>();
43 - dMap.put("dGroup", "oilType"); 43 + dMap.put("dGroup_eq", "oilType");
44 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator(); 44 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
45 while (it.hasNext()) { 45 while (it.hasNext()) {
46 Dictionary d=it.next(); 46 Dictionary d=it.next();
src/main/java/com/bsth/controller/oil/YlbController.java
@@ -249,7 +249,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -249,7 +249,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
249 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), 249 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
250 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 250 sdfSimple = new SimpleDateFormat("yyyyMMdd");
251 Map<String, Object> dMap=new HashMap<>(); 251 Map<String, Object> dMap=new HashMap<>();
252 - dMap.put("dGroup", "oilType"); 252 + dMap.put("dGroup_eq", "oilType");
253 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator(); 253 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
254 while (it.hasNext()) { 254 while (it.hasNext()) {
255 Dictionary d=it.next(); 255 Dictionary d=it.next();
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -2558,7 +2558,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2558,7 +2558,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2558 @Override 2558 @Override
2559 public Map<String, Object> exportWaybillMore(Map<String, Object> map) { 2559 public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
2560 Map<String, Object> dMap=new HashMap<>(); 2560 Map<String, Object> dMap=new HashMap<>();
2561 - dMap.put("dGroup", "oilType"); 2561 + dMap.put("dGroup_eq", "oilType");
2562 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator(); 2562 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
2563 while (it.hasNext()) { 2563 while (it.hasNext()) {
2564 Dictionary d=it.next(); 2564 Dictionary d=it.next();
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
@@ -147,7 +147,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -147,7 +147,7 @@ public class JdtestServiceImpl implements JdtestService {
147 } 147 }
148 }); 148 });
149 Map<String, Object> dMap=new HashMap<>(); 149 Map<String, Object> dMap=new HashMap<>();
150 - dMap.put("dGroup", "oilType"); 150 + dMap.put("dGroup_eq", "oilType");
151 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator(); 151 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
152 while (it.hasNext()) { 152 while (it.hasNext()) {
153 Dictionary d=it.next(); 153 Dictionary d=it.next();
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -4598,7 +4598,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4598,7 +4598,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4598 public Map<String, Object> MapById(Long id) { 4598 public Map<String, Object> MapById(Long id) {
4599 // TODO Auto-generated method stub 4599 // TODO Auto-generated method stub
4600 Map<String, Object> dMap=new HashMap<>(); 4600 Map<String, Object> dMap=new HashMap<>();
4601 - dMap.put("dGroup", "oilType"); 4601 + dMap.put("dGroup_eq", "oilType");
4602 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator(); 4602 Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
4603 while (it.hasNext()) { 4603 while (it.hasNext()) {
4604 Dictionary d=it.next(); 4604 Dictionary d=it.next();