--no commit message

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

@@ -12,6 +12,7 @@ import com.zrqx.core.constant.geography.GeographyRequestPath;
 import com.zrqx.core.form.geography.GeographyForm;
 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.ProvinceVo;
 import com.zrqx.geography.bg.service.geographysign.GeographysignService;
@@ -55,4 +56,10 @@ public class BigScreenController {
 		return CallBack.success(geographysignService.provincecount(form));
 	}
 	
+	@ApiOperation(value = "品类柱状图接口", notes = "品类柱状图接口")
+	@GetMapping(value = GeographyRequestPath.QUERYCATEGORY)
+	public CallBack<CategoryDateVo> querycategory(GeographyForm form) {
+		return CallBack.success(geographysignService.querycategory(form));
+	}
+
 }

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

@@ -159,6 +159,11 @@ public class FgResourceLibraryController {
 					fqSq.append(" && applicantAddress : " + form.getApplicantAddress() + " ");
 				}
 				
+				if (StringUtils.isNotBlank(form.getWherePlace())) {
+					// 关键词过滤
+					fqSq.append(" && wherePlace : " + form.getWherePlace() + " ");
+				}
+				
 				if (StringUtils.isNotBlank(form.getAgentOrganization())) {
 					// 关键词过滤
 					fqSq.append(" && agentOrganization : " + form.getAgentOrganization() + " ");