获取用户姓名

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java

@@ -87,6 +87,7 @@ public class ApplyController extends BladeController {
         if (apply.getStartTime() != null && apply.getEndTime() != null) {
             wrapper.between(Apply::getCreateTime, apply.getStartTime(), apply.getEndTime());
         }
+        // 按照时间倒序
         wrapper.orderByDesc(Apply::getCreateTime);
         return applyService.page(Condition.getPage(query), wrapper);
     }

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java

@@ -230,7 +230,8 @@ public class GoodsController extends BladeController {
     public void report(@RequestBody Report report) {
         // 报损记录
         report.setScrapApplyerId(AuthUtil.getUserId());
-        report.setScrapApplyerName(AuthUtil.getUserName());
+//        report.setScrapApplyerName(AuthUtil.getUserName());
+        report.setScrapApplyerName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
         report.setScrapApplyerTime(LocalDateTime.now());
         report.setStatus(0);
         reportService.save(report);
@@ -263,7 +264,7 @@ public class GoodsController extends BladeController {
 
         // 报损记录
         byId.setScrapCheckerId(AuthUtil.getUserId());
-        byId.setScrapCheckerName(AuthUtil.getUserName());
+        byId.setScrapCheckerName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
         byId.setScrapCheckerTime(LocalDateTime.now());
         byId.setStatus(1);
         reportService.updateById(byId);

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/DetermineFormulaController.java

@@ -1,6 +1,7 @@
 
 package org.springblade.lims.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -71,6 +72,10 @@ public class DetermineFormulaController extends BladeController {
     @PostMapping("/insert")
     @ApiOperation(value = "新增", notes = "新增")
     public R insert(@RequestBody DetermineFormula entry) {
+        if (entry.getMap() != null) {
+            String jsonString = JSONObject.toJSONString(entry.getMap());
+            entry.setFormula(jsonString);
+        }
         entry.setCreateUser(null);
         entry.setUpdateUser(null);
         entry.setCreateTime(new Date());

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.minio.messages.ReplicationTime;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -18,9 +17,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.lims.entry.*;
-import org.springblade.lims.excel.ExamineExcel;
 import org.springblade.lims.excel.ReagentExcel;
-import org.springblade.lims.service.IETaskService;
 import org.springblade.lims.service.IInstrumentService;
 import org.springblade.lims.service.IReagentService;
 import org.springblade.system.cache.DictBizCache;
@@ -30,9 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 
 /**

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/RepairApplicationController.java

@@ -104,7 +104,7 @@ public class RepairApplicationController extends BladeController {
             messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审核",
                     "您有新的报修申请单待审核,请及时处理", 1, 5, "1555122570980995073","/repair/proposer");
             repairApplication.setApplyDeptUser(AuthUtil.getUserId());
-            repairApplication.setApplyDeptUserName(AuthUtil.getUserName());
+            repairApplication.setApplyDeptUserName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
             repairApplication.setApplyDate(new Date());
         }
         // 审核
@@ -114,7 +114,7 @@ public class RepairApplicationController extends BladeController {
                     "您有新的报修申请单待审批,请及时处理", 1, 5, "1552118581265973249","/repair/proposer");
             repairApplication.setReviewDate(new Date());
             repairApplication.setBusinessOfficeId(AuthUtil.getUserId());
-            repairApplication.setBusinessOfficeName(AuthUtil.getUserName());
+            repairApplication.setBusinessOfficeName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
         }
         // 审批
         if (repairApplication.getStatus() == 3) {
@@ -124,12 +124,12 @@ public class RepairApplicationController extends BladeController {
                     "您的报修申请单待验收,请及时处理", 1, 5, byId.getApplyUser().toString(),"/repair/proposer");
             repairApplication.setApprovalDate(new Date());
             repairApplication.setCenterDirectorId(AuthUtil.getUserId());
-            repairApplication.setCenterDirectorName(AuthUtil.getUserName());
+            repairApplication.setCenterDirectorName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
         }
         // 验收及报废
         if (repairApplication.getStatus() == 4 || repairApplication.getStatus() == 5) {
             repairApplication.setAcceptedBy(AuthUtil.getUserId());
-            repairApplication.setAcceptedName(AuthUtil.getUserName());
+            repairApplication.setAcceptedName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
             repairApplication.setAcceptedDate(new Date());
             // 修改设备状态为关机
             Instrument instrument = new Instrument();
@@ -149,7 +149,7 @@ public class RepairApplicationController extends BladeController {
                 scrapApplication.setType(application.getType());
                 scrapApplication.setName(application.getName());
                 scrapApplication.setEquipmentId(AuthUtil.getUserId());
-                scrapApplication.setEquipmentName(AuthUtil.getUserName());
+                scrapApplication.setEquipmentName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
                 scrapApplication.setCreateTime(new Date());
                 scrapApplication.setModel(application.getVersion());
                 scrapApplication.setStatus(0);

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ScrapApplicationController.java

@@ -76,7 +76,7 @@ public class ScrapApplicationController extends BladeController {
             messageClient.event(SysTypeEnum.INFORM.getValue(), "报修审核",
                     "您有新的报修申请单待审核,请及时处理", 1, 5, "1555122570980995073","/repair/proposer");
             scrapApplication.setApplyDeptUser(AuthUtil.getUserId());
-            scrapApplication.setApplyDeptUserName(AuthUtil.getUserName());
+            scrapApplication.setApplyDeptUserName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
             scrapApplication.setApplyDate(new Date());
         }
         // 审核
@@ -86,13 +86,13 @@ public class ScrapApplicationController extends BladeController {
                     "您有新的报修申请单待审批,请及时处理", 1, 5, "1552118581265973249","/repair/proposer");
             scrapApplication.setReviewDate(new Date());
             scrapApplication.setBusinessOfficeId(AuthUtil.getUserId());
-            scrapApplication.setBusinessOfficeName(AuthUtil.getUserName());
+            scrapApplication.setBusinessOfficeName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
         }
         // 审批
         if (scrapApplication.getStatus() == 3) {
             scrapApplication.setApprovalDate(new Date());
             scrapApplication.setCenterDirectorId(AuthUtil.getUserId());
-            scrapApplication.setCenterDirectorName(AuthUtil.getUserName());
+            scrapApplication.setCenterDirectorName(userClient.userInfoById(AuthUtil.getUserId()).getData().getName());
             // 修改设备状态为已报废
             Instrument instrument = new Instrument();
             instrument.setId(scrapApplication.getInstrumentId());