From f3a984a3bda0e9f92a3e4d22e5ac464545ccbfc8 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 26 Aug 2022 18:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98+=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemodelconfig/BaseModelConfigMapper.xml | 2 +- .../biz/basevehicle/BaseVehicleMapper.xml | 5 +- .../biz/basevehicle/BaseVehicleService.java | 4 +- .../BusVehicleApplyService.java | 52 ++++++++++++++++--- 4 files changed, 53 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 302c38b6db..a970d9e626 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -552,7 +552,7 @@ and bv.useOrgSid = #{orgSid}) AS nowCarNum, (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo - LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid + LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid and bo.state = 0) AS produceCarNum diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 955b5e933d..8b88d764ba 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -337,7 +337,8 @@ bvm.announcementModel, bvm.specifications, bmc.packingCase, - bvm.insideCode + bvm.insideCode, + bmc.rearAxleValue FROM base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid @@ -569,7 +570,7 @@ #{useOrgSid}) AS nowCarNum, (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo - LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid + LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid where bo.useOrgSid = #{useOrgSid} AND bd.vehicleSid = bvm.sid AND bo.state = 0) AS produceCarNum FROM base_vehicle_model bvm LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 2ce7cbf88b..a8ee343fdd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -535,6 +535,7 @@ public class BaseVehicleService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, busVehicleApply); return voResultBean; } if (r == 2) { @@ -522,8 +530,20 @@ public class BusVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } return rb.success().setData(resultBean.getData()); } else { @@ -659,8 +679,28 @@ public class BusVehicleApplyService extends MybatisBaseService map = BeanUtil.beanToMap(ufVo); //更新业务中的流程相关的参数 updateFlowFiled(map); + //极光推送 busVehicleApply = fetchBySid(businessSid); - String msgSid = getMessage(ufVo, appMap, busVehicleApply); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo,messageFlowVo); + String procId = busVehicleApply.getProcInstId(); + ufVo.setProcInsId(procId); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("厂家采购申请"); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())){ + messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); + }else{ + messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + } + + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } }