Prechádzať zdrojové kódy

app,锅炉任务单详情的orderItems实体增加mainCheckerUser字段

yangguanjin 1 deň pred
rodič
commit
e2cb457258

+ 4 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderItemDetailVO.java

@@ -2,6 +2,7 @@ package cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo;
 
 
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportRespVO;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -99,6 +100,9 @@ public class BoilerTaskOrderItemDetailVO {
     @Schema(description = "主检人")
     private String mainChecker;
 
+    @Schema(description = "主检人")
+    private AdminUserRespDTO mainCheckerUser;
+
     @Schema(description = "安全管理员")
     private String safery;
 

+ 1 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorder/AppApiBoilerTaskOrderController.java

@@ -88,7 +88,7 @@ public class AppApiBoilerTaskOrderController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('pressure2:boiler-task-order:query')")
     public CommonResult<BoilerTaskOrderRespVO> getBoilerTaskOrder(@RequestParam("id") String id) {
-        return success(boilerTaskOrderService.getBoilerTaskOrder(id));
+        return success(boilerTaskOrderService.getBoilerTaskOrderForAPP(id));
     }
 
     @PostMapping("/page")

+ 2 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderService.java

@@ -63,6 +63,8 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
      */
     BoilerTaskOrderRespVO getBoilerTaskOrder(String id);
 
+    BoilerTaskOrderRespVO getBoilerTaskOrderForAPP(String id);
+
     /**
      * 获得锅炉检验任务确认分页
      *

+ 18 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -688,6 +688,24 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         return boilerTaskOrderRespVO;
     }
 
+    @Override
+    public BoilerTaskOrderRespVO getBoilerTaskOrderForAPP(String id) {
+        BoilerTaskOrderRespVO boilerTaskOrderRespVO = getBoilerTaskOrder(id);
+        List<BoilerTaskOrderItemDetailVO> orderItems = boilerTaskOrderRespVO.getOrderItems();
+        Map<String, List<BoilerTaskOrderItemDetailVO>> mainCheckerIdToOrderItemsMap = orderItems.stream().collect(Collectors.groupingBy(BoilerTaskOrderItemDetailVO::getMainChecker));
+        Map<String, AdminUserRespDTO> userIdToEntityMap = adminUserApi.getUserMap(mainCheckerIdToOrderItemsMap.keySet());
+        for (Map.Entry<String, AdminUserRespDTO> userIdToEntityEntry : userIdToEntityMap.entrySet()) {
+            String mainCheckerId = userIdToEntityEntry.getKey();
+            AdminUserRespDTO mainCheckerUser = userIdToEntityEntry.getValue();
+            List<BoilerTaskOrderItemDetailVO> boilerTaskOrderItemDetailVOS = mainCheckerIdToOrderItemsMap.get(mainCheckerId);
+            boilerTaskOrderItemDetailVOS = boilerTaskOrderItemDetailVOS != null ? boilerTaskOrderItemDetailVOS : Collections.emptyList();
+            for (BoilerTaskOrderItemDetailVO boilerTaskOrderItemDetailVO : boilerTaskOrderItemDetailVOS) {
+                boilerTaskOrderItemDetailVO.setMainCheckerUser(mainCheckerUser);
+            }
+        }
+        return boilerTaskOrderRespVO;
+    }
+
     @Override
     public PageResult<BoilerTaskOrderRespVO> getBoilerTaskOrderPage(BoilerTaskOrderPageReqVO pageReqVO) {