125231456

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

@@ -378,12 +378,6 @@
 		   contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point})
 		   contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point})
 		   </if>
 		   </if>
 		   and is_delete=false
 		   and is_delete=false
-		   <if test="limit !=null and limit!=0 ">
-		   limit #{limit} 
-		   </if>
-		   <if test="offset !=0 and offset !=null">
-		   offset #{offset}
-		   </if> 
 	</select>
 	</select>
 	
 	
 	<select id="selectByCondition" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.vo.ContractVo">
 	<select id="selectByCondition" parameterType="com.vion.financial.vo.SelectVo" resultType="com.vion.financial.vo.ContractVo">
@@ -443,7 +437,7 @@
 		   and 
 		   and 
 		   county=#{county} 
 		   county=#{county} 
 		   </if>
 		   </if>
-		   <if test="guarantee_period !=null and guarantee_period !=0">
+		   <if test="guarantee_period !=null and guarantee_period !='0'">
 		    and
 		    and
 		   guarantee_period=#{guarantee_period}
 		   guarantee_period=#{guarantee_period}
 		   </if>
 		   </if>

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

@@ -186,6 +186,7 @@ public class ContractServiceImpl implements ContractService {
 			List<Map> list_province=null;
 			List<Map> list_province=null;
 			List<Map> list_city=null;
 			List<Map> list_city=null;
 			List<Map> list_county=null;
 			List<Map> list_county=null;
+			int count=0;
 			if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
 			if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
 				// 调用auth服务的接口获取用户列表信息
 				// 调用auth服务的接口获取用户列表信息
 				String url = financeConfig.getAuthurl();
 				String url = financeConfig.getAuthurl();
@@ -207,8 +208,9 @@ public class ContractServiceImpl implements ContractService {
 				}
 				}
 				
 				
 			}
 			}
+			count = contractMapper.count(selectVo);
 			List<ContractVo> list = contractMapper.selectByCondition(selectVo);
 			List<ContractVo> list = contractMapper.selectByCondition(selectVo);
-			int count = contractMapper.count(selectVo);
+			if(list!=null) {
 			for (ContractVo contractVo : list) {
 			for (ContractVo contractVo : list) {
 				contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
 				contractVo.setPaymentAgree_list(paymentAgreeMapper.queryPaymentAgree(contractVo.getContract_unid()));
 				if(list_data != null && list_data.size() > 0) {
 				if(list_data != null && list_data.size() > 0) {
@@ -218,6 +220,7 @@ public class ContractServiceImpl implements ContractService {
 						}
 						}
 					}
 					}
 				}
 				}
+				if(contractVo.getProduct_line_type()!=null) {
 				switch(contractVo.getProduct_line_type()) {
 				switch(contractVo.getProduct_line_type()) {
 					case "1" :
 					case "1" :
 						contractVo.setProduct_line_type_name("安防");
 						contractVo.setProduct_line_type_name("安防");
@@ -235,6 +238,7 @@ public class ContractServiceImpl implements ContractService {
 						break;
 						break;
 				}
 				}
 				}
 				}
+			}
 			String provinceurl=financeConfig.getProvinceurl();
 			String provinceurl=financeConfig.getProvinceurl();
 			String province_results=HttpNetClient.doGet(provinceurl, null);
 			String province_results=HttpNetClient.doGet(provinceurl, null);
 			Map map_provinces=JavaBean2Json.Json2JavaBean(province_results, Map.class);
 			Map map_provinces=JavaBean2Json.Json2JavaBean(province_results, Map.class);
@@ -287,6 +291,7 @@ public class ContractServiceImpl implements ContractService {
 				}
 				}
 
 
 			}
 			}
+		}
 			resultVo.setList_data(list);
 			resultVo.setList_data(list);
 			resultVo.setList_size(selectVo.getLimit());
 			resultVo.setList_size(selectVo.getLimit());
 			resultVo.setOffset(selectVo.getOffset());
 			resultVo.setOffset(selectVo.getOffset());