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

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -6,8 +6,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 /**
  *  Mapper 接口
  *
@@ -19,5 +17,5 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
    public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
 
-   List<JyjcInspectionApplicationEquipModel> listByCategory(@Param("equipClassify") String equipClassify);
+   Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

@@ -13,5 +13,4 @@ import java.util.List;
 public interface IJyjcInspectionApplicationService {
     void deleteBatchData(List<Long> sequenceNbr);
 
-    List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -243,7 +243,13 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询指定设备种类的设备列表",   notes = "查询指定设备种类的设备列表")
 	@GetMapping(value = "/listByCategory")
-	public ResponseModel<List<JyjcInspectionApplicationEquipModel>> listByCategory(@RequestParam("equipClassify") String equipClassify) {
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(equipClassify));
+	public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory(
+			@RequestParam("current") int current,
+			@RequestParam("size") int size,
+			@RequestParam("equipClassify") String equipClassify) {
+		Page<JyjcInspectionApplicationEquipModel> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page,equipClassify));
 	}
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -107,8 +107,8 @@ public class JyjcInspectionResultController extends BaseController {
     @PostMapping(value = "/applicationUnitPage")
     @ApiOperation(httpMethod = "Post", value = "列表页面(报检单位）", notes = "列表页面(报检单位）")
     public ResponseModel<Page<JyjcInspectionResultModel>> applicationUnitQueryForPage(
-            @RequestBody int current, @RequestBody int size,
-			@RequestBody JyjcInspectionResultModel model) {
+            @RequestParam int current, @RequestParam int size,
+            @RequestBody JyjcInspectionResultModel model) {
         Page<JyjcInspectionResultModel> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
@@ -127,7 +127,7 @@ public class JyjcInspectionResultController extends BaseController {
     @PostMapping(value = "/inspectionUnitPage")
     @ApiOperation(httpMethod = "POST", value = "列表页面(检验检测单位）", notes = "列表页面(检验检测单位）")
     public ResponseModel<Page<JyjcInspectionResultModel>> inspectionUnitQueryForPage(
-            @RequestBody int current, @RequestBody int size,
+            @RequestParam int current, @RequestParam int size,
             @RequestBody JyjcInspectionResultModel model) {
         Page<JyjcInspectionResultModel> page = new Page<>();
         page.setCurrent(current);
@@ -149,7 +149,6 @@ public class JyjcInspectionResultController extends BaseController {
 		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(inspectResult));
 	}
 
-
     /**
      * 获取设备种类列表
      *

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -176,9 +176,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
-    @Override
-    public List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify) {
-        return getBaseMapper().listByCategory(equipClassify);
+    public Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,String equipClassify) {
+        return getBaseMapper().listByCategory(page,equipClassify);
     }