diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index fa8b7b32b3..21baa988b0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -94,7 +94,7 @@ public interface BusVehicleApplyFeign { @PostMapping(value = "/abandonApply") ResultBean abandonApply(@RequestBody String[] sids); - @ApiOperation(value = "分享厂家采购") + /* @ApiOperation(value = "分享厂家采购") @PostMapping(value = "/shareBusVehicleApply") - ResultBean shareBusVehicleApply(@RequestBody ShareBusVehicleApplyQuery shareQuery); + ResultBean shareBusVehicleApply(@RequestBody ShareBusVehicleApplyQuery shareQuery);*/ } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 65684fdcc9..5280d86110 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -106,9 +106,4 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { public ResultBean abandonApply(String[] sids) { return null; } - - @Override - public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { - return null; - } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java index 04b12001e5..88a33c9bbd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java @@ -54,6 +54,6 @@ public class AppVehicleApplyVo implements Vo { @ApiModelProperty("附件信息") private List fileList = new ArrayList<>(); - @ApiModelProperty("是否存在分享按钮") - private boolean haveShare; + /* @ApiModelProperty("是否存在分享按钮") + private boolean haveShare;*/ } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index a572fc4163..3d6fad1bda 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -77,8 +77,7 @@ ba.createOrgName, ba.applyType, ba.payRemarks, - ba.orgDeptName, - if(length(ba.nodeState) > 0, true, false) as haveShare + ba.orgDeptName from bus_vehicle_apply ba where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index a140f18b29..1839fe9158 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -118,10 +118,10 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { return busVehicleApplyService.abandonApply(sids); } - @Override +/* @Override public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { return busVehicleApplyService.shareBusVehicleApply(shareQuery); - } + }*/ } 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 bbf26ede2b..3176cf1b40 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 @@ -3,7 +3,6 @@ package com.yxt.anrui.base.biz.busvehicleapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -54,7 +53,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysuser.ShareUserQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -66,7 +64,6 @@ 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 com.yxt.messagecenter.api.message.MessageFlowableQueryForCC; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; import org.apache.commons.lang3.StringUtils; @@ -953,7 +950,7 @@ public class BusVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { @@ -1031,5 +1028,5 @@ public class BusVehicleApplyService extends MybatisBaseService map = new HashMap<>(); map.put("bv", dto); UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData(); + ufVo.setTaskId(dto.getTaskId()); map.put("uff", ufVo); cc(map,dto.getTaskDefKey()); }); @@ -689,7 +690,7 @@ public class FlowableRest implements FlowableFeign { mfq.setUfVo(messageFlowVo); mfq.setModuleName(process.get("NAME_")); mfq.setMsgTitle(process.get("NAME_")); - ResultBean resultBean = messageFeign.pushMessageCC(mfq); + ResultBean resultBean = messageFeign.pushMessageShare(mfq); log.info("分享成功-resultBean:{}", resultBean); if (!resultBean.getSuccess()) { log.info("分享失败，分享消息异常！:{}", JSONObject.toJSONString(resultBean)); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java index 8cf7640fcf..cbc22f49ab 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java @@ -58,8 +58,8 @@ public interface VehicleApplyFeign { @ResponseBody ResultBean getFlowOperateTitle(@SpringQueryMap VehicleApplyQuery query); - @ApiOperation("厂家采购分享") + /* @ApiOperation("厂家采购分享") @PostMapping("/shareMessage") @ResponseBody - ResultBean shareMessage(@RequestBody ShareVehicleApplyQuery shareQuery); + ResultBean shareMessage(@RequestBody ShareVehicleApplyQuery shareQuery);*/ } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java index 4b26bb28e6..cb963b5c1c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java @@ -62,8 +62,8 @@ public class VehicleApplyVo implements Vo { @ApiModelProperty("附件信息") private List fileList = new ArrayList<>(); - @ApiModelProperty("是否存在分享按钮") - private boolean haveShare; +/* @ApiModelProperty("是否存在分享按钮") + private boolean haveShare;*/ } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java index 1531f48e8b..2859be5f75 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java @@ -61,8 +61,8 @@ public class VehicleApplyRest implements VehicleApplyFeign { return vehicleApplyService.getFlowOperateTitle(query); } - @Override +/* @Override public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { return vehicleApplyService.shareMessage(shareQuery); - } + }*/ } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index 0d14863555..e2728faa00 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -174,7 +174,7 @@ public class VehicleApplyService { return rb.success().setData(resultBean.getData()); } - public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { + /* public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { ResultBean rb = ResultBean.fireFail(); ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery(); BeanUtil.copyProperties(shareQuery,shareBusVehicleApplyQuery); @@ -183,5 +183,5 @@ public class VehicleApplyService { return rb.setMsg(resultBean.getMsg()); } return rb.success(); - } + }*/ }