应检设备证书

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/devicecert/QhseDeviceCertController.java

@@ -11,9 +11,12 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.devicecert.vo.QhseDevic
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.devicecert.vo.QhseDeviceCertSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.devicecert.QhseDeviceCertDO;
 import cn.iocoder.yudao.module.pms.service.qhse.devicecert.QhseDeviceCertService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -36,6 +41,8 @@ public class QhseDeviceCertController {
 
     @Resource
     private QhseDeviceCertService qhseDeviceCertService;
+    @Autowired
+    private DeptApi deptApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建QHSE应检设备证书")
@@ -75,7 +82,18 @@ public class QhseDeviceCertController {
     @PreAuthorize("@ss.hasPermission('rq:qhse-device-cert:query')")
     public CommonResult<PageResult<QhseDeviceCertRespVO>> getQhseDeviceCertPage(@Valid QhseDeviceCertPageReqVO pageReqVO) {
         PageResult<QhseDeviceCertDO> pageResult = qhseDeviceCertService.getQhseDeviceCertPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, QhseDeviceCertRespVO.class));
+        List<QhseDeviceCertRespVO> collect = pageResult.getList().stream().map(e -> {
+            QhseDeviceCertRespVO qhseDeviceCertRespVO = new QhseDeviceCertRespVO();
+            BeanUtils.copyProperties(e, qhseDeviceCertRespVO);
+            if (Objects.nonNull(qhseDeviceCertRespVO.getDeptId())) {
+                DeptRespDTO dept = deptApi.getDept(qhseDeviceCertRespVO.getDeptId());
+                if(Objects.nonNull(dept)){
+                    qhseDeviceCertRespVO.setDeptName(dept.getName());
+                }
+            }
+            return qhseDeviceCertRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")