From 32374545c983426a1cb6aa2f7a9ef22bf70cea9c Mon Sep 17 00:00:00 2001
From: ljf <ljf@35325>
Date: Tue, 7 May 2024 10:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BsSgcJsjdBuiProgressInfoController.java   | 9 ++++++++-
 .../BsSgcJsjdBuiUnitQualityRateController.java           | 2 --
 .../com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java   | 7 +++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java
index ea699d80..2f44cf85 100644
--- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java
@@ -28,6 +28,7 @@ import com.kms.common.utils.BaseEntityUtils;
 
 
 import com.kms.common.utils.UserUtils;
+import com.kms.system.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +68,9 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController
     @Autowired
     private BsSgcJsjdBuiProgressPlanService bsSgcJsjdBuiProgressPlanService;
 
+    @Autowired
+    SysUserService userService;
+
     /**
      * 查询进度填报详情列表
      */
@@ -97,7 +101,10 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
-        return AjaxResult.success(bsSgcJsjdBuiProgressInfoService.getById(id));
+        BsSgcJsjdBuiProgressInfo byId = bsSgcJsjdBuiProgressInfoService.getById(id);
+        SysUser user = userService.getById(byId.getCreateUid());
+        byId.setNickName(user.getNickName());
+        return AjaxResult.success(byId);
     }
 
     /**
diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java
index 85f8ecc5..81eeda30 100644
--- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java
+++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiUnitQualityRateController.java
@@ -90,8 +90,6 @@ public class BsSgcJsjdBuiUnitQualityRateController extends BaseController
                 }
             }
         }
-
-
         return selectedPage;
     }
 
diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java
index d3b11e16..6108fe5f 100644
--- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java
+++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java
@@ -2,7 +2,10 @@ package com.kms.build.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jianwei.common.mybaitsplus.NoQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -86,4 +89,8 @@ public class BsSgcJsjdBuiProgressInfo extends BaseEntity
 
     private String status;
 
+    @NoQuery
+    @TableField(exist = false)
+    private String nickName;
+
 }