From 00788a1299d764b48e57fd457a2656f0bf3474b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 11:28:47 +0800
Subject: [PATCH] 修改 为https 后兼容以前的http 数据
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
index 0a853f6..775c24e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
@@ -80,9 +80,21 @@
@Override
public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) {
Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
- params.putAll(roleOrgMap);
+// Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
+// params.putAll(roleOrgMap);
List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params);
+ for (ProductOrderJoinDetail productOrderJoinDetail : list) {
+ Date proBegintime = productOrderJoinDetail.getProBegintime();
+ Date proEndtime = productOrderJoinDetail.getProEndtime();
+ Date nowDate = new Date();
+ if(nowDate.getTime()<proBegintime.getTime()){
+ productOrderJoinDetail.setUseType("未使用");
+ }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
+ productOrderJoinDetail.setUseType("使用中");
+ }else if(nowDate.getTime()>=proEndtime.getTime()){
+ productOrderJoinDetail.setUseType("已结束");
+ }
+ }
return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
--
Gitblit v1.8.0