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; }