From 0b81c18f0c2f74b2b6cb3b7279f4384eb125671e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 9 Feb 2023 13:54:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordService.java | 46 ++++++++++++++++++- .../ScmVehicleInventoryService.java | 13 ++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e5db0e84e7..1b504071ca 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; @@ -63,6 +64,9 @@ import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MsgTargetUriEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -120,6 +124,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -236,8 +242,44 @@ public class FinPaymentrecordService extends MybatisBaseService recipientSidList = new ArrayList<>(); + String remarks = finPaymentrecord.getRemarks(); + remarks = remarks.substring(0, 2); + if ("外采".equals(remarks)){ + BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData(); + String createBySid = baseOutsourcingApplicationDetailsVo.getCreateBySid(); + recipientSidList.add(createBySid); + Map appMap = new HashMap<>(); + appMap.put("sid", ""); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); + query.setMsgTitle("付款确认通知"); + query.setMsgContent("付款申请已确认通过"); + query.setMsgSource("财务管理"); + query.setMsgTargetUri(""); + query.setApp_type("2"); + query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); + query.setName("财务管理"); + messageFeign.sendMessage(query); + }else if ("排产".equals(remarks)){ + BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData(); + String createBySid = busVehicleApplyDetailsVo.getCreateBySid(); + recipientSidList.add(createBySid); + Map appMap = new HashMap<>(); + appMap.put("sid", ""); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); + query.setMsgTitle("付款确认通知"); + query.setMsgContent("付款申请已确认通过"); + query.setMsgSource("财务管理"); + query.setMsgTargetUri(""); + query.setApp_type("2"); + query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); + query.setName("财务管理"); + messageFeign.sendMessage(query); + } } return rb.success(); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index 066e76871b..b17cd58d22 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmvehicleinventory.*; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; @@ -121,6 +122,18 @@ public class ScmVehicleInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehicleInventoryVo record : pagging.getRecords()) { + String sid = record.getSid(); + List scmFileVos = scmFileService.fetchByMainSid(sid); + ArrayList filePaths = new ArrayList<>(); + for (ScmFileVo scmFileVo : scmFileVos) { + String filePath = scmFileVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + filePaths.add(filePath); + } + record.setImages(filePaths); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } From 2d80127661ce093f3c312ed350ade8ff93c890db Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 9 Feb 2023 15:38:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehinstallmodel.java | 18 +++++++++++------ .../BaseVehinstallmodelDetailsVo.java | 20 ++++++++++++------- .../BaseVehinstallmodelDto.java | 20 ++++++++++++------- .../biz/basetrailer/BaseTrailerService.java | 2 +- .../basevehinstall/BaseVehinstallRest.java | 3 ++- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java index aa01c4c447..44734a34fe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodel.java @@ -86,14 +86,20 @@ public class BaseVehinstallmodel extends BaseEntity { private String plateThicknessBottom; // 板材厚度_底 @ApiModelProperty("板材厚度_边") private String plateThicknessEdge; // 板材厚度_边 - @ApiModelProperty("篷布滑道") - private String tarpaulinSlide; // 篷布滑道 + @ApiModelProperty("篷布滑道key") + private String tarpaulinSlideKey; // 篷布滑道key + @ApiModelProperty("篷布滑道value") + private String tarpaulinSlide; // 篷布滑道value @ApiModelProperty("冷藏冷机") private String refrigerator; // 冷藏冷机 - @ApiModelProperty("自卸液压盖板") - private String selfUnHyCoPl; // 自卸液压盖板 - @ApiModelProperty("底板加热") - private String floorHeating; // 底板加热 + @ApiModelProperty("自卸液压盖板key") + private String selfUnHyCoPlKey; // 自卸液压盖板key + @ApiModelProperty("自卸液压盖板value") + private String selfUnHyCoPl; // 自卸液压盖板value + @ApiModelProperty("底板加热key") + private String floorHeatingKey; // 底板加热key + @ApiModelProperty("底板加热value") + private String floorHeating; // 底板加热value @ApiModelProperty("更多配置") private String moreConfig; // 更多配置 @ApiModelProperty("使用组织") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java index 195fce369a..1fbc74ac9c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java @@ -87,14 +87,20 @@ public class BaseVehinstallmodelDetailsVo implements Vo { private String plateThicknessBottom; // 板材厚度_底 @ApiModelProperty("板材厚度_边") private String plateThicknessEdge; // 板材厚度_边 - @ApiModelProperty("篷布滑道") - private String tarpaulinSlide; // 篷布滑道 - @ApiModelProperty("冷藏冷机") + @ApiModelProperty("篷布滑道key") + private String tarpaulinSlideKey; // 篷布滑道key + @ApiModelProperty("篷布滑道value") + private String tarpaulinSlide; // 篷布滑道value + @ApiModelProperty("冷藏冷机") private String refrigerator; // 冷藏冷机 - @ApiModelProperty("自卸液压盖板") - private String selfUnHyCoPl; // 自卸液压盖板 - @ApiModelProperty("底板加热") - private String floorHeating; // 底板加热 + @ApiModelProperty("自卸液压盖板key") + private String selfUnHyCoPlKey; // 自卸液压盖板key + @ApiModelProperty("自卸液压盖板value") + private String selfUnHyCoPl; // 自卸液压盖板value + @ApiModelProperty("底板加热key") + private String floorHeatingKey; // 底板加热key + @ApiModelProperty("底板加热value") + private String floorHeating; // 底板加热value @ApiModelProperty("更多配置") private String moreConfig; // 更多配置 @ApiModelProperty("使用组织") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java index ad76c122f4..60f384ed05 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java @@ -94,14 +94,20 @@ public class BaseVehinstallmodelDto implements Dto { @ApiModelProperty("板材厚度_边") @NotBlank(message = "板材厚度边不能为空") private String plateThicknessEdge; // 板材厚度_边 - @ApiModelProperty("篷布滑道") - private String tarpaulinSlide; // 篷布滑道 - @ApiModelProperty("冷藏冷机") + @ApiModelProperty("篷布滑道key") + private String tarpaulinSlideKey; // 篷布滑道key + @ApiModelProperty("篷布滑道value") + private String tarpaulinSlide; // 篷布滑道value + @ApiModelProperty("冷藏冷机") private String refrigerator; // 冷藏冷机 - @ApiModelProperty("自卸液压盖板") - private String selfUnHyCoPl; // 自卸液压盖板 - @ApiModelProperty("底板加热") - private String floorHeating; // 底板加热 + @ApiModelProperty("自卸液压盖板key") + private String selfUnHyCoPlKey; // 自卸液压盖板key + @ApiModelProperty("自卸液压盖板value") + private String selfUnHyCoPl; // 自卸液压盖板value + @ApiModelProperty("底板加热key") + private String floorHeatingKey; // 底板加热key + @ApiModelProperty("底板加热value") + private String floorHeating; // 底板加热value @ApiModelProperty("更多配置") private String moreConfig; // 更多配置 @ApiModelProperty("使用组织") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index a0715d9569..9930d9dca3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -286,7 +286,7 @@ public class BaseTrailerService extends MybatisBaseService