数据库增加字段

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -8,13 +8,13 @@
 		  ,salesperson_unid
 		</if>
 		<if test="province != null and province != ''">
-		  ,province
+		  ,province,province_name
 		</if>
 		<if test="city !=null and city != ''">
-			,city
+			,city,city_name
 		</if>
 		<if test="county != null and county != ''">
-		  ,county
+		  ,county,county_name
 		</if>
 		<if test="guarantee_period != null">
 		  ,guarantee_period
@@ -92,13 +92,13 @@
 		  ,#{salesperson_unid}
 		</if>
 		<if test="province != null and province != ''">
-		  ,#{province}
+		  ,#{province},#{province_name}
 		</if>
 		<if test="city !=null and city != ''">
-			, #{city}
+			, #{city},#{city_name}
 		</if>
 		<if test="county != null and county != ''">
-		  ,#{county}
+		  ,#{county},#{county_name}
 		</if>
 		<if test="guarantee_period != null and guarantee_period != ''">
 		  ,#{guarantee_period}
@@ -175,7 +175,7 @@
 	</insert>
 	<select id="queryOne" resultType="com.vion.financial.vo.ContractVo" parameterType="java.lang.String">
 		select 
-		contract_unid, salesperson_unid, province, city, county, 
+		contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,
 		guarantee_period, sign_date, product_line_type, contract_state, 
 		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
 		cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
@@ -403,7 +403,7 @@
 	
 	<select id="selectByCondition" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.vo.ContractVo">
 		select 
-		contract_unid, salesperson_unid, province, city, county, 
+		contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,
 		guarantee_period, sign_date, product_line_type, contract_state, 
 		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
 		cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
@@ -543,7 +543,7 @@
 	
 	<select id="exportContracts" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.excel.ExportModel">
 		select 
-		contract_unid, salesperson_unid, province, city, county, 
+		contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,
 		guarantee_period, sign_date, product_line_type, contract_state, 
 		contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, 
 		cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -183,9 +183,9 @@ public class ContractServiceImpl implements ContractService {
 			ResultVo resultVo=new ResultVo();
 			logger.info("========================筛选合同列表===========================");
 			List<Map> list_data = null;
-			List<Map> list_province=null;
+/*			List<Map> list_province=null;
 			List<Map> list_city=null;
-			List<Map> list_county=null;
+			List<Map> list_county=null;*/
 			int count=0;
 			// 调用auth服务的接口获取用户列表信息
 			String url = financeConfig.getAuthurl();
@@ -303,7 +303,7 @@ public class ContractServiceImpl implements ContractService {
 					}
 				}*/
 			}
-			String provinceurl=financeConfig.getProvinceurl();
+/*			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");
@@ -356,7 +356,7 @@ public class ContractServiceImpl implements ContractService {
 					}
 				}
 
-			}
+			}*/
 		}
 			resultVo.setList_data(list);
 			resultVo.setList_size(list.size());
@@ -376,20 +376,21 @@ public class ContractServiceImpl implements ContractService {
 	public void exportExcel(SelectVo selectVo,HttpServletResponse response) {
 		logger.info("========================导出合同Excel表格===========================");
 		List<Map> list_data = null;
-		List<Map> list_province=null;
+/*		List<Map> list_province=null;
 		List<Map> list_city=null;
-		List<Map> list_county=null;
+		List<Map> list_county=null;*/
 		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");
-		
+
+		/*
 		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");
 		
-/*		String cityurl=financeConfig.getCityurl();
+		String cityurl=financeConfig.getCityurl();
 		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");
@@ -443,7 +444,7 @@ public class ContractServiceImpl implements ContractService {
 						break;
 				}
 			}
-			if(list_province != null && list_province.size() > 0) {
+			/*if(list_province != null && list_province.size() > 0) {
 				for(Map _map:list_province) {
 					if(exportModel.getProvince()!=null) {
 					if(exportModel.getProvince().equals(_map.get("province_unid"))) {
@@ -481,7 +482,7 @@ public class ContractServiceImpl implements ContractService {
 					}
 				}
 			}
-
+*/
 		}
 		try {
 			DownLoad downLoad =new DownLoad();