From 085f766c8fb4fc1e410fc7f94a56be092d23cb71 Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Mon, 29 Jul 2024 17:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/project/vo/EmployeeVO.java | 2 ++ .../project/vo/WrkProjectPaymentVO.java | 3 ++ .../inspection/work/po/WrkAuditRule.java | 19 +++++++++++ .../inspection/work/vo/WrkAuditRuleDTO.java | 23 ++++++++++--- .../work/service/impl/WrkInfoServiceImpl.java | 25 ++++++++++++++- .../main/resources/mapper/WrkInfoMapper.xml | 4 +-- .../mapper/WrkProjectPaymentMapper.xml | 32 ++++++++++++++++++- .../system/feign/RemoteUserService.java | 4 +++ .../system/remote/RemoteUserController.java | 22 ++++++++++--- 9 files changed, 120 insertions(+), 14 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java index f0a238e..d6d2630 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/EmployeeVO.java @@ -11,6 +11,8 @@ import java.time.LocalDateTime; @Data public class EmployeeVO { + private Long userId; + private Long projectId; /** diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java index 0ebaec3..b4def4d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java @@ -71,4 +71,7 @@ public class WrkProjectPaymentVO { */ private String paymentMonth; + private Long userId; + + } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java index 34914c5..b97b37a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkAuditRule.java @@ -76,4 +76,23 @@ public class WrkAuditRule extends BaseEntity { */ @TableField(value = "dept_id") private Long deptId; + + /** + * 分钟数量 + */ + @TableField(value = "number") + private Integer number; + + /** + * 单位 + */ + @TableField(value = "number_type") + private Integer numberType; + + /** + * 条数 + */ + @TableField(value = "number_wrk") + private Integer numberWrk; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java index e0e2e63..9f6ae05 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/vo/WrkAuditRuleDTO.java @@ -52,11 +52,6 @@ public class WrkAuditRuleDTO { @TableField(value = "remark") private String remark; - /** - * 规则内容 - */ - @TableField(value = "content") - private String content; /** * 所属部门 @@ -64,5 +59,23 @@ public class WrkAuditRuleDTO { @TableField(value = "dept_id") private Long deptId; + /** + * 分钟数量 + */ + @TableField(value = "number") + private Integer number; + + /** + * 单位 + */ + @TableField(value = "number_type") + private Integer numberType; + + /** + * 条数 + */ + @TableField(value = "number_wrk") + private Integer numberWrk; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index de9ed64..95daa56 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -30,12 +30,14 @@ import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.inspection.ins.GeneratedInsFactory; import com.chushang.inspection.project.dto.AuditDTO; +import com.chushang.inspection.project.po.InspectionConfig; import com.chushang.inspection.project.po.InspectionData; import com.chushang.inspection.project.query.ProjectQuery; import com.chushang.inspection.project.service.InspectionDataService; import com.chushang.inspection.project.service.PollingTaskService; import com.chushang.inspection.project.vo.CountVO; import com.chushang.inspection.project.vo.EmployeeVO; +import com.chushang.inspection.project.vo.ProjectVO; import com.chushang.inspection.terminal.po.FiveStore; import com.chushang.inspection.terminal.po.Store; import com.chushang.inspection.terminal.po.Terminal; @@ -675,7 +677,28 @@ public class WrkInfoServiceImpl extends ServiceImpl impl public List empData(ProjectQuery projectQuery) { CommonParam commonParam = CommonParam.buildPageRequest(); Page page = new Page<>(commonParam.getPage(), commonParam.getLimit()); - return baseMapper.empData(projectQuery,page); + List employeeVOList = baseMapper.empData(projectQuery, page); + Set deptIds = employeeVOList.stream().map(EmployeeVO::getDeptId).collect(Collectors.toSet()); + Set userIds = employeeVOList.stream().map(EmployeeVO::getUserId).collect(Collectors.toSet()); + // 查询全部部门 + Map deptNameMap + = remoteDeptService.getDeptNameByIds(deptIds, SecurityConstants.INNER); + + Map userNameByIds = userFeignService.getUserNameByIds(userIds, SecurityConstants.INNER); + // 被派单次数 + + + LambdaQueryWrapper configSql = WrapperUtils.builder(); + configSql.in(WrkInfo::getUserId, userIds); + + // 查询全部工单 + for (EmployeeVO employeeVO:employeeVOList){ + employeeVO.setDeptName(deptNameMap.get(employeeVO.getDeptId())); + employeeVO.setProjectConcat(userNameByIds.get(employeeVO.getUserId()).getNickName()); + employeeVO.setProjectPhone(userNameByIds.get(employeeVO.getUserId()).getPhone()); + } + + return employeeVOList; } /** diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml index d58b2f5..156f92b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml @@ -270,9 +270,7 @@ select t2.project_name as projectName, + t2.user_id as userId, t2.project_id as projectId, t2.project_concat as projectConcat, t2.project_phone as projectPhone, t2.dept_name as deptName, t1.contract_amount as contractAmount, t2.dept_id as deptId, - t1.payment_amount as paymentAmount, + t1.payment_amount as paymentAmount from wrk_project_contract t1 inner join wrk_project t2 on t1.project_id = t2.project_id @@ -33,4 +34,33 @@ + + + diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java index 09de64a..7123494 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java @@ -58,4 +58,8 @@ public interface RemoteUserService { @GetMapping("/nickname") Result> getIdByNicknames(@RequestParam(value = "nickNames") Set nickNames, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @GetMapping("/querynamebyid") + Map getUserNameByIds(@RequestParam(value = "userIds") Set userIds, + @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java index 31ae301..4e267cd 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java @@ -1,20 +1,21 @@ package com.chushang.system.remote; +import cn.hutool.core.collection.CollectionUtil; import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.Result; import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.annotation.InnerAuth; +import com.chushang.security.entity.po.SysDept; import com.chushang.security.entity.vo.LoginUser; import com.chushang.security.entity.po.SysUser; import com.chushang.system.feign.RemoteUserService; import com.chushang.system.service.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; @RestController @RequestMapping(value = "/user/remote") @@ -92,4 +93,17 @@ public class RemoteUserController implements RemoteUserService { return Result.ok(sysUserService.getIdByNicknames(nickNames)); } + @Override + @GetMapping(value = "/querynamebyid") + @InnerAuth + public Map getUserNameByIds(Set userIds, String source) { + if (CollectionUtil.isEmpty(userIds)) return Map.of(); + List sysUsers = sysUserService.listByIds(userIds); + if (CollectionUtil.isNotEmpty(sysUsers)){ + return sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity() )); + } + return Map.of(); + } + + }