From 8531972392671ed3475d4e6862b1add282e60fc5 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 8 Aug 2024 10:22:30 +0800
Subject: [PATCH] roll label

---
 .../modules/basics/entity/BasePicture.java    |  2 ++
 .../part/entity/ExternalPartPicture.java      |  4 +++
 .../mapper/ExternalPartPictureMapper.java     |  4 +++
 .../impl/ExternalPartPictureServiceImpl.java  |  8 ++---
 .../mapper/basics/BasePictureMapper.xml       |  3 +-
 .../mapper/part/ExternalPartPictureMapper.xml | 30 +++++++++++++++++++
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/basics/entity/BasePicture.java b/src/main/java/com/gaotao/modules/basics/entity/BasePicture.java
index 3bb3457..bd34f8e 100644
--- a/src/main/java/com/gaotao/modules/basics/entity/BasePicture.java
+++ b/src/main/java/com/gaotao/modules/basics/entity/BasePicture.java
@@ -33,6 +33,8 @@ public class BasePicture {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    private String certificationNo;
+
     @TableField(exist = false)
     private List<Long> pictureNos;
 }
diff --git a/src/main/java/com/gaotao/modules/part/entity/ExternalPartPicture.java b/src/main/java/com/gaotao/modules/part/entity/ExternalPartPicture.java
index d01ffb5..cc384db 100644
--- a/src/main/java/com/gaotao/modules/part/entity/ExternalPartPicture.java
+++ b/src/main/java/com/gaotao/modules/part/entity/ExternalPartPicture.java
@@ -1,5 +1,6 @@
 package com.gaotao.modules.part.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -40,4 +41,7 @@ public class ExternalPartPicture {
     private Date updateTime;
 
     private Long basePictureNo;
+
+    @TableField(exist = false)
+    private String certificationNo;
 }
diff --git a/src/main/java/com/gaotao/modules/part/mapper/ExternalPartPictureMapper.java b/src/main/java/com/gaotao/modules/part/mapper/ExternalPartPictureMapper.java
index 4769852..4668fab 100644
--- a/src/main/java/com/gaotao/modules/part/mapper/ExternalPartPictureMapper.java
+++ b/src/main/java/com/gaotao/modules/part/mapper/ExternalPartPictureMapper.java
@@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gaotao.modules.part.entity.ExternalPartPicture;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ExternalPartPictureMapper extends BaseMapper<ExternalPartPicture> {
 
 
     int getPicturesNo(ExternalPartPicture picture);
 
+    List<ExternalPartPicture> selectExternalPartPictureList(ExternalPartPicture externalPartPicture);
+
 }
diff --git a/src/main/java/com/gaotao/modules/part/service/impl/ExternalPartPictureServiceImpl.java b/src/main/java/com/gaotao/modules/part/service/impl/ExternalPartPictureServiceImpl.java
index 279cece..dc24fc1 100644
--- a/src/main/java/com/gaotao/modules/part/service/impl/ExternalPartPictureServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/part/service/impl/ExternalPartPictureServiceImpl.java
@@ -34,11 +34,9 @@ public class ExternalPartPictureServiceImpl extends ServiceImpl<ExternalPartPict
 
     @Override
     public List<ExternalPartPicture> selectExternalPartPictureList(ExternalPartPicture externalPartPicture) {
-        return lambdaQuery()
-                .eq(ExternalPartPicture::getSite,externalPartPicture.getSite())
-                .eq(ExternalPartPicture::getPartNo,externalPartPicture.getPartNo())
-                .eq(Objects.nonNull(externalPartPicture.getPictureNo()),ExternalPartPicture::getPartNo,externalPartPicture.getPictureNo())
-                .list().stream().peek(partPicture -> {
+
+        List<ExternalPartPicture> list = baseMapper.selectExternalPartPictureList(externalPartPicture);
+        return list.stream().peek(partPicture -> {
                     // 将路径 url的D:/替换
                     partPicture.setPictureUrl(partPicture.getPictureUrl().replace("D:", url));
                 }).collect(Collectors.toList());
diff --git a/src/main/resources/mapper/basics/BasePictureMapper.xml b/src/main/resources/mapper/basics/BasePictureMapper.xml
index 659f1ef..a35b466 100644
--- a/src/main/resources/mapper/basics/BasePictureMapper.xml
+++ b/src/main/resources/mapper/basics/BasePictureMapper.xml
@@ -10,7 +10,8 @@
                picture_new_file_name,
                picture_type,
                create_by,
-               create_time
+               create_time,
+               certification_no
         from base_picture
         <where>
             <if test="pictureDesc != null and pictureDesc != ''">
diff --git a/src/main/resources/mapper/part/ExternalPartPictureMapper.xml b/src/main/resources/mapper/part/ExternalPartPictureMapper.xml
index df29e34..07cf915 100644
--- a/src/main/resources/mapper/part/ExternalPartPictureMapper.xml
+++ b/src/main/resources/mapper/part/ExternalPartPictureMapper.xml
@@ -5,4 +5,34 @@
     <select id="getPicturesNo" resultType="java.lang.Integer">
         select ISNULL(MAX(picture_no),0) from external_part_picture where part_no = #{partNo} and site = #{site}
     </select>
+
+    <select id="selectExternalPartPictureList" resultType="com.gaotao.modules.part.entity.ExternalPartPicture">
+        select site,
+               part_no,
+               epp.picture_no,
+               epp.picture_desc,
+               epp.picture_url,
+               epp.picture_file_name,
+               epp.picture_new_file_name,
+               epp.picture_type,
+               epp.create_by,
+               epp.create_time,
+               update_by,
+               update_time,
+               base_picture_no,
+               bp.certification_no
+        from external_part_picture epp
+        left join base_picture bp on epp.base_picture_no = bp.picture_no
+        <where>
+            <if test="site != null and site != ''">
+                and site = #{site}
+            </if>
+            <if test="partNo != null and partNo != ''">
+                and part_no = #{partNo}
+            </if>
+            <if test="pictureNo != null ">
+                and epp.picture_no = #{pictureNo}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file