Commit c8ae8b9c1cb61fac21466f0b065a65c0b02605dd

Authored by yeqianyong
1 parent 5c585486

楚江ERP-根据角色code和厂房类型来获取办理人数据

@@ -164,7 +164,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController { @@ -164,7 +164,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
164 @ApiOperation("导出") 164 @ApiOperation("导出")
165 @HasPermission({"customer-dev-manage:customer-dev-plan:export"}) 165 @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
166 @PostMapping("/export") 166 @PostMapping("/export")
167 - public InvokeResult<Void> export(@Valid QueryCustomerDevelopPlanVo vo) { 167 + public InvokeResult<Void> export(@Valid @RequestBody QueryCustomerDevelopPlanVo vo) {
168 vo.setExportType(ExportType.CUSTOMER_DEVELOP.getCode()); 168 vo.setExportType(ExportType.CUSTOMER_DEVELOP.getCode());
169 ExportTaskUtil.exportTask("客户开发信息", CustomerDevelopExportTaskWorker.class, vo); 169 ExportTaskUtil.exportTask("客户开发信息", CustomerDevelopExportTaskWorker.class, vo);
170 return InvokeResultBuilder.success(); 170 return InvokeResultBuilder.success();
@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.handlers; @@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.handlers;
3 import com.lframework.starter.web.core.utils.JsonUtil; 3 import com.lframework.starter.web.core.utils.JsonUtil;
4 import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper; 4 import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper;
5 import com.lframework.starter.web.inner.service.system.SysUserDeptService; 5 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
  6 +import com.lframework.xingyun.basedata.entity.Workshop;
  7 +import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
6 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
7 import org.apache.commons.collections4.CollectionUtils; 9 import org.apache.commons.collections4.CollectionUtils;
8 import org.springframework.stereotype.Component; 10 import org.springframework.stereotype.Component;
@@ -20,6 +22,8 @@ public class TransactorHandler { @@ -20,6 +22,8 @@ public class TransactorHandler {
20 private SysUserDeptService userDeptService; 22 private SysUserDeptService userDeptService;
21 @Resource 23 @Resource
22 private SysUserRoleMapper sysUserRoleMapper; 24 private SysUserRoleMapper sysUserRoleMapper;
  25 + @Resource
  26 + private WorkshopService workshopService;
23 27
24 28
25 /** 29 /**
@@ -50,4 +54,39 @@ public class TransactorHandler { @@ -50,4 +54,39 @@ public class TransactorHandler {
50 log.info("================== listTransactorsByRoleCode invoke end, transactors:{}", JsonUtil.toJsonString(result)); 54 log.info("================== listTransactorsByRoleCode invoke end, transactors:{}", JsonUtil.toJsonString(result));
51 return result; 55 return result;
52 } 56 }
  57 +
  58 + /**
  59 + * 根据角色code和厂房类型来获取办理人数据
  60 + * 客户开发
  61 + *
  62 + * @param roleCode 角色编号
  63 + * @param workshopType 厂房类型
  64 + * @return List<String>
  65 + */
  66 + public List<String> listByRoleAndWorkshop(String roleCode, String workshopType, String workshopId) {
  67 + log.info("================== listByRoleAndWorkshop invoke start, roleCode:{}, workshopType:{}, workshopId:{}", roleCode, workshopType, workshopId);
  68 + Workshop workshop = workshopService.findById(workshopId);
  69 + if (workshop == null) {
  70 + log.info("================== listByRoleAndWorkshop workshop is not exist!");
  71 + return new ArrayList<>();
  72 + }
  73 + String workshopName = workshop.getName();
  74 + // 获取角色下人员
  75 + List<String> userIdList = sysUserRoleMapper.listUserIdByRoleCode(roleCode);
  76 + if (CollectionUtils.isEmpty(userIdList)) {
  77 + return new ArrayList<>();
  78 + }
  79 + List<String> result = new ArrayList<>();
  80 + for (String id : userIdList) {
  81 + if ("TYPE_1".equals(workshopType) && ("一分厂".equals(workshopName) || "二分厂".equals(workshopName))) {
  82 + // 一、二分厂
  83 + result.add(id);
  84 + } else if ("TYPE_2".equals(workshopType) && ("三分厂".equals(workshopName) || "四分厂".equals(workshopName))) {
  85 + // 三、四分厂
  86 + result.add(id);
  87 + }
  88 + }
  89 + log.info("================== listByRoleAndWorkshop invoke end, result:{}", JsonUtil.toJsonString(result));
  90 + return result;
  91 + }
53 } 92 }
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 import com.github.pagehelper.PageInfo; 6 import com.github.pagehelper.PageInfo;
7 import com.lframework.starter.bpm.dto.FlowTaskDto; 7 import com.lframework.starter.bpm.dto.FlowTaskDto;
8 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper; 8 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
9 -import com.lframework.starter.bpm.service.FlowDefinitionWrapperService;  
10 import com.lframework.starter.bpm.service.FlowInstanceWrapperService; 9 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
11 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo; 10 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
12 import com.lframework.starter.web.core.components.security.SecurityUtil; 11 import com.lframework.starter.web.core.components.security.SecurityUtil;
@@ -26,7 +25,6 @@ import lombok.extern.slf4j.Slf4j; @@ -26,7 +25,6 @@ import lombok.extern.slf4j.Slf4j;
26 import org.apache.commons.collections4.CollectionUtils; 25 import org.apache.commons.collections4.CollectionUtils;
27 import org.apache.commons.lang3.StringUtils; 26 import org.apache.commons.lang3.StringUtils;
28 import org.dromara.warm.flow.core.entity.Instance; 27 import org.dromara.warm.flow.core.entity.Instance;
29 -import org.dromara.warm.flow.core.service.InsService;  
30 import org.springframework.transaction.annotation.Transactional; 28 import org.springframework.transaction.annotation.Transactional;
31 import com.lframework.xingyun.sc.mappers.CustomerDevelopPlanMapper; 29 import com.lframework.xingyun.sc.mappers.CustomerDevelopPlanMapper;
32 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService; 30 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;