Commit 4f33e316 by 王军业

88888888

1 parent e5b1be6b
...@@ -183,6 +183,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -183,6 +183,9 @@ public class ContractServiceImpl implements ContractService {
ResultVo resultVo=new ResultVo(); ResultVo resultVo=new ResultVo();
logger.info("========================筛选合同列表==========================="); logger.info("========================筛选合同列表===========================");
List<Map> list_data = null; List<Map> list_data = null;
List<Map> list_province=null;
List<Map> list_city=null;
List<Map> list_county=null;
if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) { if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
// 调用auth服务的接口获取用户列表信息 // 调用auth服务的接口获取用户列表信息
String url = financeConfig.getAuthurl(); String url = financeConfig.getAuthurl();
...@@ -215,6 +218,74 @@ public class ContractServiceImpl implements ContractService { ...@@ -215,6 +218,74 @@ public class ContractServiceImpl implements ContractService {
} }
} }
} }
switch(contractVo.getProduct_line_type()) {
case "1" :
contractVo.setProduct_line_type_name("安防");
break;
case "2" :
contractVo.setProduct_line_type_name("交通");
break;
case "3" :
contractVo.setProduct_line_type_name("客流");
break;
case "4" :
contractVo.setProduct_line_type_name("维保");
break;
default:
break;
}
}
String provinceurl=financeConfig.getProvinceurl();
String province_results=HttpNetClient.doGet(provinceurl, null);
Map map_provinces=JavaBean2Json.Json2JavaBean(province_results, Map.class);
list_province=(List<Map>) map_provinces.get("list_data");
for (ContractVo contractVo : list) {
if(list_data != null && list_data.size() > 0) {
for(Map _map:list_data) {
if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
contractVo.setSalesperson_name((String) _map.get("name"));
}
}
}
if(list_province != null && list_province.size() > 0) {
for(Map _map:list_province) {
if(contractVo.getProvince()!=null) {
if(contractVo.getProvince().equals(_map.get("province_unid"))) {
contractVo.setProvince_name((String)_map.get("name"));
break;
}
}
}
String cityurl=String.format(financeConfig.getCityurl(),contractVo.getProvince());
String city_results=HttpNetClient.doGet(cityurl, null);
Map map_cities=JavaBean2Json.Json2JavaBean(city_results, Map.class);
list_city=(List<Map>) map_cities.get("list_data");
if(list_city != null && list_city.size() > 0) {
for(Map _map:list_city) {
if(contractVo.getCity()!=null) {
if(contractVo.getCity().equals(_map.get("city_unid"))) {
contractVo.setCity_name((String)_map.get("name"));
break;
}
}
}
String countyurl=String.format(financeConfig.getCountyurl(),contractVo.getProvince(),contractVo.getCity());
String county_results=HttpNetClient.doGet(countyurl, null);
Map map_ciunties=JavaBean2Json.Json2JavaBean(county_results, Map.class);
list_county=(List<Map>) map_ciunties.get("list_data");
if(list_county != null && list_county.size() > 0) {
for(Map _map:list_county) {
if(contractVo.getCounty()!=null) {
if(contractVo.getCounty().equals(_map.get("county_unid"))) {
contractVo.setCounty_name((String)_map.get("name"));
break;
}
}
}
}
}
}
} }
resultVo.setList_data(list); resultVo.setList_data(list);
resultVo.setList_size(selectVo.getLimit()); resultVo.setList_size(selectVo.getLimit());
......
...@@ -56,6 +56,10 @@ public class ContractVo extends SelectVo{ ...@@ -56,6 +56,10 @@ public class ContractVo extends SelectVo{
private String year; private String year;
private String month; private String month;
private String salesperson_name; private String salesperson_name;
private String province_name;
private String city_name;
private String county_name;
private String product_line_type_name;
/*@JsonIgnoreProperties(value={"total_number"}) */ /*@JsonIgnoreProperties(value={"total_number"}) */
private Integer list_size; private Integer list_size;
private Integer offset; private Integer offset;
...@@ -449,6 +453,30 @@ public class ContractVo extends SelectVo{ ...@@ -449,6 +453,30 @@ public class ContractVo extends SelectVo{
public void setContract_unids(List<String> contract_unids) { public void setContract_unids(List<String> contract_unids) {
this.contract_unids = contract_unids; this.contract_unids = contract_unids;
} }
public String getProvince_name() {
return province_name;
}
public void setProvince_name(String province_name) {
this.province_name = province_name;
}
public String getCity_name() {
return city_name;
}
public void setCity_name(String city_name) {
this.city_name = city_name;
}
public String getCounty_name() {
return county_name;
}
public void setCounty_name(String county_name) {
this.county_name = county_name;
}
public String getProduct_line_type_name() {
return product_line_type_name;
}
public void setProduct_line_type_name(String product_line_type_name) {
this.product_line_type_name = product_line_type_name;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!