diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanQuery.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanQuery.java index c8d1bee..c1467a5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanQuery.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanQuery.java @@ -45,11 +45,11 @@ public class PurchasePlanQuery implements Serializable { @ApiModelProperty(value = "档口id") private String stallId; - @ApiModelProperty("合同开始时间") + @ApiModelProperty("开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateTime; - @ApiModelProperty("合同结束时间") + @ApiModelProperty("结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java index d0df2d6..1279a97 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java @@ -161,10 +161,10 @@ public class PurchaseContractVO extends BaseEntity { @ApiModelProperty(value = "付款备注") private String payRemark; - /** 合同附件,多个则逗号分隔 */ - @Excel(name = "合同附件,多个则逗号分隔") - @ApiModelProperty(value = "合同附件,多个则逗号分隔") - private String contractAttachment; +// /** 合同附件,多个则逗号分隔 */ +// @Excel(name = "合同附件,多个则逗号分隔") +// @ApiModelProperty(value = "合同附件,多个则逗号分隔") +// private String contractAttachment; /** 负责人 */ @Excel(name = "负责人") @@ -183,6 +183,9 @@ public class PurchaseContractVO extends BaseEntity { @ApiModelProperty(value = "供应商名称") private String supplierName; + @ApiModelProperty(value = "合同附件") + private List contractAttachmentList; + private List purchaseContractDetailList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java index 63cb025..b64157b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Objects; import cn.hutool.core.collection.CollUtil; +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.bonus.canteen.core.ims.domain.PurchaseContractDetail; import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum; import com.bonus.canteen.core.ims.domain.constants.PurchaseContractStatusEnum; @@ -19,6 +20,7 @@ import com.bonus.canteen.core.ims.service.IPurchaseContractDetailService; import com.bonus.canteen.core.ims.utils.NoGenerateUtils; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -56,8 +58,20 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService { purchaseContractDetail.setContractId(contractId); List purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail); purchaseContract.setPurchaseContractDetailList(purchaseContractDetails); + String contractAttachments = purchaseContract.getContractAttachment(); + List finalAttachmentList = new ArrayList<>(); + if(StringUtils.isNotBlank(contractAttachments)) { + String[] contractAttachmentList = StringUtils.split(contractAttachments, ","); + if(Objects.nonNull(contractAttachmentList)) { + for(String contractAttachment : contractAttachmentList) { + String finalAttachment = FileUrlUtil.getFileUrl(contractAttachment); + finalAttachmentList.add(finalAttachment); + } + } + } calContractStatus(purchaseContract); purchaseContractVO = new PurchaseContractVO(); + purchaseContractVO.setContractAttachmentList(finalAttachmentList); BeanUtils.copyProperties(purchaseContract, purchaseContractVO); if(CollUtil.isNotEmpty(purchaseContractDetails)) { List purchaseContractDetailVOList = new ArrayList<>();