From cbdbea330622015690926d07312b4ec45f29924c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 24 Feb 2023 17:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busvehicleapply/BusVehicleApplyFeign.java | 4 ++ .../ShareBusVehicleApplyQuery.java | 24 +++++++++++ .../app/AppVehicleApplyVo.java | 3 ++ .../busvehicleapply/BusVehicleApplyMapper.xml | 3 +- .../busvehicleapply/BusVehicleApplyRest.java | 5 +++ .../BusVehicleApplyService.java | 42 +++++++++++++++++++ .../flowable/api/flow/FlowableFallback.java | 5 +++ .../flowable/api/flow/FlowableFeign.java | 5 +++ .../anrui/flowable/biz/flow/FlowableRest.java | 9 ++++ .../flowable/biz/flow/FlowableService.java | 1 + .../portal/api/sysuser/ShareUserQuery.java | 21 ++++++++++ .../portal/api/sysuser/SysUserFeign.java | 4 ++ .../api/sysuser/SysUserFeignFallback.java | 5 +++ .../biz/sysstafforg/SysStaffOrgMapper.java | 2 + .../biz/sysstafforg/SysStaffOrgMapper.xml | 4 ++ .../biz/sysstafforg/SysStaffOrgService.java | 4 ++ .../portal/biz/sysuser/SysUserMapper.java | 2 + .../portal/biz/sysuser/SysUserMapper.xml | 7 ++++ .../anrui/portal/biz/sysuser/SysUserRest.java | 5 +++ .../portal/biz/sysuser/SysUserService.java | 25 +++++++++++ .../vehicleApply/ShareVehicleApplyQuery.java | 23 ++++++++++ .../vehicleApply/VehicleApplyFeign.java | 5 +++ .../vehicleApply/VehicleApplyVo.java | 7 ++++ .../vehicleApply/VehicleApplyRest.java | 6 +++ .../vehicleApply/VehicleApplyService.java | 13 ++++-- 25 files changed, 229 insertions(+), 5 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/ShareUserQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java 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 b3d33ad13b..fa8b7b32b3 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 @@ -93,4 +93,8 @@ public interface BusVehicleApplyFeign { @ApiOperation(value = "采购申请作废") @PostMapping(value = "/abandonApply") ResultBean abandonApply(@RequestBody String[] sids); + + @ApiOperation(value = "分享厂家采购") + @PostMapping(value = "/shareBusVehicleApply") + 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/ShareBusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java new file mode 100644 index 0000000000..a0ff644c2f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/ShareBusVehicleApplyQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.busvehicleapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/2/24 16:03 + * @Description + */ +@Data +public class ShareBusVehicleApplyQuery implements Query { + private static final long serialVersionUID = 3209798058711300310L; + + @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("人员") + private List members; + @ApiModelProperty("部门") + private List groups; +} 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 11d82ca60a..04b12001e5 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 @@ -53,4 +53,7 @@ public class AppVehicleApplyVo implements Vo { @ApiModelProperty("附件信息") private List fileList = new ArrayList<>(); + + @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 3d6fad1bda..a572fc4163 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,7 +77,8 @@ ba.createOrgName, ba.applyType, ba.payRemarks, - ba.orgDeptName + ba.orgDeptName, + if(length(ba.nodeState) > 0, true, false) as haveShare 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 d23ee91157..a140f18b29 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,5 +118,10 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { return busVehicleApplyService.abandonApply(sids); } + @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 87b9930be9..f3fe0dcd25 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,6 +3,7 @@ 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; @@ -53,6 +54,7 @@ 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; @@ -68,6 +70,8 @@ import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; import org.apache.commons.lang3.StringUtils; import org.apache.tomcat.util.threads.ThreadPoolExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -93,6 +97,8 @@ import java.util.stream.Collectors; @Service public class BusVehicleApplyService extends MybatisBaseService { + Logger log = LoggerFactory.getLogger(BusVehicleApplyService.class); + @Autowired private BusVehicleApplyDetailService busVehicleApplyDetailService; @Autowired @@ -944,4 +950,40 @@ public class BusVehicleApplyService extends MybatisBaseService memberSidList = shareQuery.getMembers(); + List orgSidList = shareQuery.getGroups(); + ShareUserQuery shareUserQuery = new ShareUserQuery(); + shareUserQuery.setOrgSids(orgSidList); + shareUserQuery.setMemberSids(memberSidList); + ResultBean> staffList = sysUserFeign.shareSelectUser(shareUserQuery); + if(memberSidList == null && orgSidList != null && orgSidList.size()>0){ + if(staffList.getData() == null || staffList.getData().size() == 0){ + return rb.setMsg("所选部门下无分享人员"); + } + } + if(memberSidList == null && orgSidList == null && orgSidList.size() == 0){ + return rb.setMsg("请选择人员"); + } + //组装分享的消息数据 + //根据业务sid查询业务参数 + BusVehicleApply busVehicleApply = fetchBySid(shareQuery.getBusinessSid()); + if(busVehicleApply == null){ + return rb.setMsg("该申请不存在"); + } + //流程定义id + String modelId = busVehicleApply.getProcDefId(); + //移动端的参数 + String taskId = busVehicleApply.getTaskId(); + ResultBean> resultBean = flowableFeign.selectFlowVaributes(taskId); + if(!resultBean.getData().isEmpty()){ + Map appMap = (Map)resultBean.getData().get("app"); + } + log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean)); + + // + return null; + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index 9be4430aa5..d4906af263 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -81,5 +81,10 @@ public class FlowableFallback implements FlowableFeign { return null; } + @Override + public ResultBean> selectFlowVaributes(String taskId) { + return null; + } + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index 71a5aad6e9..c7f8d158e0 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -126,4 +126,9 @@ public interface FlowableFeign { @GetMapping(value = "/selectFlowList") @ResponseBody ResultBean> selectFlowList(); + + @ApiOperation(value = "查询流程的业务参数") + @GetMapping(value = "/selectFlowVaributes") + @ResponseBody + ResultBean> selectFlowVaributes(@RequestParam("taskId")String taskId); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 27034ba892..059ad6672b 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -594,4 +594,13 @@ public class FlowableRest implements FlowableFeign { public ResultBean> selectFlowList() { return flowableService.selectFlowList(); } + + @Override + public ResultBean> selectFlowVaributes(String taskId) { + ResultBean> rb = ResultBean.fireFail(); + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(taskId).singleResult(); + Map processVariables = historicTaskInstance.getProcessVariables(); + return rb.success().setData(processVariables); + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java index 6480b19ebf..0707ba43d6 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java @@ -17,6 +17,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiParam; import org.flowable.engine.TaskService; +import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/ShareUserQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/ShareUserQuery.java new file mode 100644 index 0000000000..3f659d508c --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/ShareUserQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/2/24 15:13 + * @Description + */ +@Data +public class ShareUserQuery implements Query { + private static final long serialVersionUID = 2148783813323541114L; + @ApiModelProperty("人员") + private List memberSids; + @ApiModelProperty("部门") + private List orgSids; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 94b21f6987..14468b4093 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -251,4 +251,8 @@ public interface SysUserFeign { @ApiOperation(value = "根据多个角色sid以及机构sid获取本机构链角色的用户") @PostMapping(value = "/getUserByRoles") ResultBean> getUserByRoles(@RequestBody UserByRolesAndOrgQuery userQuery); + + @ApiOperation(value = "分享时查询的人员") + @PostMapping(value = "/shareSelectUser") + ResultBean> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index c5ccb7abfe..3291124a80 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -230,4 +230,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) { return null; } + + @Override + public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index d9fb73e403..84e3b245a7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -111,4 +111,6 @@ public interface SysStaffOrgMapper extends BaseMapper { List getList(String staffSid); List selectStaffByOrgSid(@Param("orgSid") String sid, @Param("type") String type); + + List selectStaffByOrg(String orgSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index 63640e7b41..de7b932f55 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -116,4 +116,8 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index de2736a73c..57223e8e8f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -312,4 +312,8 @@ public class SysStaffOrgService extends MybatisBaseService selectStaffByOrgSid(String sid, String type) { return baseMapper.selectStaffByOrgSid(sid,type); } + + public List selectStaffByOrg(String orgSid) { + return baseMapper.selectStaffByOrg(orgSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 542a6d4d10..01445c581a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -189,4 +189,6 @@ public interface SysUserMapper extends BaseMapper { int updateAppIdNull(String appId); String fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone); + + List selectUserByStaffSid(@Param("list") List staffList); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 3fe1e64f98..b14373a440 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -364,4 +364,11 @@ WHERE ss.name = #{userName} AND su.mobile = #{userPhone} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 4aee2d5096..7f1e234d77 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -649,4 +649,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) { return sysUserService.getUserByRoles(userQuery); } + + @Override + public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { + return sysUserService.shareSelectUser(shareUserQuery); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index aefc7214c1..6e686cc206 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1343,4 +1343,29 @@ public class SysUserService extends MybatisBaseService { ResultBean> objectResultBean = ResultBean.fireSuccess(); return objectResultBean.setData(list); } + + public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { + ResultBean> rb = ResultBean.fireFail(); + List staffList = new ArrayList<>(); + //人员list + List memberList = shareUserQuery.getMemberSids(); + //部门list + List orgList = shareUserQuery.getOrgSids(); + //查询该部门下子集部门的人员以及该部门下的人员 + if(orgList != null && orgList.size()>0){ + for (int i = 0; i < orgList.size(); i++) { + String orgSid = orgList.get(i); + //查询该部门下的所有人员以及查询该部门的子集下的所有人员 + List staffSidList = sysStaffOrgService.selectStaffByOrg(orgSid); + staffList.addAll(staffSidList); + } + } + if(memberList != null && memberList.size()>0){ + staffList.addAll(memberList); + } + //去重 + staffList=staffList.stream().distinct().collect(Collectors.toList()); + List userSidList = baseMapper.selectUserByStaffSid(staffList); + return rb.success().setData(userSidList); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java new file mode 100644 index 0000000000..4a0c62fe4b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/ShareVehicleApplyQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.supplychain.vehicleApply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/2/24 14:58 + * @Description + */ +@Data +public class ShareVehicleApplyQuery implements Query { + private static final long serialVersionUID = 4456622318830996347L; + @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("人员") + private List members; + @ApiModelProperty("部门") + private List groups; +} 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 615db77400..8cf7640fcf 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 @@ -57,4 +57,9 @@ public interface VehicleApplyFeign { @GetMapping("/getFlowOperateTitle") @ResponseBody ResultBean getFlowOperateTitle(@SpringQueryMap VehicleApplyQuery query); + + @ApiOperation("厂家采购分享") + @PostMapping("/shareMessage") + @ResponseBody + 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 0527a408dc..4b26bb28e6 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 @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -58,5 +59,11 @@ public class VehicleApplyVo implements Vo { @JsonProperty("depositRemark") private String payRemarks; + @ApiModelProperty("附件信息") + private List fileList = new ArrayList<>(); + + @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 4fd4878089..1531f48e8b 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.biz.supplychain.vehicleApply; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.ShareVehicleApplyQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyFeign; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplySzVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo; @@ -59,4 +60,9 @@ public class VehicleApplyRest implements VehicleApplyFeign { public ResultBean getFlowOperateTitle(VehicleApplyQuery query) { return vehicleApplyService.getFlowOperateTitle(query); } + + @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 d250665063..abf4eb94ae 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 @@ -13,12 +13,10 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; 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.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo; -import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyListVo; -import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplySzVo; -import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.*; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDto; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyTaskQuery; @@ -175,4 +173,11 @@ public class VehicleApplyService { } return rb.success().setData(resultBean.getData()); } + + public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { + ResultBean rb = ResultBean.fireFail(); + + + return null; + } }