修改巡检统计

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyPreCtrlController.java

@@ -9,12 +9,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -203,7 +198,10 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "巡检执行情况查询", notes = "巡检执行情况查询")
 	@RequestMapping(value = "/checkExecute/listNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	public HashMap<String, Object> findChkExListNew(@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
+	public HashMap<String, Object> findChkExListNew(@RequestParam(value = "pageSize") int pageSize, @RequestParam(value = "pageNumber") int pageNumber ) {
+		CommonPageable commonPageable = new CommonPageable();
+		commonPageable.setPageNumber(pageNumber-1);
+		commonPageable.setPageSize(pageSize);
 		ReginParams reginParams = getSelectedOrgInfo();
 		String loginOrgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
 		HashMap<String, Object>  checkChkExListBo= iPlanTaskService.getChkExListNew(loginOrgCode,commonPageable);
@@ -221,7 +219,10 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "风险点查询", notes = "风险点查询")
 	@RequestMapping(value = "/point/listNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	public HashMap<String, Object> findPointListNew(@ApiParam(value = "分页参数", required = false) CommonPageable commonPageable) {
+	public HashMap<String, Object> findPointListNew( @RequestParam(value = "pageSize") int pageSize,@RequestParam(value = "pageNumber") int pageNumber ) {
+		CommonPageable commonPageable = new CommonPageable();
+		commonPageable.setPageNumber(pageNumber-1);
+		commonPageable.setPageSize(pageSize);
 		ReginParams reginParams = getSelectedOrgInfo();
 		String loginOrgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
 		HashMap<String, Object>  checkChkExListBo= pointService.getCheckPtListNew(loginOrgCode,commonPageable);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1425,7 +1425,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         colModel.add(temph4);
         colModel.add(temph5);
         HashMap<String, Object> dataGridMock = new HashMap<>();
-        dataGridMock.put("current",result.getNumber());
+        dataGridMock.put("current",result.getNumber()+1);
         dataGridMock.put("total",result.getTotalElements());
         dataGridMock.put("pagination",true);
         dataGridMock.put("totalPage",result.getTotalPages());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1463,7 +1463,7 @@ public class PointServiceImpl implements IPointService {
         colModel.add(temph8);
 
         HashMap<String, Object> dataGridMock = new HashMap<>();
-        dataGridMock.put("current",result.getNumber());
+        dataGridMock.put("current",result.getNumber()+1);
         dataGridMock.put("total",result.getTotalElements());
         dataGridMock.put("pagination",true);
         dataGridMock.put("totalPage",result.getTotalPages());