--no commit message

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/controller/geographysign/BigScreenController.java

@@ -14,6 +14,7 @@ import com.zrqx.core.util.CallBack;
 import com.zrqx.core.vo.Geographysign.CaregoryVo;
 import com.zrqx.core.vo.Geographysign.CategoryDateVo;
 import com.zrqx.core.vo.Geographysign.ProvinceQueryVo;
+import com.zrqx.core.vo.Geographysign.ProvinceTZVo;
 import com.zrqx.core.vo.Geographysign.ProvinceVo;
 import com.zrqx.geography.bg.service.geographysign.GeographysignService;
 
@@ -40,7 +41,7 @@ public class BigScreenController {
 	
 	@ApiOperation(value = "注册年份曲线图", notes = "注册年份曲线图")
 	@GetMapping(value = GeographyRequestPath.DIAGRAM)
-	public CallBack<List<ProvinceVo>> diagram(GeographyForm form) {
+	public CallBack<ProvinceTZVo> diagram(GeographyForm form) {
 		return CallBack.success(geographysignService.diagram(form));
 	}
 	

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/controller/geographysign/FgResourceLibraryController.java

@@ -119,28 +119,8 @@ public class FgResourceLibraryController {
 			StringBuffer fqSq = new StringBuffer("id:*");
 			if (StringUtils.isNotBlank(form.getSumName())) {
 				// 进行数据切割
-				String str = form.getSumName();
-				String[] arr = str.split("\\s+");
-				
-				for (int i = 0; i < arr.length; i++) {
-					if (i == 0) {
-						fqSq.append(" && productName : " + arr[i] + " ");
-					}
-					if (i == 1) {
-						fqSq.append(" && wherePlace : " + arr[i] + " ");
-					}
-					if (i == 2) {
-						fqSq.append(" && applicant : " + arr[i] + " ");
-					}
-					if (i == 3) {
-						fqSq.append(" && protectRange : " + arr[i] + " ");
-					}
-					if (i == 4) {
-						fqSq.append(" && approvalEnterpriseName : " + arr[i] + " ");
-					}
-				
-					
-				}
+				String str = form.getSumName().replaceAll(" ", ""); ;
+				fqSq.append(" && productName : " + str + " ");
 			} else {
 				
 				//申请人企业

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/mapper/geographysign/GeographysignMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.geography.GeographyForm;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.geography.Category;
 import com.zrqx.core.model.geography.Geographysign;
 import com.zrqx.core.vo.Geographysign.CaregoryVo;
 import com.zrqx.core.vo.Geographysign.CountyTwoVo;
@@ -105,6 +106,9 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 			+ "<if test='"+NOTBLANK+"(form.province) '>"  
 			+ " and province = #{form.province} "
 			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ " and reserve1 = #{form.categoryOne}"
+			+ "</if>"
 			+ "   group by province,county" 
 		    + "</script>")
 	List<CountyTwoVo> querycity(@Param("form")GeographyForm form );
@@ -185,7 +189,7 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 	
 	/** 大屏图标总和数据查询*/
 	@Select("<script>" 
-			+ "select count(*)value,signState name from dl_geographysign where 1=1"
+			+ "select count(*)value,#{State} name from dl_geographysign where 1=1"
 			+ "<if test='"+NOTBLANK+"(form.province) '>"  
 			+ " and province = #{form.province} "
 			+ "</if>" 
@@ -212,7 +216,32 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 	
 	/** 大屏曲注册线图*/
 	@Select("<script>" 
-			+ "select count(*)value,reserve4 name,registerState from  dl_geographysign where 1 = 1 and  reserve4 is not null and registerState='已注册'"
+			+ "select count(*)value  from  dl_geographysign where 1 = 1 and  reserve4 is not null "
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " group by  reserve4 ORDER BY reserve4 DESC LIMIT 10"
+		    + "</script>")
+	List<Integer> diagram(@Param("form")GeographyForm form);
+	
+	
+	/** 大屏曲注册线图*/
+	@Select("<script>" 
+			+ "select count(*)value  from  dl_approvalenterprise where 1 = 1 and  reserve4 is not null "
 			+ "<if test='"+NOTBLANK+"(form.province) '>"  
 			+ " and province = #{form.province} "
 			+ "</if>" 
@@ -230,10 +259,33 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
 			+ "and reserve1 = #{form.categoryOne}"
 			+ "</if>"
-			+ " group by  reserve4 ORDER BY reserve4"
+			+ " group by  reserve4 ORDER BY reserve4 DESC LIMIT 10"
 		    + "</script>")
-	List<ProvinceVo> diagram(@Param("form")GeographyForm form);
+	List<Integer> diagramhz(@Param("form")GeographyForm form);
 	
+	/** 大屏曲注册线图日期*/
+	@Select("<script>" 
+			+ "select reserve4 value  from  dl_geographysign where 1 = 1 and  reserve4 is not null "
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " group by  reserve4 ORDER BY reserve4 DESC LIMIT 10"
+		    + "</script>")
+	List<String> diagramdate(@Param("form")GeographyForm form);
 	
 	
 	/** 地理标志申请机构*/
@@ -260,7 +312,7 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 		    + "</script>")
 	List<ProvinceVo> applicantAgency(@Param("form")GeographyForm form);
 	
-	/** 大屏省市县数量*/
+	/** 大屏省数量*/
 	@Select("<script>" 
 			+ "select count(*)value,province name from  dl_geographysign where 1 = 1 "
 			+ "<if test='"+NOTBLANK+"(form.province) '>"  
@@ -284,6 +336,30 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 		    + "</script>")
 	List<ProvinceVo> provincecount(@Param("form")GeographyForm form);
 	
+	/** 大屏省县数量*/
+	@Select("<script>" 
+			+ "select count(*)value,county name from  dl_geographysign where 1 = 1 "
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " group by  county"
+		    + "</script>")
+	List<ProvinceVo> provincecounty(@Param("form")GeographyForm form);
+	
 	
 	/** 大屏柱状图分类*/
 	@Select("<script>" 
@@ -311,7 +387,7 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 	
 	/** 大屏柱状图注册数据*/
 	@Select("<script>" 
-			+ "select count(reserve1) from dl_geographysign where 1 = 1 and registerState = '已注册'"
+			+ "select count(reserve1) from dl_geographysign where 1 = 1 "
 			+ "<if test='"+NOTBLANK+"(form.province) '>"  
 			+ " and province = #{form.province} "
 			+ "</if>" 
@@ -356,6 +432,14 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 			+ " GROUP BY reserve1  ORDER BY reserve1 desc"
 		    + "</script>")
 	List<Integer> approvalNumber(@Param("form")GeographyForm form);
+	
+	
+	
+	/** 大屏柱状图查询品类*/
+	@Select("<script>" 
+			+ "select name from dl_category oRDER BY name desc  "
+		    + "</script>")
+	List<String> categoryall();
 
 
 }

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignService.java

@@ -14,6 +14,7 @@ import com.zrqx.core.vo.Geographysign.CategoryDateVo;
 import com.zrqx.core.vo.Geographysign.CountyVo;
 import com.zrqx.core.vo.Geographysign.GeographysignVo;
 import com.zrqx.core.vo.Geographysign.ProvinceQueryVo;
+import com.zrqx.core.vo.Geographysign.ProvinceTZVo;
 import com.zrqx.core.vo.Geographysign.ProvinceVo;
 
 public interface GeographysignService extends BaseService<Geographysign, String>{
@@ -101,7 +102,7 @@ public interface GeographysignService extends BaseService<Geographysign, String>
 	 * 查询年份注册曲线图
 	 * @return
 	 */
-	List<ProvinceVo>  diagram(GeographyForm form);
+	ProvinceTZVo  diagram(GeographyForm form);
 	
 	/**
 	 * 地理标志申请机构

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import com.mysql.fabric.xmlrpc.base.Array;
 import com.zrqx.core.form.geography.GeographyForm;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.geography.Category;
 import com.zrqx.core.model.geography.Geographysign;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.CallBack;
@@ -26,6 +27,7 @@ import com.zrqx.core.vo.Geographysign.CountyTwoVo;
 import com.zrqx.core.vo.Geographysign.CountyVo;
 import com.zrqx.core.vo.Geographysign.GeographysignVo;
 import com.zrqx.core.vo.Geographysign.ProvinceQueryVo;
+import com.zrqx.core.vo.Geographysign.ProvinceTZVo;
 import com.zrqx.core.vo.Geographysign.ProvinceVo;
 import com.zrqx.geography.bg.mapper.geographysign.GeographysignMapper;
 
@@ -236,8 +238,19 @@ public class GeographysignServiceImpl extends BaseServiceImpl<Geographysign, Str
 	}
 
 	@Override
-	public List<ProvinceVo> diagram(GeographyForm form) {
-		return mapper.diagram(form);
+	public ProvinceTZVo diagram(GeographyForm form) {
+		
+		ProvinceTZVo vo =new ProvinceTZVo();
+		
+	     //标准企业
+		vo.setCaregorylist(mapper.diagram(form));
+		 //核准企业
+		vo.setApprovallist(mapper.diagramhz(form));
+		
+		//日期
+		vo.setApprovaldate(mapper.diagramdate(form));
+		
+		return vo;
 		
 	}
 
@@ -248,18 +261,49 @@ public class GeographysignServiceImpl extends BaseServiceImpl<Geographysign, Str
 
 	@Override
 	public List<ProvinceVo> provincecount(GeographyForm form) {
+		
+		if(StringUtils.isNotBlank(form.getProvince())) {
+		return mapper.provincecounty(form);
+		}else {
 		return mapper.provincecount(form);
+		}
+		
+		
 	}
 
 	@Override
 	public CategoryDateVo querycategory(GeographyForm form) {
 		CategoryDateVo category = new CategoryDateVo();
+		
+		//查询品类
+		List<String> categoryall =mapper.categoryall();
+		//注册数量
+		List<Integer> list = new ArrayList<>();
+		//核准数量
+		List<Integer> hzlist = new ArrayList<>();
+		for (String category2 : categoryall) {
+			form.setCategoryOne(category2);
+			//注册数量
+			List<Integer> count=mapper.registerNumber(form);
+			if(count.size()>0) {
+				list.add(count.get(0));
+				}else {
+				list.add(0);	
+				}
+			//核准数量
+			List<Integer> hzcount=mapper.approvalNumber(form);
+			if(hzcount.size()>0) {
+				hzlist.add(hzcount.get(0));
+				}else {
+				hzlist.add(0);	
+				}
+		}
 		//品类类型
-		category.setCategory(mapper.categorystate(form));
+		category.setCategory(categoryall);
 		//品类注册数量
-		category.setRegisterNumber(mapper.registerNumber(form));
+		category.setRegisterNumber(list);
 		//品类核准企业数量
-		category.setApprovalNumber(mapper.approvalNumber(form));
+		category.setApprovalNumber(hzlist);
 		
 		return category;
 	}