存量合同2.0开发 接口补充

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HistoryPeasantHouseholdServiceImpl;
 import org.springframework.web.multipart.MultipartFile;
@@ -99,12 +103,16 @@ 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") int current,@RequestParam
-                    (value = "size") int size) {
+	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) {
 	    Page<HistoryPeasantHouseholdDto> page = new Page<HistoryPeasantHouseholdDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(historyPeasantHouseholdServiceImpl.queryForHistoryPeasantHouseholdPage(page));
+		List<String> strings = new ArrayList<>();
+	    if (StringUtils.isNotEmpty(ids)){
+			strings= Arrays.asList(ids.split(","));
+		}
+	    return ResponseHelper.buildResponse(historyPeasantHouseholdServiceImpl.queryForHistoryPeasantHouseholdPage(page,strings,ownersName,province,status));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HistoryPeasantHouseholdServiceImpl.java

@@ -14,6 +14,8 @@ import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,8 +38,8 @@ public class HistoryPeasantHouseholdServiceImpl extends BaseService<HistoryPeasa
     /**
      * 分页查询
      */
-    public Page<HistoryPeasantHouseholdDto> queryForHistoryPeasantHouseholdPage(Page<HistoryPeasantHouseholdDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<HistoryPeasantHouseholdDto> queryForHistoryPeasantHouseholdPage(Page<HistoryPeasantHouseholdDto> page, @Condition(Operator.in) List<String> sequenceNbr,@Condition(Operator.like) String ownersName ,@Condition(Operator.like) String province,@Condition(Operator.eq) String status)   {
+        return this.queryForPage(page, null, false,sequenceNbr,ownersName,province,status);
     }
 
     /**