新增五种试剂，解析代码完成，待测

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

@@ -608,14 +608,14 @@ public class EntrustController extends BladeController {
                 taskBlueprint.setTasks(eTaskList);
             }
             // 处理任务书回交人返回用户名称
-            R<User> userR = userClient.userInfoById(Long.valueOf(taskBlueprint.getBackCrossRecipientBy()));
-            User user = userR.getData();
-            if (user != null) {
-                taskBlueprint.setBackCrossRecipientName(user.getName());
-            }
+//            R<User> userR = userClient.userInfoById(Long.valueOf(taskBlueprint.getBackCrossRecipientBy()));
+//            User user = userR.getData();
+//            if (user != null) {
+//                taskBlueprint.setBackCrossRecipientName(user.getName());
+//            }
             // 处理任务书回交人返回用户名称
             R<User> userTemp = userClient.userInfoById(Long.valueOf(taskBlueprint.getTaskIssuedBy()));
-            User user1 = userR.getData();
+            User user1 = userTemp.getData();
             if (user1 != null) {
                 taskBlueprint.setTaskIssuedBy(user1.getName());
             }
@@ -1230,11 +1230,12 @@ public class EntrustController extends BladeController {
 
             // 修改当前部门的任务书主表的任务书回交日期和任务书回交接收人
             QueryWrapper<TaskBlueprint> queryWrapper1 = new QueryWrapper();
-            queryWrapper1.eq("", "");
+            queryWrapper1.eq("entrust_id", examine.getEntrustId());
             TaskBlueprint one = taskBlueprintService.getOne(queryWrapper1);
 
             Long entrustId = entrust.getId();
             ETask eTask = new ETask();
+            eTask.setId(examine.getId());
             eTask.setTaskIssuedBy(one.getTaskIssuedBy());
             eTask.setBackCrossTime(new Date());
             eTask.setBackCrossRecipientBy(one.getTaskIssuedBy());
@@ -1244,6 +1245,7 @@ public class EntrustController extends BladeController {
                 User user = userR.getData();
                 eTask.setBackCrossRecipientName(user.getName());
             }
+            eTaskService.updateById(eTask);
         }
     }
 

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

@@ -89,7 +89,15 @@ public class ReagentController extends BladeController {
      */
     @PostMapping("/update")
     @ApiOperation(value = "更改", notes = "更改")
-    public R update(@RequestBody Reagent entry) {
+    public R update(@RequestBody Reagent entry) throws Exception {
+        List<Reagent> list = service.list();
+        if (list != null && list.size() > 0) {
+            for (Reagent reagent : list) {
+                if (entry.getName().equals(reagent.getName()) && entry.getManufacturer().equals(reagent.getManufacturer())) {
+                    throw new Exception("名称重复");
+                }
+            }
+        }
         List<TypeAndOperation> operationList = entry.getOperationList();
         if (operationList != null && operationList.size() > 0) {
             entry.setTypeAndOperation(JSON.toJSONString(operationList));
@@ -146,7 +154,7 @@ public class ReagentController extends BladeController {
             for (ReagentExcel reagentExcel : excelList) {
                 // 重名校验
                 for (Reagent reagent : list) {
-                    if (reagentExcel.getName().equals(reagent.getName())) {
+                    if (reagentExcel.getName().equals(reagent.getName()) && reagentExcel.getManufacturer().equals(reagent.getManufacturer())) {
                         throw new Exception("名称重复: " + reagentExcel.getName());
                     }
                 }

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

@@ -3239,13 +3239,16 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                     result.put("flowRecipient", "/");
                 }
                 if (!"".equals(eTask.getFlowTime()) && eTask.getFlowTime() != null) {
-                    result.put("flowTime", format.format(eTask.getFlowTime()));//接收日期
+                    //接收日期
+                    result.put("flowTime", format.format(eTask.getFlowTime()));
                 } else {
                     result.put("flowTime", "/");
                 }
-                result.put("backCrossTime", format.format(taskBlueprint.getBackCrossTime()));//检测任务书交回日期
-                String name1 = userClient.userInfoById(Long.parseLong(taskBlueprint.getBackCrossRecipientBy())).getData().getName();
-                result.put("backCrossRecipient", name1);//接收人
+                //检测任务书交回日期
+//                result.put("backCrossTime", format.format(eTask.getBackCrossTime()));
+//                String name1 = userClient.userInfoById(Long.parseLong(eTask.getBackCrossRecipientBy())).getData().getName();
+                //接收人
+//                result.put("backCrossRecipient", name1);
             }
         }