Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HistoryPeasantHouseholdController.java

@@ -112,8 +112,8 @@ public class HistoryPeasantHouseholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "存量合同电站分页查询",  notes = "存量合同电站分页查询")
-	public ResponseModel<Page<HistoryPeasantHouseholdDto>> queryForPage(@RequestParam(value = "current",required = false) int current,@RequestParam
-                    (value = "size",required = false) int size,@RequestParam(value = "ownersName",required = false) String ownersName , @RequestParam(value = "status",required = false) String status, @RequestParam(value = "province",required = false) String province, @RequestParam(value = "ids",required = false) String ids) {
+	public ResponseModel<Page<HistoryPeasantHouseholdDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size,@RequestParam(value = "ownersName",required = false) String ownersName , @RequestParam(value = "status",required = false) String status, @RequestParam(value = "province",required = false) String province, @RequestParam(value = "ids",required = false) String ids) {
 	    Page<HistoryPeasantHouseholdDto> page = new Page<HistoryPeasantHouseholdDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -124,6 +124,29 @@ public class HistoryPeasantHouseholdController extends BaseController {
 	    return ResponseHelper.buildResponse(historyPeasantHouseholdServiceImpl.queryForHistoryPeasantHouseholdPage(page,strings,ownersName,province,status));
 	}
 
+
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getByIds")
+	@ApiOperation(httpMethod = "GET",value = "存量合同电站分页查询",  notes = "存量合同电站分页查询")
+	public ResponseModel<Page<HistoryPeasantHouseholdDto>> getByIds(@RequestParam(value = "ownersName",required = false) String ownersName , @RequestParam(value = "status",required = false) String status, @RequestParam(value = "province",required = false) String province, @RequestParam(value = "ids",required = false) String ids) {
+		Page<HistoryPeasantHouseholdDto> page = new Page<HistoryPeasantHouseholdDto>();
+		page.setCurrent(1);
+		page.setSize(Integer.MAX_VALUE);
+		List<String> strings = new ArrayList<>();
+		if (StringUtils.isNotEmpty(ids)){
+			strings= Arrays.asList(ids.split(","));
+		}
+		return ResponseHelper.buildResponse(historyPeasantHouseholdServiceImpl.queryForHistoryPeasantHouseholdPage(page,strings,ownersName,province,status));
+	}
+
 	/**
 	 * 列表全部数据查询
      *