From 9517c8b86a593e0dc5143ebb6c797e9d743c091f Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 29 Jun 2023 18:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleEntity.java | 8 ++- .../entity/DistributionStockListEntity.java | 2 + .../DistributionStockArticleController.java | 62 +++++++++++++------ 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index b0efb9d57..ae0a303ec 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -105,7 +105,7 @@ public class DistributionStockArticleEntity extends TenantEntity { * 在库时间 */ @ApiModelProperty(value = "在库时间") - private Integer storeTime; + private String storeTime; /** * 订单总件数 */ @@ -121,6 +121,12 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "是否齐套") private Integer completeSet; + /** + * 是否齐套名称 + */ + @ApiModelProperty(value = "是否齐套名称") + @TableField(exist = false) + private String completeSetName; /** * 品牌 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index 5a2feaa01..5445272ca 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; @@ -146,6 +147,7 @@ public class DistributionStockListEntity extends TenantEntity { * 预约数量 */ @ApiModelProperty(value = "预约数量") + @TableField(exist = false) private Integer reservationNum; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 2975c1b94..75d16dc7d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -45,6 +45,9 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; + +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -84,29 +87,52 @@ public class DistributionStockArticleController extends BladeController { public R> list(@ApiIgnore @RequestParam Map distributionStockArticle, Query query) { IPage pages = distributionStockArticleService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class)); pages.getRecords().forEach( i ->{ - R> distribution_type = dictBizClient.getList("distribution_type"); - DictBiz dictBiz = distribution_type.getData().get(i.getTypeService()-1); - i.setTypeName(dictBiz.getDictValue()); - switch (i.getState()){ + //计算在库天数 +// SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + long time1 = i.getWarehouseEntryTime().getTime(); //入库 + long time2 = new Date().getTime(); // 现在 + int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24)); +// int hours = (int) ((time2 - time1) / (1000 * 60 * 60)); +// int minutes = (int) ((time2 - time1) / (1000 * 60)); +// i.setStoreTime(days+"天"+hours+"小时"+minutes+"分钟"); + if(days == 0){ + days = 1; + } + i.setStoreTime(days+"天"); + switch (i.getCompleteSet()){ case 1: - i.setStateName("待预约"); + i.setCompleteSetName("否"); break; case 2: - i.setStateName("已预约"); - break; - case 3: - i.setStateName("待配送"); - break; - case 4: - i.setStateName("配送中"); - break; - case 5: - i.setStateName("已配送"); - break; - case 6: - i.setStateName("已完成"); + i.setCompleteSetName("是"); break; } + R> distribution_type = dictBizClient.getList("distribution_type"); + if(Func.isNotEmpty(distribution_type.getData())){ + DictBiz dictBiz = distribution_type.getData().get(i.getTypeService()-1); + i.setTypeName(dictBiz.getDictValue()); + switch (i.getState()){ + case 1: + i.setStateName("待预约"); + break; + case 2: + i.setStateName("已预约"); + break; + case 3: + i.setStateName("待配送"); + break; + case 4: + i.setStateName("配送中"); + break; + case 5: + i.setStateName("已配送"); + break; + case 6: + i.setStateName("已完成"); + break; + } + } + }); return R.data(pages); }