QHSE证书管理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/IotMeasureCertController.java

@@ -1,5 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo.IotMeasureCertSaveReqVO;
@@ -11,32 +17,24 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
+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.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 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.*;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 
 @Tag(name = "管理后台 - 计量器具-证书管理")
@@ -92,7 +90,18 @@ public class IotMeasureCertController {
     @PreAuthorize("@ss.hasPermission('rq:iot-measure-cert:query')")
     public CommonResult<PageResult<IotMeasureCertRespVO>> getIotMeasureCertPage(@Valid IotMeasureCertPageReqVO pageReqVO) {
         PageResult<IotMeasureCertDO> pageResult = iotMeasureCertService.getIotMeasureCertPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotMeasureCertRespVO.class));
+        List<IotMeasureCertRespVO> collect = pageResult.getList().stream().map(e -> {
+            IotMeasureCertRespVO iotMeasureCertRespVO = new IotMeasureCertRespVO();
+            BeanUtils.copyProperties(e, iotMeasureCertRespVO);
+            if (Objects.nonNull(iotMeasureCertRespVO.getDeptId())) {
+                DeptRespDTO dept = deptApi.getDept(iotMeasureCertRespVO.getDeptId());
+                if(Objects.nonNull(dept)){
+                    iotMeasureCertRespVO.setDeptName(dept.getName());
+                }
+            }
+            return iotMeasureCertRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertRespVO.java

@@ -1,10 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 计量器具-证书管理 Response VO")
 @Data
@@ -73,4 +74,5 @@ public class IotMeasureCertRespVO {
     @Schema(description = "用户名称")
     @ExcelProperty("用户名称")
     private String userName;
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/vo/IotMeasureCertSaveReqVO.java

@@ -53,5 +53,6 @@ public class IotMeasureCertSaveReqVO {
      * 用户id
      */
     private Long userId;
+    private String userName;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/cert/IotMeasureCertDO.java

@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 计量器具-证书管理 DO
@@ -49,6 +48,10 @@ public class IotMeasureCertDO extends BaseDO {
      * 用户id
      */
     private Long userId;
+    /**
+     * 所属人
+     */
+    private String userName;
     /**
      * 证书颁发机构
      */