|
|
@@ -210,37 +210,37 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
|
|
|
stringObjectHashMap.put("limit", map.get("limit"));
|
|
|
stringObjectHashMap.put("startPage", map.get("startPage"));
|
|
|
stringObjectHashMap.put("locationId", getDiDian());
|
|
|
- Map param = (Map) map.get("param");
|
|
|
- Map mapOrder = (Map)map.get("order");
|
|
|
- String kaoShiMingChen = (String) param.get("kaoShiMingChen");
|
|
|
- /* ArrayList kaoShiLeiXingList = (ArrayList) param.get("kaoShiLeiXing");
|
|
|
- String sKaoShiLeiXing = String.join(",", kaoShiLeiXingList);
|
|
|
- stringObjectHashMap.put("kaoShiLeiXing",sKaoShiLeiXing);*/
|
|
|
- if(BeanUtils.isNotEmpty(param.get("kaoShiLeiXing"))){
|
|
|
- stringObjectHashMap.put("kaoShiLeiXing", String.join(",", (ArrayList)param.get("kaoShiLeiXing")));
|
|
|
+ if(BeanUtils.isNotEmpty(map.get("param"))){
|
|
|
+ Map param = (Map) map.get("param");
|
|
|
+ String kaoShiMingChen = (String) param.get("kaoShiMingChen");
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("kaoShiLeiXing"))){
|
|
|
+ stringObjectHashMap.put("kaoShiLeiXing", String.join(",", (ArrayList)param.get("kaoShiLeiXing")));
|
|
|
+ }
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("zhuangTai"))){
|
|
|
+ stringObjectHashMap.put("zhuangTai", String.join(",", (ArrayList)param.get("zhuangTai")));
|
|
|
+ }
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("tiKuId"))){
|
|
|
+ stringObjectHashMap.put("tiKuId", String.join(",", (ArrayList)param.get("tiKuId")));
|
|
|
+ }
|
|
|
+ stringObjectHashMap.put("kaoShiMingChen",kaoShiMingChen);
|
|
|
+ stringObjectHashMap.put("chuangJianShiJUp",param.get("chuangJianShiJ^S"));
|
|
|
+ stringObjectHashMap.put("chuangJianShiJLower",param.get("chuangJianShiJ^E"));
|
|
|
+ stringObjectHashMap.put("faBuShiJianUp",param.get("faBuShiJian^S"));
|
|
|
+ stringObjectHashMap.put("faBuShiJianLower",param.get("faBuShiJian^E"));
|
|
|
}
|
|
|
- if(BeanUtils.isNotEmpty(param.get("zhuangTai"))){
|
|
|
- stringObjectHashMap.put("zhuangTai", String.join(",", (ArrayList)param.get("zhuangTai")));
|
|
|
+ if(BeanUtils.isNotEmpty(map.get("sort"))){
|
|
|
+ Map mapOrder = (Map)map.get("sort");
|
|
|
+ if(BeanUtils.isNotEmpty(mapOrder.get("chuangJianShiJ"))){
|
|
|
+ stringObjectHashMap.put("cjsj",(String) mapOrder.get("chuangJianShiJ"));
|
|
|
+ }else{
|
|
|
+ stringObjectHashMap.put("cjsj",(String) "desc");
|
|
|
+ }
|
|
|
+ if(BeanUtils.isNotEmpty(mapOrder.get("faBuShiJian"))){
|
|
|
+ stringObjectHashMap.put("fbsj",(String) mapOrder.get("faBuShiJian"));
|
|
|
+ }else{
|
|
|
+ stringObjectHashMap.put("fbsj",(String) "desc");
|
|
|
+ }
|
|
|
}
|
|
|
- if(BeanUtils.isNotEmpty(param.get("tiKuId"))){
|
|
|
- stringObjectHashMap.put("tiKuId", String.join(",", (ArrayList)param.get("tiKuId")));
|
|
|
- }
|
|
|
- stringObjectHashMap.put("kaoShiMingChen",kaoShiMingChen);
|
|
|
- stringObjectHashMap.put("chuangJianShiJUp",param.get("chuangJianShiJ_Up"));
|
|
|
- stringObjectHashMap.put("chuangJianShiJLower",param.get("chuangJianShiJ_Lower"));
|
|
|
- stringObjectHashMap.put("faBuShiJianUp",param.get("faBuShiJian_Up"));
|
|
|
- stringObjectHashMap.put("faBuShiJianLower",param.get("faBuShiJian_Lower"));
|
|
|
- if(BeanUtils.isNotEmpty(mapOrder.get("chuangJianShiJ"))){
|
|
|
- stringObjectHashMap.put("cjsj",(String) mapOrder.get("chuangJianShiJ"));
|
|
|
- }else{
|
|
|
- stringObjectHashMap.put("cjsj",(String) "desc");
|
|
|
- }
|
|
|
- if(BeanUtils.isNotEmpty(mapOrder.get("faBuShiJian"))){
|
|
|
- stringObjectHashMap.put("fbsj",(String) mapOrder.get("faBuShiJian"));
|
|
|
- }else{
|
|
|
- stringObjectHashMap.put("fbsj",(String) "desc");
|
|
|
- }
|
|
|
- // String str = String.valueOf(map.get("data"));
|
|
|
}
|
|
|
return stringObjectHashMap;
|
|
|
}
|
|
|
@@ -252,24 +252,26 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
|
|
|
stringObjectHashMap.put("limit", map.get("limit"));
|
|
|
stringObjectHashMap.put("startPage", map.get("startPage"));
|
|
|
stringObjectHashMap.put("locationId", getDiDian());
|
|
|
- Map param = (Map) map.get("param");
|
|
|
- if(BeanUtils.isNotEmpty(param.get("examName"))){
|
|
|
- stringObjectHashMap.put("examName","%"+param.get("examName")+"%");
|
|
|
- }
|
|
|
- if(BeanUtils.isNotEmpty(param.get("bankName"))){
|
|
|
- stringObjectHashMap.put("bankName","%"+param.get("bankName")+"%");
|
|
|
- }
|
|
|
- if (BeanUtils.isEmpty(param.get("examinee"))) {
|
|
|
- stringObjectHashMap.put("examinee", EXAMINEE);
|
|
|
- }else{
|
|
|
- stringObjectHashMap.put("examinee",param.get("examinee"));
|
|
|
- }
|
|
|
- stringObjectHashMap.put("startDateUp",param.get("startDate^S"));
|
|
|
- stringObjectHashMap.put("startDateLower",param.get("startDate^E"));
|
|
|
- stringObjectHashMap.put("limitDateUp",param.get("limitDate^S"));
|
|
|
- stringObjectHashMap.put("limitDateLower",param.get("limitDate^E"));
|
|
|
- if(BeanUtils.isNotEmpty(param.get("examType"))){
|
|
|
- stringObjectHashMap.put("examType",String.join(",", (ArrayList)param.get("examType")));
|
|
|
+ if(BeanUtils.isNotEmpty(map.get("param"))){
|
|
|
+ Map param = (Map) map.get("param");
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("examName"))){
|
|
|
+ stringObjectHashMap.put("examName","%"+param.get("examName")+"%");
|
|
|
+ }
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("bankName"))){
|
|
|
+ stringObjectHashMap.put("bankName","%"+param.get("bankName")+"%");
|
|
|
+ }
|
|
|
+ if (BeanUtils.isEmpty(param.get("examinee"))) {
|
|
|
+ stringObjectHashMap.put("examinee", EXAMINEE);
|
|
|
+ }else{
|
|
|
+ stringObjectHashMap.put("examinee",param.get("examinee"));
|
|
|
+ }
|
|
|
+ stringObjectHashMap.put("startDateUp",param.get("startDate^S"));
|
|
|
+ stringObjectHashMap.put("startDateLower",param.get("startDate^E"));
|
|
|
+ stringObjectHashMap.put("limitDateUp",param.get("limitDate^S"));
|
|
|
+ stringObjectHashMap.put("limitDateLower",param.get("limitDate^E"));
|
|
|
+ if(BeanUtils.isNotEmpty(param.get("examType"))){
|
|
|
+ stringObjectHashMap.put("examType",String.join(",", (ArrayList)param.get("examType")));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return stringObjectHashMap;
|