From b6bb2e4a3a4b85159faf8094a20b4945d7423366 Mon Sep 17 00:00:00 2001
From: liuyuxin <lyx043628@163.com>
Date: Thu, 26 Mar 2026 11:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=95=86=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E4=B8=8A=E4=BC=A0=E7=85=A7?=
 =?UTF-8?q?=E7=89=87=E4=BB=A5=E5=8F=8A=E9=9C=80=E6=B1=82=E6=96=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AD=98=E5=80=BC=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RkBillServiceImpl.java       |  3 +++
 .../resources/mybatis/wisdom/RkBillMapper.xml |  1 +
 .../resources/mybatis/wisdom/RkInfoMapper.xml | 16 +++++++++++++-
 .../mybatis/wisdom/RkRecordMapper.xml         | 22 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java
index cfbb45a..fc06f89 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java
@@ -464,8 +464,10 @@ public class RkBillServiceImpl implements IRkBillService
         updateRecord.setOperator(rkBill.getOperator());
         updateRecord.setIsDelivery(rkBill.getIsDelivery());
         updateRecord.setWlType(rkBill.getWlType());
+        updateRecord.setDemandDeptName(rkBill.getDemandDeptName());
         updateRecord.setIsUploadPhoto(rkBill.getIsUploadPhoto());
 
+
         // 执行批量更新
         rkRecordMapper.updateRecordByBillNo(updateRecord);
         // ====================== 3. 同步更新 rk_info ======================
@@ -481,6 +483,7 @@ public class RkBillServiceImpl implements IRkBillService
         updateInfo.setIsDelivery(rkBill.getIsDelivery());
         updateInfo.setWlType(rkBill.getWlType());
         updateInfo.setIsUploadPhoto(rkBill.getIsUploadPhoto());
+        updateInfo.setDemandDeptName(rkBill.getDemandDeptName());
         rkInfoMapper.updateInfoByBillNo(updateInfo);
 
 
diff --git a/src/main/resources/mybatis/wisdom/RkBillMapper.xml b/src/main/resources/mybatis/wisdom/RkBillMapper.xml
index f261601..a7a7d3d 100644
--- a/src/main/resources/mybatis/wisdom/RkBillMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkBillMapper.xml
@@ -75,6 +75,7 @@
             rb.update_by,
             rb.update_time,
             rb.is_upload_photo,
+            rb.demand_dept_name,
             mt.type_name AS wl_type_name,
             COALESCE(sit.type_name, sot.type_name) AS operation_type_name,
             su.nick_name AS operator_name,
diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
index 0f4072a..276ef6f 100644
--- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
@@ -168,7 +168,12 @@
             <if test="isDelete != null and isDelete != ''">
                 AND ri.is_delete = #{isDelete}
             </if>
-
+            <if test="isUploadPhoto != null ">
+                AND ri.is_upload_photo = #{isUploadPhoto}
+            </if>
+            <if test="demandDeptName != null and demandDeptName != ''">
+                AND ri.demand_dept_name = #{demandDeptName}
+            </if>
             <if test="startDate != null">
                 AND ri.operation_time &gt;= #{startDate}
             </if>
@@ -280,6 +285,12 @@
             <if test="remark != null and remark != ''">
                 AND ri.remark LIKE CONCAT('%', #{remark}, '%')
             </if>
+            <if test="isUploadPhoto != null ">
+                AND ri.is_upload_photo = #{isUploadPhoto}
+            </if>
+            <if test="demandDeptName != null and demandDeptName != ''">
+                AND ri.demand_dept_name = #{demandDeptName}
+            </if>
         </where>
     </select>
 
@@ -701,6 +712,9 @@
             <if test="isUploadPhoto != null">
                 is_upload_photo = #{isUploadPhoto},
             </if>
+            <if test="demandDeptName != null">
+                demand_dept_name = #{demandDeptName},
+            </if>
         </set>
         WHERE bill_no = #{billNo}
     </update>
diff --git a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml
index 72c7e6f..abdb443 100644
--- a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml
@@ -233,6 +233,12 @@
                 AND rr.is_delete = #{isDelete}
             </if>
 
+            <if test="isUploadPhoto != null ">
+                AND rr.is_upload_photo = #{isUploadPhoto}
+            </if>
+            <if test="demandDeptName != null and demandDeptName != ''">
+                AND rr.demand_dept_name = #{demandDeptName}
+            </if>
             <!-- ================= 时间条件（最终正确版） ================= -->
             <if test="startDate != null or endDate != null">
                 AND (
@@ -703,7 +709,12 @@
             <if test="isBorrowed != null and isBorrowed != ''">
                 AND rr.is_borrowed = #{isBorrowed}
             </if>
-
+            <if test="isUploadPhoto != null ">
+                AND rr.is_upload_photo = #{isUploadPhoto}
+            </if>
+            <if test="demandDeptName != null and demandDeptName != ''">
+                AND rr.demand_dept_name = #{demandDeptName}
+            </if>
             <!-- 删除标识 -->
             <if test="isDelete == null">
                 AND (rr.is_delete = '0' OR rr.is_delete = 0 OR rr.is_delete IS NULL)
@@ -851,6 +862,12 @@
             <if test="remark != null and remark != ''">
                 AND rr.remark LIKE CONCAT('%', #{remark}, '%')
             </if>
+            <if test="isUploadPhoto != null ">
+                AND rr.is_upload_photo = #{isUploadPhoto}
+            </if>
+            <if test="demandDeptName != null and demandDeptName != ''">
+                AND rr.demand_dept_name = #{demandDeptName}
+            </if>
         </where>
 
     </select>
@@ -944,6 +961,9 @@
             <if test="isUploadPhoto != null">
                 is_upload_photo = #{isUploadPhoto},
             </if>
+            <if test="demandDeptName != null">
+                demand_dept_name = #{demandDeptName},
+            </if>
             update_time = NOW()
         </set>