From cc51b41fa3dd6c51eef9028fbbb72ec3e7139d74 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:14 +0800
Subject: [PATCH] 添加字段
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
index 2945148..213bb71 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
@@ -5,10 +5,12 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
-import com.kidgrow.oprationcenter.service.feign.ISysRoleOrganizationService;
+import com.kidgrow.common.utils.DateUtil;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
import com.kidgrow.oprationcenter.mapper.SysProductMapper;
import com.kidgrow.oprationcenter.model.SysProduct;
import com.kidgrow.oprationcenter.service.ISysProductService;
+import com.kidgrow.oprationcenter.vo.ProductAllVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +32,8 @@
@Service
public class SysProductServiceImpl extends SuperServiceImpl<SysProductMapper, SysProduct> implements ISysProductService {
@Autowired
- private ISysRoleOrganizationService sysRoleOrganizationService;
+ private RoleOrganizationService roleOrganizationService;
+
/**
* 列表
* @param params
@@ -39,11 +42,41 @@
@Override
public PageResult<SysProduct> findList(Map<String, Object> params, SysUser sysUser){
Page<SysProduct> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = sysRoleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
params.putAll(roleOrgMap);
List<SysProduct> list = baseMapper.findList(page, params);
return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build();
}
+ /**
+ * 列表
+ * @param params
+ * @return
+ */
+ @Override
+ public PageResult<ProductAllVo> findAllList(Map<String, Object> params, SysUser sysUser){
+ List<ProductAllVo> list = baseMapper.findAllList(params);
+ if (list != null) {
+ for (int i = 0; i <list.size() ; i++) {
+ list.get(i).setBeginTime(new Date());
+ switch (list.get(i).getProTimeUnit())
+ {
+ //天
+ case 0:
+ list.get(i).setEndTime(DateUtil.addDays(new Date(),list.get(i).getProTime()));
+ break;
+ //月
+ case 1:
+ list.get(i).setEndTime(DateUtil.addMonths(new Date(),list.get(i).getProTime()));
+ break;
+ //年
+ case 2:
+ list.get(i).setEndTime(DateUtil.addYears(new Date(),list.get(i).getProTime()));
+ break;
+ }
+ }
+ }
+ return PageResult.<ProductAllVo>builder().data(list).code(0).count(0L).build();
+ }
/**
* 根据SysProduct对象当做查询条件进行查询
--
Gitblit v1.8.0