From c09b3ab3688db4f01d5c8c93a5910c085943b03d Mon Sep 17 00:00:00 2001 From: 10002327 Date: Thu, 8 Aug 2024 14:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/user/material/MaterialHomeApi.java | 8 +++++- .../material/pojo/vo/MaterialHomeMainVO.java | 8 +++++- .../material/service/MaterialMainService.java | 28 +++++++++++++------ .../service/MaterialUpdateBillService.java | 15 +++++----- .../nflg/product/bomnew/api/user/EbomApi.java | 8 +++++- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java index f030b4d7..cf0a5621 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java @@ -16,6 +16,8 @@ import com.nflg.product.material.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import nflg.product.common.vo.ResultVO; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,6 +41,7 @@ import java.util.stream.Collectors; @Api(tags = "主数据平台首页") @RestController @RequestMapping("home") +@RefreshScope public class MaterialHomeApi extends BaseApi { @Resource @@ -62,6 +65,9 @@ public class MaterialHomeApi extends BaseApi { @Resource private StandardCategoryService standardCategoryService; + @Value("${material.home.day:30}") + private Integer homeDay; + @GetMapping("materialManagement") @ApiOperation("物料管理") public ResultVO>> materialManagement(){ @@ -88,7 +94,7 @@ public class MaterialHomeApi extends BaseApi { @ApiOperation("标准部件") public ResultVO>> standardPartList(){ //仅取90天内的数据 - Date date90 = DateUtil.offsetDay(new Date(),-90); + Date date90 = DateUtil.offsetDay(new Date(),-homeDay); Map> mp = Maps.newHashMap(); AuthorityDepartmentEntity auDept = authorityDepartmentService.getById(SessionUtil.getPartRowId()); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeMainVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeMainVO.java index 02630a3d..83cfaf34 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeMainVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeMainVO.java @@ -25,11 +25,17 @@ public class MaterialHomeMainVO implements Serializable { @ApiModelProperty(value = "物料名称") private String materialName; + @ApiModelProperty(value = "物料分类编码") + private String materialCategoryCode; + + + @ApiModelProperty(value = "对应的物料大类") + private String relCategoryCode; + @ApiModelProperty(value = "流程状态") private Integer processState; @ApiModelProperty(value = "流程状态名称") private String processStateName; - } \ No newline at end of file diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index 3d55cd58..8a0c744a 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -161,6 +161,9 @@ public class MaterialMainService extends ServiceImpl listByHome(Integer processState,Integer limitNums){ List rlist = Lists.newArrayList(); - //仅取90天内的数据 - Date date90 = DateUtil.offsetDay(new Date(),-90); + //仅取30天内的数据 + Date date90 = DateUtil.offsetDay(new Date(),-homeDay); LambdaQueryWrapper lw = Wrappers.lambdaQuery() .eq(MaterialMainEntity::getCreatedBy, SessionUtil.getUserCode()); //消息提醒，仅获取已驳回的记录 @@ -2895,18 +2898,27 @@ public class MaterialMainService extends ServiceImpl mainList = this.list(lw); - if(!mainList.isEmpty()){ + List categoryCodeList = mainList.stream().map(MaterialMainEntity::getMaterialCategoryCode) + .distinct().collect(Collectors.toList()); + + List categoryList = materialCategoryService.list(Wrappers.lambdaQuery() + .in(MaterialCategoryEntity::getCategoryCode,categoryCodeList)); + Map categoryMap = categoryList.stream().collect(Collectors + .toMap(MaterialCategoryEntity::getCategoryCode,MaterialCategoryEntity::getRelCategoryCode,(k1,k2)->k1)); + rlist = Convert.toList(MaterialHomeMainVO.class,mainList); - rlist.forEach(r -> r.setProcessStateName(Optional.ofNullable(MaterialProcessStateEnum.findDescriptionByValue(r.getProcessState())) - .map(MaterialProcessStateEnum::getDescription).orElse("") )); + rlist.forEach(r -> { + r.setProcessStateName(Optional.ofNullable(MaterialProcessStateEnum.findDescriptionByValue(r.getProcessState())) + .map(MaterialProcessStateEnum::getDescription).orElse("") ); + r.setRelCategoryCode(categoryMap.getOrDefault(r.getMaterialCategoryCode(),"")); + }); } return rlist; - } } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java index c7a42657..f5790539 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java @@ -39,6 +39,7 @@ import nflg.product.common.vo.ResultVO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; @@ -84,6 +85,9 @@ public class MaterialUpdateBillService extends ServiceImpl listByHome(Integer billState,Integer limitNums){ List rlist = Lists.newArrayList(); //仅取90天内的数据 - Date date90 = DateUtil.offsetDay(new Date(),-90); + Date date90 = DateUtil.offsetDay(new Date(),-homeDay); LambdaQueryWrapper lw = Wrappers.lambdaQuery() .eq(MaterialUpdateBillEntity::getCreatedBy,SessionUtil.getUserCode()); @@ -987,16 +991,12 @@ public class MaterialUpdateBillService extends ServiceImpl entityList = this.list(Wrappers.lambdaQuery() - .eq(MaterialUpdateBillEntity::getCreatedBy,SessionUtil.getUserCode()) - .eq(null != billState,MaterialUpdateBillEntity::getBillState,billState) - .ge(MaterialUpdateBillEntity::getCreatedTime,date90) - .orderByDesc(MaterialUpdateBillEntity::getCreatedTime) - .last(String.format("limit %d",limitNums))); + List entityList = this.list(lw); if(!entityList.isEmpty()){ entityList.forEach(e -> { MaterialHomeMainVO r = Convert.convert(MaterialHomeMainVO.class,e); @@ -1006,6 +1006,7 @@ public class MaterialUpdateBillService extends ServiceImpl>> byHome(){ Map> mp = Maps.newHashMap(); //仅取90天内的数据 - Date date90 = DateUtil.offsetDay(new Date(),-90); + Date date90 = DateUtil.offsetDay(new Date(),-homeDay); int limitNums = 5; List eList = bomNewEbomParentService.list(Wrappers.lambdaQuery() .eq(BomNewEbomParentEntity::getCreatedBy,SessionUtil.getUserCode()) .ge(BomNewEbomParentEntity::getCreatedTime,date90) + .orderByAsc(BomNewEbomParentEntity::getEditStatus) .orderByDesc(BomNewEbomParentEntity::getCreatedTime) .last(String.format("limit %d",limitNums))); List ebomList = Convert.toList(BomNewHomeBomVO.class,eList); @@ -581,6 +586,7 @@ public class EbomApi extends BaseApi { List pList = bomNewPbomParentService.list(Wrappers.lambdaQuery() .eq(BomNewPbomParentEntity::getCreatedBy,SessionUtil.getUserCode()) .ge(BomNewPbomParentEntity::getCreatedTime,date90) + .orderByAsc(BomNewPbomParentEntity::getEditStatus) .orderByDesc(BomNewPbomParentEntity::getCreatedTime) .last(String.format("limit %d",limitNums)));