Skip to content

platform / finance_serv

Go to a project
Commit 1c4d3099 by 谢明辉
Options

Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

2 parents 15ff4a70 75af547b
Inline Side-by-side
Showing 2 changed files with 52 additions and 13 deletions
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
......@@ -187,26 +187,31 @@ public class ContractServiceImpl implements ContractService {
List<Map> list_city=null;
List<Map> list_county=null;
int count=0;
// 调用auth服务的接口获取用户列表信息
String url = financeConfig.getAuthurl();
String result = HttpNetClient.doGet(url, null);
Map map = JavaBean2Json.Json2JavaBean(result, Map.class);
list_data = (List<Map>) map.get("list_data");
if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
// 调用auth服务的接口获取用户列表信息
String url = financeConfig.getAuthurl();
String result = HttpNetClient.doGet(url+"?username="+selectVo.getSalesperson_name__like(), null);
Map map = JavaBean2Json.Json2JavaBean(result, Map.class);
list_data = (List<Map>) map.get("list_data");
List<String> salesperson_unids = new ArrayList<String>();
if(list_data != null && list_data.size() > 0) {
List<String> salesperson_unids = new ArrayList<String>(list_data.size());
String name = "";
for(Map _map:list_data) {
salesperson_unids.add((String) _map.get("user_unid"));
name = (String) _map.get("name");
if(name != null && name.contains(selectVo.getSalesperson_name__like())) {
salesperson_unids.add((String) _map.get("user_unid"));
}
}
selectVo.setSalesperson_unids(salesperson_unids);
}else {
selectVo.setSalesperson_unids(salesperson_unids.size() > 0 ? salesperson_unids : null);
}
if(salesperson_unids.size() == 0) {
resultVo.setList_data(new ArrayList<>());
resultVo.setList_size(selectVo.getLimit()== null ? 0 : selectVo.getLimit());
resultVo.setOffset(selectVo.getOffset()== null ? 0 : selectVo.getOffset());
resultVo.setTotal_number(0);
return resultVo;
}
}
count = contractMapper.count(selectVo);
List<ContractVo> list = contractMapper.selectByCondition(selectVo);
......@@ -215,12 +220,14 @@ public class ContractServiceImpl implements ContractService {
//contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
if(list_data != null && list_data.size() > 0) {
for(Map _map:list_data) {
if(contractVo.getSalesperson_unid()!=null) {
if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
contractVo.setSalesperson_name((String) _map.get("name"));
}
}
}
}
if(contractVo.getProduct_line_type()!=null) {
/* if(contractVo.getProduct_line_type()!=null) {
switch(contractVo.getProduct_line_type()) {
case "1" :
contractVo.setProduct_line_type_name("安防");
......@@ -270,8 +277,31 @@ public class ContractServiceImpl implements ContractService {
case "4" :
contractVo.setContract_type_name("维保");
break;
default:
break;
}
}
if(contractVo.getAmount_state_unid()!=null) {
switch(contractVo.getAmount_state_unid()) {
case "1" :
contractVo.setAmount_state_unid_name("正常预付款");
break;
case "2" :
contractVo.setAmount_state_unid_name("正常到货款");
break;
case "3" :
contractVo.setAmount_state_unid_name("正常验收款");
break;
case "4" :
contractVo.setAmount_state_unid_name("正常维保款");
break;
case "5" :
contractVo.setAmount_state_unid_name("正常质保款");
break;
default:
break;
}
}*/
}
String provinceurl=financeConfig.getProvinceurl();
String province_results=HttpNetClient.doGet(provinceurl, null);
......@@ -280,9 +310,11 @@ public class ContractServiceImpl implements ContractService {
for (ContractVo contractVo : list) {
if(list_data != null && list_data.size() > 0) {
for(Map _map:list_data) {
if(contractVo.getSalesperson_unid()!=null) {
if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
contractVo.setSalesperson_name((String) _map.get("name"));
}
}
}
}
if(list_province != null && list_province.size() > 0) {
......@@ -369,11 +401,11 @@ public class ContractServiceImpl implements ContractService {
*/
if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
if(list_data != null && list_data.size() > 0) {
List<String> salesperson_unids = new ArrayList<String>(list_data.size());
List<String> salesperson_unids = new ArrayList<String>();
String name = "";
for(Map _map:list_data) {
name = (String) _map.get("name");
if(name.contains(selectVo.getSalesperson_name__like())) {
if(name !=null && name.contains(selectVo.getSalesperson_name__like())) {
salesperson_unids.add((String) _map.get("user_unid"));
}
}
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
......@@ -62,6 +62,7 @@ public class ContractVo extends SelectVo{
private String product_line_type_name;
private String contract_state_name;
private String contract_type_name;
private String amount_state_unid_name;
/*@JsonIgnoreProperties(value={"total_number"}) */
private Integer list_size;
private Integer offset;
......@@ -491,6 +492,12 @@ public class ContractVo extends SelectVo{
public void setContract_type_name(String contract_type_name) {
this.contract_type_name = contract_type_name;
}
public String getAmount_state_unid_name() {
return amount_state_unid_name;
}
public void setAmount_state_unid_name(String amount_state_unid_name) {
this.amount_state_unid_name = amount_state_unid_name;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!