From 54d574c464f5e626e6a37cb3af1273a8fb755ca1 Mon Sep 17 00:00:00 2001
From: swj <1211312234@qq.com>
Date: Thu, 22 Sep 2022 18:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A3=80=E5=AE=9A?=
 =?UTF-8?q?=E5=92=8C=E5=A7=94=E6=89=98=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipVerificationController.java           | 17 +++++++++++++++++
 .../file/mapper/EquipVerificationMapper.xml    |  3 +++
 .../service/IEquipVerificationLogService.java  |  2 +-
 .../impl/EquipVerificationLogServiceImpl.java  | 18 +++++++++++++-----
 .../lims/controller/EntrustController.java     |  3 ++-
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java
index 10763fc..721d5cb 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java
@@ -38,6 +38,8 @@ import org.springblade.lims.feign.ILimsClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -134,4 +136,19 @@ public class EquipVerificationController extends BladeController {
         limsClient.updateStatus(equipVerification.getInstrumentId());
         return R.status(equipVerificationService.saveOrUpdate(equipVerification));
     }
+
+    /**
+     * 新增或修改 仪器检定管理
+     */
+    @PostMapping("/remove")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "删除", notes = "")
+    public R remove(String ids) {
+        List<String> strings = Arrays.asList(ids.split(","));
+        List<Long> tempIds = new ArrayList<>();
+        for (String id : strings) {
+            tempIds.add(Long.valueOf(id));
+        }
+        return R.status(equipVerificationService.deleteLogic(tempIds));
+    }
 }
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml
index c580269..fe4cfbc 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml
@@ -25,6 +25,9 @@
     <select id="selectEquipVerificationPage" resultType="org.springblade.file.vo.EquipVerificationVO">
         select * from t_equip_verification
         <where>
+            <if test="equipVerification.status != null and equipVerification.status != ''">
+                AND status = #{equipVerification.status,jdbcType=VARCHAR}
+            </if>
             <if test="equipVerification.equipName != null and equipVerification.equipName != ''">
                 AND equip_name like CONCAT('%', #{equipVerification.equipName,jdbcType=VARCHAR},'%')
             </if>
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java
index c3c677f..217f19a 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/IEquipVerificationLogService.java
@@ -30,6 +30,6 @@ import org.springblade.file.vo.EquipVerificationVO;
  */
 public interface IEquipVerificationLogService extends BaseService<EquipVerificationLog> {
 
-    void insertLog(EquipVerificationVO e);
+    void insertLog(EquipVerification e);
 
 }
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java
index fa656dc..a088f3e 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java
@@ -16,7 +16,6 @@
  */
 package org.springblade.file.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -56,22 +55,31 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl<EquipVerifi
     @Autowired
     private EquipVerificationMapper equipVerificationMapper;
 
+    @Autowired
+    private IUserClient userClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertLog(EquipVerificationVO e){
+    public void insertLog(EquipVerification e){
         //当前日期
         LocalDateTime localDateTime = LocalDateTime.now();
 
         EquipVerificationLog log = new EquipVerificationLog();
+        log.setCode(e.getCode());
+        log.setEquipName(e.getEquipName());
+        log.setCycle(e.getCycle());
+        log.setEquipStatus(e.getEquipStatus());
+        log.setVerificationInfo(e.getVerificationInfo());
         log.setCycle(e.getCycle());
         log.setEnableTime(e.getEnableTime());
         log.setEquipModel(e.getEquipModel());
         log.setInstrumentId(e.getInstrumentId());
         log.setTenantId(e.getTenantId());
-        log.setVerification_time(e.getVerificationTime());
+        log.setVerificationTime(e.getVerificationTime());
         log.setVerificationUser(e.getVerificationUser());
-        log.setEquipStatus(e.getEquipStatus());
-        log.setVerification_info(e.getVerificationInfo());
+        User userR = userClient.userInfoById(e.getVerificationUser()).getData();
+        log.setVerificationUserName(userR.getName());
+
         //当前日期
         LocalDate localDate = LocalDate.now();
         LocalDateTime enableTime = e.getEnableTime();
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
index 833fcba..d24540a 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
@@ -834,7 +834,7 @@ public class EntrustController extends BladeController {
 //            map.put("shbh", service.count(queryWrapper));
 //            queryWrapper.clear();
 
-        queryWrapper.eq("entrust_status", "6");
+        queryWrapper.eq("entrust_status", "8");
         map.put("ywc", service.count(queryWrapper));
         queryWrapper.clear();
 
@@ -842,6 +842,7 @@ public class EntrustController extends BladeController {
         map.put("yzf", service.count(queryWrapper));
         queryWrapper.clear();
 
+        queryWrapper.eq("entrust_status", "4").or();
         queryWrapper.eq("entrust_status", "5").or();
         queryWrapper.eq("entrust_status", "6");
         map.put("dbz", service.count(queryWrapper));