From 22cc779aff6d1ff2174e2cd4cfcb64ebe22f698f Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期二, 28 十一月 2023 13:28:41 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/service/impl/IntegralDetailServiceImpl.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/service/impl/IntegralDetailServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/service/impl/IntegralDetailServiceImpl.java index fdb0edc..9e9c823 100644 --- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/service/impl/IntegralDetailServiceImpl.java +++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/service/impl/IntegralDetailServiceImpl.java @@ -8,6 +8,7 @@ import com.thhy.general.utils.UUIDUtils; import com.thhy.general.utils.UserInfoUtils; import com.thhy.secure.modules.biz.integralAccount.entity.IntegralAccountEntity; +import com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto; import com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailEntity; import com.thhy.secure.modules.biz.integralAccount.mapper.IntegralDetailMapper; import com.thhy.secure.modules.biz.integralAccount.service.IntegralDetailService; @@ -114,7 +115,7 @@ public BasicResult delete(String id){ Map map =new HashMap(); map.put("id",id); - IntegralDetailEntity integralDetailEntity = integralDetailMapper.selectSafeIntegralInfo(map).get(0); + IntegralDetailDto integralDetailEntity = integralDetailMapper.selectSafeIntegralInfo(map).get(0); Double integralWater = integralDetailEntity.getIntegralWater();//获取消耗积分 Map account = new HashMap(); account.put("userId",integralDetailEntity.getUserId()); @@ -169,7 +170,7 @@ int pageSize = (int) map.get("pageSize"); PageHelper.startPage(pageNum,pageSize); map.put("companyId",companyId); - List<IntegralDetailEntity> integralDetailEntities = integralDetailMapper.selectSafeIntegralInfo(map); + List<IntegralDetailDto> integralDetailEntities = integralDetailMapper.selectSafeIntegralInfo(map); map.put("data",new PageInfo<>(integralDetailEntities)); return BasicResult.success(map); } @@ -181,6 +182,14 @@ map.put("companyId",companyId); List<IntegralDetailEntity> integralDetailEntities = integralDetailMapper.selectPageList(map); + integralDetailEntities.forEach(obj->{ + if(obj.getUserType() ==1){ + obj.setUserTypeName("管服人员"); + } + if(obj.getUserType() ==2){ + obj.setUserTypeName("劳务人员"); + } + }); ExcelUtils.downExcel(integralDetailEntities,IntegralDetailEntity.class,rsp,"班组列表"); } @@ -188,11 +197,26 @@ public void exportSafeIntegralInfo(Map map, HttpServletResponse rsp) { SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo(); String companyId = sysUserInfo.getCompanyId(); + IntegralAccountEntity integralAccountEntity = integralDetailMapper.selectByOne(map); map.put("integral",integralAccountEntity.getTotalIntegral()); map.put("companyId",companyId); - List<IntegralDetailEntity> integralDetailEntities = integralDetailMapper.selectSafeIntegralInfo(map); - ExcelUtils.downExcel(integralDetailEntities,IntegralDetailEntity.class,rsp,"班组列表"); + List<IntegralDetailDto> integralDetailEntities = integralDetailMapper.selectSafeIntegralInfo(map); + integralDetailEntities.forEach(obj->{ + if(obj.getUserType() ==1){ + obj.setUserTypeName("管服人员"); + } + if(obj.getUserType() ==2){ + obj.setUserTypeName("劳务人员"); + } + if(obj.getType() == 1){ + obj.setTypeName("获取"); + } + if(obj.getType() == 2){ + obj.setTypeName("消耗"); + } + }); + ExcelUtils.downExcel(integralDetailEntities,IntegralDetailDto.class,rsp,"班组列表"); } } -- Gitblit v1.9.3