bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-07-02 14:17:54 +08:00
parent e4926b4bc6 26f42b4308
commit 4c7f439d65
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanQuery.java
View File

@ -45,11 +45,11 @@ public class PurchasePlanQuery implements Serializable {
@ApiModelProperty(value = "档口id") @ApiModelProperty(value = "档口id")
private String stallId; private String stallId;
@ApiModelProperty("合同开始时间") @ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDateTime; private LocalDateTime startDateTime;
@ApiModelProperty("合同结束时间") @ApiModelProperty("结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDateTime; private LocalDateTime endDateTime;

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java
View File

@ -161,10 +161,10 @@ public class PurchaseContractVO extends BaseEntity {
@ApiModelProperty(value = "付款备注") @ApiModelProperty(value = "付款备注")
private String payRemark; private String payRemark;
/** 合同附件，多个则逗号分隔 */ // /** 合同附件，多个则逗号分隔 */
@Excel(name = "合同附件，多个则逗号分隔") // @Excel(name = "合同附件，多个则逗号分隔")
@ApiModelProperty(value = "合同附件，多个则逗号分隔") // @ApiModelProperty(value = "合同附件，多个则逗号分隔")
private String contractAttachment; // private String contractAttachment;
/** 负责人 */ /** 负责人 */
@Excel(name = "负责人") @Excel(name = "负责人")
@ -183,6 +183,9 @@ public class PurchaseContractVO extends BaseEntity {
@ApiModelProperty(value = "供应商名称") @ApiModelProperty(value = "供应商名称")
private String supplierName; private String supplierName;
@ApiModelProperty(value = "合同附件")
private List<String> contractAttachmentList;
private List<PurchaseContractDetailVO> purchaseContractDetailList; private List<PurchaseContractDetailVO> purchaseContractDetailList;
} }

14
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import cn.hutool.core.collection.CollUtil; 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.PurchaseContractDetail;
import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum; import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum;
import com.bonus.canteen.core.ims.domain.constants.PurchaseContractStatusEnum; 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.canteen.core.ims.utils.NoGenerateUtils;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -56,9 +58,21 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
purchaseContractDetail.setContractId(contractId); purchaseContractDetail.setContractId(contractId);
List<PurchaseContractDetail> purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail); List<PurchaseContractDetail> purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
purchaseContract.setPurchaseContractDetailList(purchaseContractDetails); purchaseContract.setPurchaseContractDetailList(purchaseContractDetails);
String contractAttachments = purchaseContract.getContractAttachment();
List<String> 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); calContractStatus(purchaseContract);
purchaseContractVO = new PurchaseContractVO(); purchaseContractVO = new PurchaseContractVO();
BeanUtils.copyProperties(purchaseContract, purchaseContractVO); BeanUtils.copyProperties(purchaseContract, purchaseContractVO);
purchaseContractVO.setContractAttachmentList(finalAttachmentList);
if(CollUtil.isNotEmpty(purchaseContractDetails)) { if(CollUtil.isNotEmpty(purchaseContractDetails)) {
List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>(); List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>();
purchaseContractDetails.forEach(detail -> { purchaseContractDetails.forEach(detail -> {