From 507057ef177c0f7e3fd522660474cefb8850bee5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 22 Jan 2019 09:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81?= =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxCUserBasicInfoServiceImpl.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 25 ++++++++++++++++++- .../resources/mapper/WxCarPayRecordMapper.xml | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 68d1e3a42..0a25e835e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -678,7 +678,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { cell2.setCellValue(entity.getPhone()); cell3.setCellValue(sdf.format(entity.getEntranceTime())); cell4.setCellValue(sdf.format(entity.getExitTime())); - cell5.setCellValue(entity.getStayedTime()/60); + cell5.setCellValue(entity.getStayedTime()); cell6.setCellValue(entity.getFee()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 2c859e112..0db8484b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -167,9 +167,21 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(); } + public static void main(String[] args) { + System.out.println(11%11); + } + @Override public ResultData list(Integer flowType, Integer pageNum, Integer pageSize,Long userId) { String flowKey = getFlowKeyByType(flowType); + int total = taskService.createTaskQuery().processDefinitionKey(flowKey) + .taskCandidateUser(userId.toString()).list().size(); + int pages; + if(total % pageSize == 0){ + pages = total / pageSize; + }else{ + pages = total / pageSize +1; + } List tasks = taskService.createTaskQuery().processDefinitionKey(flowKey) .taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc().listPage((pageNum -1) * pageSize,pageSize); @@ -194,7 +206,18 @@ public class WxFlowServiceImpl implements WxFlowService { } } PageHelper.startPage(pageNum, pageSize); - PageInfo> pageInfo = new PageInfo<>(result,pageSize); + PageInfo> pageInfo = new PageInfo<>(result); + pageInfo.setPages(pages); + if(pageNum < pages){ + pageInfo.setHasNextPage(true); + }else{ + pageInfo.setHasNextPage(false); + } + if(pageNum <= 1){ + pageInfo.setHasPreviousPage(false); + }else{ + pageInfo.setHasNextPage(true); + } return new ResultData(pageInfo); } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index 9685ecdeb..3c4e5949b 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -29,7 +29,7 @@ `id`,`tenant_id`,`vendor_type`,`create_date`,`update_date`,syn_id,park_id,park_name,user_type, plate_number,entrance_time,exit_time,fee,fee_time,coupon,coupon_code,fix_parking_id,remaining_days,discount_amount,phone - ,paid_service_fee,create_date,update_date,stayed_time + ,paid_service_fee,create_date,update_date,floor(stayed_time/60) stayed_time