git-svn-id: https://192.168.57.71/svn/lyggkj@89 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/gg/GgViewDao.java

@@ -11,9 +11,9 @@ import com.jtgh.yjpt.entity.jyr.JyrEntity;
 
 public interface GgViewDao extends MyRepository<GgViewEntity, Long> {
 
-	@Query("from GgViewEntity role where ggid=?1 and qymc=?2 and sfkj<>'Y'")
+	@Query("from GgViewEntity role where ggid=?1 and qymc=?2 and sfkj<>'Y' and recordStatus<>9")
 	public List<GgViewEntity> findByGgidAndQymc(GgEntity ggid, JyrEntity qymc);
 	
-	@Query("from GgViewEntity role where ggid=?1 and qymc=?2 and sfkj='Y'")
+	@Query("from GgViewEntity role where ggid=?1 and qymc=?2 and sfkj='Y' and recordStatus<>9 ")
 	public List<GgViewEntity> findKjByGgidAndQymc(GgEntity ggid, JyrEntity qymc);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/jyr/JyrWebService.java

@@ -172,16 +172,27 @@ public class JyrWebService extends BaseController{
 		return service.save(entity);
 	}
 	
+	/**
+	 * 经营人查询
+	 * @param szd
+	 * @param szgq
+	 * @param gkjyr
+	 * @param fddbr
+	 * @param sfwhqy
+	 * @return
+	 */
 	public List<JyrEntity> queryJyrByParams(String szd,String szgq,String gkjyr,String fddbr,String sfwhqy){
 		try {
 
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 			addNotEmptyModel(filterList, "recordStatus",
+					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+			addNotEmptyModel(filterList, "recordStatus",
 					BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
 			// 根据所在地过滤
 			if (szd != null)
 				addNotEmptyModel(filterList, "szd.id", szd,
-						Operator.EQ);
+						Operator.LIKE);
 			// 根据港区过滤
 			if(szgq != null && !szgq.equals("")){
 				addNotEmptyModel(filterList, "szgq.id", szgq, Operator.EQ);
@@ -206,8 +217,7 @@ public class JyrWebService extends BaseController{
 					}
 					
 				}
-			}
-			
+			}		
 			return list;
 		
 		} catch (Exception e) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/jyr/JyrxxglWebService.java

@@ -165,6 +165,61 @@ public class JyrxxglWebService extends BaseController {
 		}
 		return null;
 	}
+	
+	/**
+	 * 经营人查询
+	 * @param szd
+	 * @param szgq
+	 * @param gkjyr
+	 * @param fddbr
+	 * @param sfwhqy
+	 * @return
+	 */
+	public List<JyrEntity> getJyrByParams(String szd,String szgq,String gkjyr,String fddbr,String sfwhqy){
+		try {
+
+			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+			addNotEmptyModel(filterList, "recordStatus",
+					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+			addNotEmptyModel(filterList, "recordStatus",
+					BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
+			// 根据所在地过滤
+			if (szd != null)
+				addNotEmptyModel(filterList, "szd.id", szd,
+						Operator.LIKE_R);
+			// 根据港区过滤
+			if(szgq != null && !szgq.equals("")){
+				addNotEmptyModel(filterList, "szgq.id", szgq, Operator.EQ);
+			}
+			if(gkjyr != null && !gkjyr.equals("")){
+				addNotEmptyModel(filterList, "gkjyr",gkjyr, Operator.LIKE);
+						}
+			if(sfwhqy != null && !sfwhqy.equals("")){
+				addNotEmptyModel(filterList, "sfwhqy", sfwhqy, Operator.EQ);
+			}
+			if(fddbr != null && !fddbr.equals("")){
+				addNotEmptyModel(filterList, "fddbr", fddbr, Operator.LIKE);
+			}
+			Specification<JyrEntity> spec = SpecificationCreater
+					.searchByPredicateModels(filterList);
+			List<JyrEntity> list = service
+					.findAll(spec);
+			if(list !=null && list.size()>0){
+				for(JyrEntity jyrEntity :list){
+					if(jyrEntity.getParentJyr() !=null){
+						jyrEntity.getParentJyr().getId();
+					}
+					
+				}
+			}
+			
+			return list;
+		
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 
 	/**
 	 * 获取经营人信息