电商数据，新增是否上传照片以及需求方字段存值展示，打印

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);
 
 

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,

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>

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>