From 736db4b41f45c819bb7f0d163bb78245d7307e03 Mon Sep 17 00:00:00 2001 From: yxt_djz <313618925@qq.com> Date: Mon, 25 Jul 2022 15:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BA=93=E5=92=8C=E5=A4=96=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationDetailsVo.java | 4 ++++ .../BaseOutsourcingApplicationDto.java | 2 +- .../BaseOutsourcingApplicationService.java | 20 ++++++++++++++----- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java index 53ad1e08ff..c0a165dbb4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java @@ -28,6 +28,8 @@ package com.yxt.anrui.base.api.baseoutsourcingapplication; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo; +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -106,6 +108,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo { private String useOrgName; // 分公司名称 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("合同附件") + private CommonAppendixVo contract; // 备注 @ApiModelProperty("外采车辆列表") private List baseOutsourcingApplicationVehicleVos; // 外采车辆列表 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 71e4fae5ee..37989c36df 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -123,5 +123,5 @@ public class BaseOutsourcingApplicationDto implements Dto { @ApiModelProperty("外采车辆列表") private List baseOutsourcingApplicationVehicleDtos; // 外采车辆列表 @ApiModelProperty("合同附件信息") - private List contract; + private CommonAppendix contract; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 333831f584..dd6d4f62ee 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingA import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService; @@ -171,7 +172,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos(); - List contract = dto.getContract(); + CommonAppendix contract = dto.getContract(); String sid1 = entity.getSid(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) {//新增 @@ -211,10 +212,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(sid); baseOutsourcingApplicationDetailsVo.setBaseOutsourcingApplicationVehicleVos(baseOutsourcingApplicationVehicleVos); + + List commonAppendixVos = commonAppendixService.selByLinkSid( sid); + if(commonAppendixVos!=null&&commonAppendixVos.size()>0){ + baseOutsourcingApplicationDetailsVo.setContract(commonAppendixVos.get(0)); + } + return rb.success().setData(baseOutsourcingApplicationDetailsVo); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 8b32152125..a8effc044b 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -16,7 +16,7 @@ public enum ProcDefEnum { VEHICLEAPPLY("排产申请流程", "process_9egcg169:4:255004"),//TODO // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO RECORDAPPLICATION("入账申请", "process_xbwq2c7p:1:285008"),//TODO - SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:237508"), + SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:5:292504"),//ToDo SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"),