From 12a4028792f2df72465eb33ad88ed99e07f73c26 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Sat, 27 Aug 2022 18:14:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceService.java | 57 ++++++++++-- .../ScmVehicleGressionService.java | 6 +- .../ScmVehicleReturnService.java | 86 +++++++++++++++---- .../inspection/AppScmVehiclePatrolinVo.java | 3 +- 4 files changed, 123 insertions(+), 29 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index a889a71c0f..f8b390ec43 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -58,9 +58,7 @@ import com.yxt.common.base.utils.PagerUtil; 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.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowableDto; -import com.yxt.messagecenter.api.message.MessageJsonDto; +import com.yxt.messagecenter.api.message.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -232,7 +230,17 @@ public class BaseModelModpriceService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, baseModelModprice); return voResultBean; } if (r == 2) { @@ -313,13 +321,25 @@ public class BaseModelModpriceService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + +// String msgSid = getMessage(ufVo, appMap, baseModelModprice); } return rb.success().setData(resultBean.getData()); } else { @@ -379,7 +399,26 @@ public class BaseModelModpriceService extends MybatisBaseService> 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(baseModelModprice.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, baseModelModprice); return rb.success(); } } @@ -443,7 +482,7 @@ public class BaseModelModpriceService extends MybatisBaseService appMap, BaseModelModprice baseModelModprice) { //=====极光推送信息========================================参数组装 String procId = baseModelModprice.getProcInstId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); //根据用户的sid查询用户的id diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index d6430b9652..61758537a8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -661,7 +661,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); @@ -765,7 +765,7 @@ public class ScmVehicleGressionService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); @@ -863,7 +863,7 @@ public class ScmVehicleGressionService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 46466074a2..59db4d1387 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -47,9 +47,7 @@ import com.yxt.common.base.utils.StringUtils; 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.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowableDto; -import com.yxt.messagecenter.api.message.MessageJsonDto; +import com.yxt.messagecenter.api.message.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -255,9 +253,22 @@ public class ScmVehicleReturnService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid); - String msgSid = getMessage(uff, appMap, scmVehicleReturn); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("采购退库申请"); + messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(uff, appMap, scmVehicleReturn); return resultBean1; } return submitBusinessData(scmVehicleReturnDto, busSid, orgSidPath, variables); @@ -296,10 +307,22 @@ public class ScmVehicleReturnService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid); - String msgSid = getMessage(uff, appMap, scmVehicleReturn); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("采购退库申请"); + messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(uff, appMap, scmVehicleReturn); return resultBean1; } else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步 saveOrUpdateVehicleReturn(dto);//update @@ -340,9 +363,9 @@ public class ScmVehicleReturnService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); - bv.getFormVariables().put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + bv.getFormVariables().put("app", appMap); ResultBean rb1 = flowableFeign.handleProsess(bv); if (!rb1.getSuccess()) { return rb.setMsg(rb1.getMsg()); @@ -387,11 +410,24 @@ public class ScmVehicleReturnService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + +// String msgSid = getMessage(uff, appMap, scmVehicleReturn); } return rb1; } else { @@ -680,9 +716,9 @@ public class ScmVehicleReturnService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",flowTaskVo.getBusinessSid()); - fl.getValues().put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", flowTaskVo.getBusinessSid()); + fl.getValues().put("app", appMap); ResultBean resultBean = flowableFeign.taskReject(fl); UpdateFlowFieldVo data = resultBean.getData(); Map stringObjectMap = BeanUtil.beanToMap(resultBean.getData()); @@ -694,6 +730,26 @@ public class ScmVehicleReturnService extends MybatisBaseService> 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(scmVehicleReturn.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + String msgSid = getMessage(uff, appMap, scmVehicleReturn); return resultBean; } else { @@ -704,7 +760,7 @@ public class ScmVehicleReturnService extends MybatisBaseService appMap, ScmVehicleReturn scmVehicleReturn) { //=====极光推送信息========================================参数组装 String procId = scmVehicleReturn.getInstanceId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); //根据用户的sid查询用户的id diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java index ae7c22964e..df3c293900 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -49,7 +49,6 @@ public class AppScmVehiclePatrolinVo implements Vo { @ApiModelProperty(value = "定位地址") private String address; - @ApiModelProperty(value = "定位地址") - @JsonProperty("location") + @ApiModelProperty(value = "定位经纬度") private String addressCode; } From 21a848cc671b47fcde4f99357425f52bf46779ed Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 27 Aug 2022 18:39:54 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=9C=AA?= =?UTF-8?q?=E5=94=AE=E4=B9=B0=E6=96=AD=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualSalesService.java | 51 ++++++++++++++++--- .../BusVehicleApplyService.java | 1 - 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 7976fb8bbe..2a3ddfd618 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -36,9 +36,7 @@ import com.yxt.common.base.utils.PagerUtil; 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.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowableDto; -import com.yxt.messagecenter.api.message.MessageJsonDto; +import com.yxt.messagecenter.api.message.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -320,7 +318,17 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales); return voResultBean; } if (r == 2) { @@ -387,7 +395,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales); } return rb.success().setData(resultBean.getData()); @@ -480,7 +499,27 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> 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(baseVehicleActualSales.getCreateBySid())){ + messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); + }else{ + messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + } + + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales); return rb.success(); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index ed42f74556..8eb2af49a5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -532,7 +532,6 @@ public class BusVehicleApplyService extends MybatisBaseService Date: Sat, 27 Aug 2022 18:59:15 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=A4=96?= =?UTF-8?q?=E9=87=87=E7=94=B3=E8=AF=B7=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 --- .../BaseOutsourcingApplicationService.java | 135 +++++++++--------- 1 file changed, 71 insertions(+), 64 deletions(-) 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 1887b8a8f1..1a021da907 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 @@ -54,7 +54,6 @@ import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; @@ -80,8 +79,8 @@ 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.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowableDto; -import com.yxt.messagecenter.api.message.MessageJsonDto; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -391,10 +390,20 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService resultBean1 = flowableFeign.startProcess(bv); UpdateFlowFieldVo uff = resultBean1.getData(); updateFlowFiled(BeanUtil.beanToMap(uff)); - BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid); //======================添加消息推送开始 + BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(uff,messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("外采申请"); + messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); //极光推送 - String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); +// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return resultBean1; } @@ -429,8 +438,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return resultBean1; } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步 @@ -443,8 +462,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return rb; } else { @@ -520,8 +549,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); //======================添加消息推送结束 } @@ -701,8 +740,27 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> 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(baseOutsourcingApplication.getCreateBySid())){ + messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); + }else{ + messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + } + + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); +// String msgSid = getMessage(data, appMap, baseOutsourcingApplication); //======================添加消息推送结束 return resultBean; } else { @@ -800,55 +858,4 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService appMap, BaseOutsourcingApplication baseOutsourcingApplication) { - //=====极光推送信息========================================参数组装 - String procId = baseOutsourcingApplication.getProcInstSid(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - //根据用户的sid查询用户的id - ResultBean stringList1 = sysUserFeign.selectIdBySid(receiveSidList); - List reveiveIdList = Arrays.asList(stringList1.getData().split(",")); - MessageFlowableDto messageFlowableDto = new MessageFlowableDto(); - MessageJsonDto messageJsonDto = new MessageJsonDto(); - BeanUtil.copyProperties(ufVo, messageJsonDto); - //查询流程审批的页面操作地址组装json的参数 - //根据taskDef和移动端标识 - ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), ufVo.getTaskDefKey(), "1", "2"); - SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); - messageFlowableDto.setBusinessSid(baseOutsourcingApplication.getSid()); - messageFlowableDto.setApp_type("2"); - if (sysProUrlVo.getUrl().contains("#")) { - messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); - List codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList()); - int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray(); - messageJsonDto.setButtons(ints); - } else { - messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); - } - messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0)); - messageJsonDto.setTaskName(ufVo.getNodeState()); - messageJsonDto.setProcInsId(ufVo.getProcInsId()); - messageJsonDto.setAppMap(appMap); - messageFlowableDto.setJson(messageJsonDto); - messageFlowableDto.setList(receiveSidList); - messageFlowableDto.setReceiveIdList(reveiveIdList); - messageFlowableDto.setModuleName("外采申请"); - messageFlowableDto.setMsgContent("外采申请"); - messageFlowableDto.setMsgTitle("外采申请"); - messageFlowableDto.setCreateName(baseOutsourcingApplication.getCreateByName()); - messageFlowableDto.setTaskId(ufVo.getTaskId()); - ResultBean stringResultBean = messageFeign.getMessage(messageFlowableDto); - String msgSid = stringResultBean.getData(); - return msgSid; - - } } \ No newline at end of file From 404b01944c169a32eb02fde0c5c9812880f068e6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 27 Aug 2022 21:13:56 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B0=83?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInternalPurchaseService.java | 105 ++++++++++++++++++ .../flowable/CompanyShuntingDto.java | 6 +- .../CompanyShuntingService.java | 19 +--- 3 files changed, 114 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 44a0959c5b..eb46b138f8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -55,6 +55,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; @@ -76,6 +77,9 @@ import com.yxt.common.base.utils.PagerUtil; 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.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -122,6 +126,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService createQueryWrapper(BaseInternalPurchaseQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -342,6 +348,19 @@ public class BaseInternalPurchaseService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + //=======================消息推送结束 return voResultBean; } @@ -437,6 +456,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",bv.getBusinessSid()); + variables.put("app",appMap); + bv.setFormVariables(variables); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -503,6 +527,21 @@ public class BaseInternalPurchaseService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } return rb.success().setData(resultBean.getData()); } else { @@ -561,11 +600,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",bv.getBusinessSid()); + variables.put("app",appMap); + bv.setFormVariables(variables); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + //极光推送 + UpdateFlowFieldVo ufVo = resultBean.getData(); + baseInternalPurchase = fetchBySid(bv.getBusinessSid()); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo,messageFlowVo); + ufVo.setProcInsId(baseInternalPurchase.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); + messageFlowableQuery.setModuleName("分公司间调车申请"); + messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success().setData(resultBean.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); @@ -595,11 +653,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid",bv.getBusinessSid()); + variables.put("app",appMap); + bv.setFormVariables(variables); ResultBean resultBean1 = flowableFeign.handleProsess(bv); if (!resultBean1.getSuccess()) { return rb.setMsg(resultBean1.getMsg()); } updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); + //极光推送 + UpdateFlowFieldVo ufVo = resultBean1.getData(); + baseInternalPurchase = fetchBySid(bv.getBusinessSid()); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo,messageFlowVo); + ufVo.setProcInsId(baseInternalPurchase.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); + messageFlowableQuery.setModuleName("分公司间调车申请"); + messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success().setData(resultBean1.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); @@ -641,6 +718,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService appMap = new HashMap<>(); + appMap.put("sid",query.getBusinessSid()); + flowTaskVo.getValues().put("app",appMap); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -648,6 +728,31 @@ public class BaseInternalPurchaseService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); + + //极光推送 + UpdateFlowFieldVo ufVo = resultBean.getData(); + String businessSid = query.getBusinessSid(); + baseInternalPurchase = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo,messageFlowVo); + String procId = baseInternalPurchase.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(baseInternalPurchase.getCreateBySid())){ + messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); + }else{ + messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + } + + messageFlowableQuery.setMsgTitle("供应链"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java index 27c00f80d9..3797d18ff2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java @@ -1,13 +1,11 @@ package com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable; import com.fasterxml.jackson.annotation.JsonProperty; -import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.List; /** * @Author dimengzhe @@ -37,7 +35,9 @@ public class CompanyShuntingDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; - private List json; +// private List json; + + private String json; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java index da8e0463e0..335fed16ee 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java @@ -1,6 +1,8 @@ package com.yxt.anrui.terminal.biz.supplychain.companyShunting; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo; import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto; @@ -11,7 +13,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList; import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo; import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto; import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery; @@ -24,7 +25,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @Author dimengzhe @@ -79,16 +79,9 @@ public class CompanyShuntingService { public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) { ResultBean rb = ResultBean.fireFail(); - List list = dto.getJson(); - if (list.isEmpty()) { - return rb.setMsg("车辆list不能为空"); - } - List> dataList = list.stream().map(companyShuting -> { - Map map = new HashMap<>(); - map.put("sid", companyShuting.getSid()); - map.put("guidedPrice", companyShuting.getGuidedPrice()); - return map; - }).collect(Collectors.toList()); + String json = dto.getJson(); + List> list2 = JSON.parseObject(json, new TypeReference>>() { + }); Map map = new HashMap<>(); //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); @@ -104,7 +97,7 @@ public class CompanyShuntingService { String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto(); BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto); - map.put("baseInternalPurchaseVehicles", dataList); + map.put("baseInternalPurchaseVehicles", list2); baseInterNalPurchaseCompleteDto.setFormVariables(map); baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath); ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto); From 3ab600ceaac499fca0b9437a1210fd3e22cd9d20 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 29 Aug 2022 08:39:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E9=A2=84=E6=8F=90=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E6=B5=8B=E8=AF=95=E6=96=87=E6=A1=A3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInternalPurchaseService.java | 13 ++++--- .../BaseOutsourcingApplicationService.java | 5 ++- .../biz/basevehicle/BaseVehicleMapper.java | 3 +- .../biz/basevehicle/BaseVehicleMapper.xml | 8 ----- .../biz/basevehicle/BaseVehicleService.java | 7 ++-- .../api/scmvehrebate/ScmVehRebateFeign.java | 5 +++ .../ScmVehRebateFeignFallback.java | 5 +++ .../scm/api/scmvehrebate/ScmVehRebateVo.java | 2 +- .../ScmVehRebateWithApply.java | 2 ++ .../ScmVehRebateWithApplyDetailsVo.java | 4 +++ .../ScmVehRebateWithApplyDto.java | 2 ++ .../ScmVehRebateWithApplyVo.java | 6 ++++ .../biz/scmvehrebate/ScmVehRebateRest.java | 7 ++++ .../biz/scmvehrebate/ScmVehRebateService.java | 35 ++++++++++++++++++- 14 files changed, 81 insertions(+), 23 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 03f8bd5591..5b3aed9d37 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -199,6 +199,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); + if (baseInternalPurchaseVehicles.size() < 1) { + return rb.setMsg("请选择调车申请车辆"); + } if (StringUtils.isBlank(dtoSid)) {//新增 if (StringUtils.isBlank(dto.getShuntingTypeKey())) { return rb.setMsg("调车类型不能为空"); @@ -315,9 +318,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -729,9 +732,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService map = new HashMap<>(); map.put("modelSid", modelSid); map.put("configSid", configSid); - map.put("selectType",0); + map.put("selectType", 0); appSubVersionVo.setJson(JSONObject.toJSONString(map)); - BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo); + BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo); appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo); }); 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 1887b8a8f1..16809f9002 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 @@ -151,9 +151,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService sendFinPaymentrecord(bv, booad, ManPurOrderType.CostTitle.CK_COSTTITLE.getCode(), ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks())); } else { if (deposit != null) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 24fdee954b..70850b6d79 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -446,5 +446,6 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehicleRebatePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - + @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue} where vinNo = #{vinNo}") + void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("vinNo") String vinNo); } \ No newline at end of file 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..791f1c2422 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 @@ -1000,21 +1000,13 @@