diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index e9389dff13..c4d1ff394d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -60,7 +60,7 @@ public interface BaseVehicleOutFeign { @PostMapping("/exportExcel") @ApiOperation(value = "车辆销售台账列表导出") @ResponseBody - public void exportExcel(@RequestBody String[] sids); + public void exportExcel(@RequestBody BaseVehicleOutQuery baseVehicleOutQuery); } 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/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 5280d86110..65684fdcc9 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,4 +106,9 @@ 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/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 41b92e9c1e..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 @@ -50,4 +50,10 @@ public class AppVehicleApplyVo implements Vo { private String payRemarks; @ApiModelProperty("采购系统") private String orgDeptName; + + @ApiModelProperty("附件信息") + private List fileList = new ArrayList<>(); + + @ApiModelProperty("是否存在分享按钮") + private boolean haveShare; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java index 053a14ada9..d85be4c33d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java @@ -40,5 +40,7 @@ public class CommonContractQuery implements Query { @ApiModelProperty("签订结束日期") private String createDateEnd; + + private String userSid; } 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 7fbff71937..9678ed7bb8 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 @@ -1594,7 +1594,7 @@ public class BaseVehicleService extends MybatisBaseService baseVehicleOutVoExecls = baseVehicleOutService.listExcel(sids); + List baseVehicleOutVoExecls = baseVehicleOutService.listExcel(baseVehicleOutQuery); //定义导出的excel名字 String excelName = "车辆销售台账管理列表"; String fileNameURL = ""; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index a5a738695a..71e65689fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1122,15 +1122,11 @@ public class BaseVehicleOutService extends MybatisBaseService listExcel(String[] sids) { + public List listExcel(BaseVehicleOutQuery baseVehicleOutQuery) { List baseVehicleOutVoExecls = new ArrayList<>(); - int id = 1; - for (String sid : sids) { - BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(sid); - baseVehicleOutVoExecl.setRankNo(id); - id = id + 1; - baseVehicleOutVoExecls.add(baseVehicleOutVoExecl); - } + /*BaseVehicleOutVoExecl baseVehicleOutVoExecl = baseMapper.selByExcel(baseVehicleOutQuery); + baseVehicleOutVoExecl.setRankNo(id); + baseVehicleOutVoExecls.add(baseVehicleOutVoExecl);*/ return baseVehicleOutVoExecls; } } 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 222a3c31fc..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; @@ -34,7 +35,6 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; -import com.yxt.anrui.base.biz.commoncontract.CommonContractService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; @@ -54,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; @@ -69,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; @@ -94,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 @@ -882,6 +887,18 @@ public class BusVehicleApplyService extends MybatisBaseService records = busVehicleApplyDetailService.getVehicleApply(sid); vo.setRecords(records); + List commonAppendixVos = commonAppendixService.selByLinkSid(sid); + commonAppendixVos.removeAll(Collections.singleton(null)); + List fileList = new ArrayList<>(); + if(!commonAppendixVos.isEmpty()){ + for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { + String filePath = commonAppendixVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + fileList.add(filePath); + } + } + vo.setFileList(fileList); return rb.success().setData(vo); } @@ -933,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-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index a18978aece..5e0fef2799 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -175,7 +175,9 @@ public class CommonContractService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - + if (StringUtils.isNotBlank(query.getUserSid())) { // 业务员sid + qw.eq("createBySid", query.getUserSid()); + } if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("contractNo", query.getContractNo()); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java index e5055f3ab1..d4e538f6f8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java @@ -63,6 +63,38 @@ public class BusSalesOrderConstantUtils { } } + @Getter + public static enum FinancePlanenum { + /** + * 自由资金 + */ + PURCHASETYPEUP_ONE("1", "自有资金"), + /** + * 三方金融 + */ + PURCHASETYPEUP_TWO("2", "三方金融"); + + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private FinancePlanenum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + /** * 车辆类型 */ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 940e3a244e..8c3d14518a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -3367,7 +3367,16 @@ public class BusSalesOrderService extends MybatisBaseService> 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-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java index cf0fa1ca9d..3184a9f6fa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVoExcel.java @@ -57,20 +57,19 @@ public class ScmVehInventorymonthVoExcel{ @ExportEntityMap(CnName = "编号", EnName = "billNo") private String billNo; // 编号（yyyyMMdd） @ExportEntityMap(CnName = "生成日期", EnName = "createTime") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // + private String createTime; @ExportEntityMap(CnName = "生成人", EnName = "createByName") private String createByName; - @ExportEntityMap(CnName = "应盘(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "应盘(台)", EnName = "totalNumber") private String totalNumber; - @ExportEntityMap(CnName = "实盘(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "实盘(台)", EnName = "actualNumber") private String actualNumber; - @ExportEntityMap(CnName = "未盘(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "未盘(台)", EnName = "surplusNumber") private String surplusNumber; - @ExportEntityMap(CnName = "盘盈(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "盘盈(台)", EnName = "profitNumber") private String profitNumber; - @ExportEntityMap(CnName = "盘亏(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "盘亏(台)", EnName = "lossNumber") private String lossNumber; - @ExportEntityMap(CnName = "盘损(台)", EnName = "rankNo") + @ExportEntityMap(CnName = "盘损(台)", EnName = "damageNumber") private String damageNumber; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index 35db2bd18a..f7566b45af 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmvehinventorymonth; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsQuery; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index c250a1b9bc..c433f8b37d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -92,4 +92,5 @@ public class OrderDetailsVo implements Vo { @ApiModelProperty("内部推荐人") private String recommender; + } 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; + } }