From 9d42a60f667b894080b20529376e7e265e12c335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Sat, 25 Mar 2023 16:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E4=BA=A7=E5=93=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/ioCodeRelController.java |  2 +-
 .../glxp/api/dao/inout/IoCodeRelMapper.java   |  2 ++
 .../glxp/api/res/inout/IoCodeRelResponse.java |  3 +-
 .../api/service/inout/IoCodeRelService.java   |  2 ++
 .../inout/impl/IoCodeRelServiceImpl.java      | 12 ++++++-
 .../mybatis/mapper/inout/IoCodeRelMapper.xml  | 34 ++++++++++++++++++-
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java
index f04728c84..745d232ce 100644
--- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java
+++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java
@@ -120,7 +120,7 @@ public class ioCodeRelController {
     @GetMapping("/udi/ioCode/Rel/delectList")
     public BaseResponse delectList(IoOrderRelRequest ioOrderRelRequest) {
 
-        List<IoCodeRelResponse> list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest);
+        List<IoCodeRelResponse> list = ioCodeRelServicec.selectIoCodeRelDetailList(ioOrderRelRequest);
         PageInfo<IoCodeRelResponse> pageInfo;
         pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeRelResponse> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java
index 24eb14cf0..5391e6618 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java
@@ -14,4 +14,6 @@ import java.util.List;
 public interface IoCodeRelMapper extends BaseMapper<IoCodeRelEntity> {
 
     List<IoCodeRelResponse> selectIoCodeRelList(IoOrderRelRequest ioOrderRelRequest);
+
+    List<IoCodeRelResponse> selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest);
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java
index 0a8f3839c..e7909c889 100644
--- a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java
@@ -25,6 +25,7 @@ public class IoCodeRelResponse {
     private Date updateTime;
     private String cpmctymc;
     private String ggxh;
-
+    private String measname;
+    private String manufactory;
 
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java
index a61ecbff2..c9215b341 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCodeRelService.java
@@ -19,5 +19,7 @@ public interface IoCodeRelService {
 
     int delIoCodeRel(String code,String parentCode);
 
+    List<IoCodeRelResponse> selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest);
+
 
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java
index 51401ac1f..a7178316b 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java
@@ -75,6 +75,16 @@ public class IoCodeRelServiceImpl implements IoCodeRelService {
         int count=ioCodeRelMapper.delete(ew);
         return  count;
     }
-
+    @Override
+    public List<IoCodeRelResponse> selectIoCodeRelDetailList(IoOrderRelRequest ioOrderRelRequest) {
+        if (ioOrderRelRequest == null) {
+            return Collections.emptyList();
+        }
+        if (ioOrderRelRequest.getPage() != null) {
+            int offset = (ioOrderRelRequest.getPage() - 1) * ioOrderRelRequest.getLimit();
+            PageHelper.offsetPage(offset, ioOrderRelRequest.getLimit());
+        }
+        return ioCodeRelMapper.selectIoCodeRelDetailList(ioOrderRelRequest);
+    }
 
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml
index 82c3881dd..9fde655be 100644
--- a/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoCodeRelMapper.xml
@@ -4,7 +4,39 @@
 
     <select id="selectIoCodeRelList" parameterType="com.glxp.api.req.inout.IoOrderRelRequest"
             resultType="com.glxp.api.res.inout.IoCodeRelResponse">
-        select io_code_rel.*, basic_products.cpmctymc, basic_products.ggxh
+        select io_code_rel.*, basic_products.cpmctymc, basic_products.ggxh,basic_products.manufactory,basic_products.measname
+        from io_code_rel
+        LEFT JOIN basic_products on io_code_rel.nameCode = basic_products.nameCode
+        <where>
+            <if test="code != '' and code != null">
+                and io_code_rel.code like concat('%', #{code}, '%')
+            </if>
+            <if test="parentCode != '' and parentCode != null">
+                and io_code_rel.parentCode =#{parentCode}
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                and io_code_rel.nameCode=#{nameCode}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and basic_products.ggxh like concat('%', #{ggxh}, '%')
+            </if>
+
+            <if test="serialNo != '' and serialNo != null">
+                and io_code_rel.serialNo like concat('%', #{serialNo}, '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(io_code_rel.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+        </where>
+        GROUP BY io_code_rel.parentCode
+    </select>
+
+    <select id="selectIoCodeRelDetailList" parameterType="com.glxp.api.req.inout.IoOrderRelRequest"
+            resultType="com.glxp.api.res.inout.IoCodeRelResponse">
+        select io_code_rel.*, basic_products.cpmctymc, basic_products.ggxh,basic_products.manufactory,basic_products.measname
         from io_code_rel
         LEFT JOIN basic_products on io_code_rel.nameCode = basic_products.nameCode
         <where>