From 41c68681eebe2a48d9e1bbc298d29827fdbfedc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 7 Mar 2025 09:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E2=80=9C?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8D=95=E5=8F=B7=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/bst/orderProd/domain/OrderProd.java |  4 ++++
 .../bst/orderProd/mapper/OrderProdMapper.xml  | 20 ++++++++++++++++++-
 .../service/impl/OrderProdConverterImpl.java  |  2 ++
 .../src/main/resources/application-druid.yml  |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/domain/OrderProd.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/domain/OrderProd.java
index ece69ed..05da60f 100644
--- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/domain/OrderProd.java
+++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/domain/OrderProd.java
@@ -111,4 +111,8 @@ public class OrderProd extends BaseEntity
     @Size(max = 200, message = "备注长度不能超过200个字符")
     private String remark;
 
+    @Excel(name = "合同单号")
+    @ApiModelProperty("合同单号")
+    @Size(max = 200, message = "合同单号长度不能超过200个字符")
+    private String contractNo;
 }
diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/mapper/OrderProdMapper.xml b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/mapper/OrderProdMapper.xml
index 608c2d3..cf17b5d 100644
--- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/mapper/OrderProdMapper.xml
+++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/mapper/OrderProdMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bop.content_num,
             bop.no,
             bop.work_name,
+            bop.contract_no,
             bo.order_no as order_no
         from bst_order_prod bop
             left join bst_order bo on bo.id = bop.order_id
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.coverColor != null  and query.coverColor != ''"> and bop.cover_color like concat('%', #{query.coverColor}, '%')</if>
         <if test="query.no != null  and query.no != ''"> and bop.no like concat('%', #{query.no}, '%')</if>
         <if test="query.workName != null  and query.workName != ''"> and bop.work_name like concat('%', #{query.workName}, '%')</if>
+        <if test="query.contractNo != null  and query.contractNo != ''"> and bop.contract_no like concat('%', #{query.contractNo}, '%')</if>
         <if test="query.eqNames != null and query.eqNames.size() > 0">
             and bop.name in
             <foreach collection="query.eqNames" item="item" open="(" close=")" separator=",">
@@ -109,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentNum != null">content_num,</if>
             <if test="no != null">no,</if>
             <if test="workName != null">work_name,</if>
+            <if test="contractNo != null">contract_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -130,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentNum != null">#{contentNum},</if>
             <if test="no != null">#{no},</if>
             <if test="workName != null">#{workName},</if>
+            <if test="contractNo != null">#{contractNo},</if>
          </trim>
     </insert>
 
@@ -154,7 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cover_color,
             content_num,
             no,
-            work_name
+            work_name,
+            contract_no
         </trim>
         values
         <foreach collection="list" item="i" separator=",">
@@ -197,6 +202,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="i.no == null ">default,</if>
                 <if test="i.workName != null ">#{i.workName},</if>
                 <if test="i.workName == null ">default,</if>
+                <if test="i.contractNo != null ">#{i.contractNo},</if>
+                <if test="i.contractNo == null ">default,</if>
             </trim>
         </foreach>
     </insert>
@@ -394,6 +401,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </otherwise>
                 </choose>
             </foreach>
+            <foreach open="contract_no = CASE id" collection="list" item="item" close="END,">
+                <choose>
+                    <when test="item.contractNo != null ">
+                        WHEN #{item.id} THEN #{item.contractNo}
+                    </when>
+                    <otherwise>
+                        WHEN #{item.id} THEN `contract_no`
+                    </otherwise>
+                </choose>
+            </foreach>
         </trim>
         where id in
         <foreach item="item" collection="list" open="(" separator="," close=")">
@@ -445,6 +462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.contentNum != null">content_num = #{data.contentNum},</if>
         <if test="data.no != null">no = #{data.no},</if>
         <if test="data.workName != null">work_name = #{data.workName},</if>
+        <if test="data.contractNo != null">contract_no = #{data.contractNo},</if>
     </sql>
 
     <delete id="deleteOrderProdById" parameterType="Long">
diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/service/impl/OrderProdConverterImpl.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/service/impl/OrderProdConverterImpl.java
index 9b122b7..c00cb3b 100644
--- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/service/impl/OrderProdConverterImpl.java
+++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/orderProd/service/impl/OrderProdConverterImpl.java
@@ -59,6 +59,7 @@ public class OrderProdConverterImpl implements OrderProdConverter {
             bo.setContentNum(prod.getContentNum());
             bo.setNo(prod.getNo());
             bo.setWorkName(prod.getWorkName());
+            bo.setContractNo(prod.getContractNo());
             bo.setProcessList(prodProcessConverter.toBOListByCreate(prod.getProcessList()));
 
             boList.add(bo);
@@ -98,6 +99,7 @@ public class OrderProdConverterImpl implements OrderProdConverter {
             bo.setContentNum(prod.getContentNum());
             bo.setNo(prod.getNo());
             bo.setWorkName(prod.getWorkName());
+            bo.setContractNo(prod.getContractNo());
             bo.setProcessList(prodProcessConverter.toBOListByUpdate(prod.getProcessList()));
 
             boList.add(bo);
diff --git a/ruoyi-web/src/main/resources/application-druid.yml b/ruoyi-web/src/main/resources/application-druid.yml
index 57ccb31..ca5163c 100644
--- a/ruoyi-web/src/main/resources/application-druid.yml
+++ b/ruoyi-web/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://61.174.243.28:15864/factory?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.2.29:3306/factory?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: a22dae15cab2bde7
             # 从库数据源