diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/system/controller/ServiceTicketController.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/system/controller/ServiceTicketController.java index 4c6b58a..4bcc475 100644 --- a/ruoyi-crm/src/main/java/com/ruoyi/crm/system/controller/ServiceTicketController.java +++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/system/controller/ServiceTicketController.java @@ -3,17 +3,26 @@ package com.ruoyi.crm.system.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.crm.system.domain.DesigneeWrapperClass; import com.ruoyi.crm.system.domain.ServiceTicket; import com.ruoyi.crm.system.service.IServiceTicketService; +import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.stream.Collectors; /** * 服务工单Controller @@ -27,6 +36,10 @@ public class ServiceTicketController extends BaseController { @Autowired private IServiceTicketService serviceTicketService; + @Autowired + private ISysUserService userService; + @Autowired + private ISysDeptService deptService; /** * 查询服务工单列表 @@ -95,4 +108,25 @@ public class ServiceTicketController extends BaseController { return toAjax(serviceTicketService.deleteServiceTicketByIds(ids)); } + + /** + * 指定员工树形数据 + */ + @GetMapping("/designatedPerson") + public AjaxResult designatedPerson(SysUser user){ + ArrayList designeeWrapperClassArrayList = new ArrayList<>(); + List sysUsers = userService.selectUserList(user); + for (SysUser sysUser : sysUsers) { + DesigneeWrapperClass designeeWrapperClass = new DesigneeWrapperClass(); + if (sysUser.getDept() != null){ + SysDept dept = sysUser.getDept(); + designeeWrapperClass.setLabel(dept.getDeptName()); + designeeWrapperClassArrayList.add(designeeWrapperClass); + } + } + designeeWrapperClassArrayList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(HashSet::new), ArrayList::new)); + System.out.println(designeeWrapperClassArrayList.toString()); + return AjaxResult.success(designeeWrapperClassArrayList); + } + } diff --git a/ruoyi-crm/src/main/java/com/ruoyi/crm/system/domain/DesigneeWrapperClass.java b/ruoyi-crm/src/main/java/com/ruoyi/crm/system/domain/DesigneeWrapperClass.java new file mode 100644 index 0000000..da653b1 --- /dev/null +++ b/ruoyi-crm/src/main/java/com/ruoyi/crm/system/domain/DesigneeWrapperClass.java @@ -0,0 +1,18 @@ +package com.ruoyi.crm.system.domain; + +import lombok.Data; + +import java.util.ArrayList; + +/** + * 服务工单指定销售人员树形数据结构类 + */ + +@Data +public class DesigneeWrapperClass { + //系统员工所属部门 + private String label; + //系统员工姓名(数组) + private ArrayList children; + +} diff --git a/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java b/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java index 3153b68..7e7ef50 100644 --- a/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java +++ b/ruoyi-mongodb/src/main/java/com/ruoyi/mongodb/conreoller/DynamicDataController.java @@ -92,5 +92,17 @@ public class DynamicDataController extends BaseController { mongoTemplate.save(dynamicForm); return AjaxResult.success("保存成功"); } + //根据卡片id查询对应采集数据的列表 + @GetMapping("/collectDataList") + public AjaxResult collectDataList(String id){ + Query query = new Query(); + query.addCriteria(Criteria.where("dynamicDataId").is(id)); + List dynamicForms = mongoTemplate.find(query, DynamicForm.class); + ArrayList list = new ArrayList<>(); + for (DynamicForm dynamicForm : dynamicForms) { + list.add(dynamicForm.getMap()); + } + return AjaxResult.success(list); + } } diff --git a/ruoyi-ui/src/api/crm/intelligent.js b/ruoyi-ui/src/api/crm/intelligent.js index 189330f..6ef9b76 100644 --- a/ruoyi-ui/src/api/crm/intelligent.js +++ b/ruoyi-ui/src/api/crm/intelligent.js @@ -17,3 +17,12 @@ export function saveDynamicData(data) { data: data }) } + +//查询对应表单的采集数据列表 +export function collectDataList(query) { + return request({ + url: '/intelligentForm/collectDataList', + method: 'get', + params: {id:query} + }) +} diff --git a/ruoyi-ui/src/api/system/dept.js b/ruoyi-ui/src/api/system/dept.js index 1116ef8..c9c594a 100644 --- a/ruoyi-ui/src/api/system/dept.js +++ b/ruoyi-ui/src/api/system/dept.js @@ -36,7 +36,7 @@ export function treeselect() { // 查询服务工单下拉树结构 export function designatedPerson() { return request({ - url: '/system/dept/designatedPerson', + url: '/system/ticket/designatedPerson', method: 'get' }) } diff --git a/ruoyi-ui/src/views/crm/intelligent/index.vue b/ruoyi-ui/src/views/crm/intelligent/index.vue index 7ab007a..581593f 100644 --- a/ruoyi-ui/src/views/crm/intelligent/index.vue +++ b/ruoyi-ui/src/views/crm/intelligent/index.vue @@ -1,5 +1,5 @@ diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index f212427..2a62124 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -58,8 +58,8 @@ export default { // tenant: 'zy_tenant', // username: 'zy_admin', // password: 'admin123', - tenant: 'tenant1', - username: 'admin', + tenant: 'zy_tenant', + username: 'zy_admin', password: 'admin123', rememberMe: false, code: '',