修改代码 参数

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -254,14 +254,14 @@ public class FailureDetailsController extends BaseController {
     @GetMapping(value = "/weblist")
     @ApiOperation(httpMethod = "GET", value = "Web端列表分页查询", notes = "Web端列表分页查询")
     public ResponseModel<IPage<FailureDetailsDto>> queryForPageList(@RequestParam(value = "current") Long current, @RequestParam
-            (value = "size") Long size, Long currentStatus,
-                                        String submissionName,
-                                        String startTime,
-                                        String endTime,
-                                        Integer  submissionBranchId,
-                                        Long sequenceNbr ) {
+            (value = "size") Long size, @RequestParam (required = false) Long currentStatus,
+                                                                    @RequestParam (required = false)String submissionName,
+                                                                    @RequestParam (required = false) String startTime,
+                                                                    @RequestParam (required = false) String endTime,
+                                                                    @RequestParam (required = false) Long  submissionBranchId,
+                                                                    @RequestParam (required = false) Long sequenceNbr ) {
         Page<FailureDetailsDto> page = new Page<>();
-        if (current > 0) {
+        if (current.longValue() > 0) {
             page.setCurrent((current - 1) * size);
         } else {
             page.setCurrent(current);
@@ -276,8 +276,8 @@ public class FailureDetailsController extends BaseController {
 
         BeanUtils.copyProperties(failureDetailsIPage, FailureDetailsDto.class);
         List<FailureDetailsDto> records = failureDetailsIPage.getRecords();
-        List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<>();
-        records.forEach(failureDetails -> {
+        List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<FailureDetailsDto>();
+        records.stream().forEach(failureDetails -> {
             FailureDetailsDto failureDetailsDto = new FailureDetailsDto();
             BeanUtils.copyProperties(failureDetails, failureDetailsDto);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -108,7 +108,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * web端列表查询
      */
     public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus,
-                                                            String startTime, String endTime, String submissionName, Integer  submissionBranchId,
+                                                            String startTime, String endTime, String submissionName, Long  submissionBranchId,
                                                   Long sequenceNbr ) {
 
         return  queryForPage(page,"",false,currentStatus,startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
@@ -122,7 +122,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
                                                     String startTime, String endTime, Integer userId) {
 
         if (userInfo.getRole().getRoleName().equals(roleName[0])) {
-            IPage<FailureDetails> wxIpage = new Page<>();
+            IPage<FailureDetails> wxIpage = new Page<FailureDetails>();
             List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(),currentStatus, startTime, endTime, userId);
             wxIpage.setRecords(list);
             return wxIpage;