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

src/main/java/com/zg/project/wisdom/domain/RkBill.java

@@ -131,6 +131,12 @@ public class RkBill extends BaseEntity {
     /** 备注 */
     @Excel(name = "备注")
     private String remark;
+    /** 是否上传照片（0否 1是） */
+    @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是")
+    private Integer isUploadPhoto;
+    /** 需求方（部门/单位） */
+    @Excel(name = "需求方")
+    private String demandDeptName;
 
     // ================= getter / setter =================
 
@@ -217,7 +223,20 @@ public class RkBill extends BaseEntity {
 
     public String getRemark() { return remark; }
     public void setRemark(String remark) { this.remark = remark; }
+    public Integer getIsUploadPhoto() {
+        return isUploadPhoto;
+    }
 
+    public void setIsUploadPhoto(Integer isUploadPhoto) {
+        this.isUploadPhoto = isUploadPhoto;
+    }
+    public String getDemandDeptName() {
+        return demandDeptName;
+    }
+
+    public void setDemandDeptName(String demandDeptName) {
+        this.demandDeptName = demandDeptName;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -247,6 +266,8 @@ public class RkBill extends BaseEntity {
                 .append("startDate", startDate)
                 .append("endDate", endDate)
                 .append("remark", remark)
+                .append("isUploadPhoto", isUploadPhoto)
+                .append("demandDeptName", demandDeptName)
                 .toString();
     }
 }

src/main/java/com/zg/project/wisdom/domain/RkInfo.java

@@ -256,6 +256,12 @@ public class RkInfo extends BaseEntity
     private String scene;
 
     private String sceneName;
+    /** 是否上传照片（0否 1是） */
+    @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是")
+    private Integer isUploadPhoto;
+    /** 需求方（部门/单位） */
+    @Excel(name = "需求方")
+    private String demandDeptName;
 
     public void setId(Long id) 
     {
@@ -820,7 +826,20 @@ public class RkInfo extends BaseEntity
     {
         return sceneName;
     }
+    public Integer getIsUploadPhoto() {
+        return isUploadPhoto;
+    }
 
+    public void setIsUploadPhoto(Integer isUploadPhoto) {
+        this.isUploadPhoto = isUploadPhoto;
+    }
+    public String getDemandDeptName() {
+        return demandDeptName;
+    }
+
+    public void setDemandDeptName(String demandDeptName) {
+        this.demandDeptName = demandDeptName;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -886,6 +905,8 @@ public class RkInfo extends BaseEntity
                 .append("endDate", endDate)
                 .append("totalAmount", totalAmount)
                 .append("scene", getScene())
+                .append("isUploadPhoto",isUploadPhoto)
+                .append("demandDeptName", demandDeptName)
             .toString();
     }
 }

src/main/java/com/zg/project/wisdom/domain/RkRecord.java

@@ -268,6 +268,15 @@ public class RkRecord extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    /** 是否上传照片（0否 1是） */
+    @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是")
+    private Integer isUploadPhoto;
+
+    /** 需求方（部门/单位） */
+    @Excel(name = "需求方")
+    private String demandDeptName;
+
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -837,6 +846,20 @@ public class RkRecord extends BaseEntity
     public void setRemark(String remark) {
         this.remark = remark;
     }
+    public Integer getIsUploadPhoto() {
+        return isUploadPhoto;
+    }
+
+    public void setIsUploadPhoto(Integer isUploadPhoto) {
+        this.isUploadPhoto = isUploadPhoto;
+    }
+    public String getDemandDeptName() {
+        return demandDeptName;
+    }
+
+    public void setDemandDeptName(String demandDeptName) {
+        this.demandDeptName = demandDeptName;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -904,6 +927,8 @@ public class RkRecord extends BaseEntity
                 .append("startDate", startDate)
                 .append("endDate", endDate)
                 .append("rkInfoId", getRkInfoId())
+                .append("isUploadPhoto", isUploadPhoto)
+                .append("demandDeptName", demandDeptName)
                 .toString();
     }
 }

src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java

@@ -165,7 +165,7 @@ public class RkBillServiceImpl implements IRkBillService
             info.setScene(scene);
             info.setCreateTime(now);
             info.setCreateBy(userId);
-
+            info.setIsUploadPhoto(bill.getIsUploadPhoto());
             rkInfoMapper.insertRkInfo(info);
 
             // rk_record
@@ -262,7 +262,7 @@ public class RkBillServiceImpl implements IRkBillService
         // ⑤ 关联明细
         record.setRkInfoId(info.getId());
         record.setRdid(info.getId());
-
+        record.setIsUploadPhoto(bill.getIsUploadPhoto());
         return record;
     }
     /**
@@ -464,6 +464,8 @@ public class RkBillServiceImpl implements IRkBillService
         updateRecord.setOperator(rkBill.getOperator());
         updateRecord.setIsDelivery(rkBill.getIsDelivery());
         updateRecord.setWlType(rkBill.getWlType());
+        updateRecord.setIsUploadPhoto(rkBill.getIsUploadPhoto());
+
         // 执行批量更新
         rkRecordMapper.updateRecordByBillNo(updateRecord);
         // ====================== 3. 同步更新 rk_info ======================
@@ -478,7 +480,7 @@ public class RkBillServiceImpl implements IRkBillService
         updateInfo.setOperator(rkBill.getOperator());
         updateInfo.setIsDelivery(rkBill.getIsDelivery());
         updateInfo.setWlType(rkBill.getWlType());
-
+        updateInfo.setIsUploadPhoto(rkBill.getIsUploadPhoto());
         rkInfoMapper.updateInfoByBillNo(updateInfo);
 
 

src/main/resources/mybatis/wisdom/RkBillMapper.xml

@@ -44,6 +44,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="isUploadPhoto" column="is_upload_photo"/>
+        <result property="demandDeptName" column="demand_dept_name"/>
     </resultMap>
 
     <!-- ==================== Base Select ==================== -->
@@ -72,7 +74,7 @@
             rb.create_time,
             rb.update_by,
             rb.update_time,
-
+            rb.is_upload_photo,
             mt.type_name AS wl_type_name,
             COALESCE(sit.type_name, sot.type_name) AS operation_type_name,
             su.nick_name AS operator_name,
@@ -199,7 +201,9 @@
             create_time,
             update_by,
             update_time,
-            is_delete
+            is_delete,
+            is_upload_photo,
+            demand_dept_name
         FROM rk_bill
         WHERE bill_no = #{billNo}
           AND (is_delete = '0' OR is_delete IS NULL)
@@ -229,7 +233,9 @@
             remark,
             create_by,
             create_time,
-            is_delete
+            is_delete,
+            is_upload_photo,
+            demand_dept_name
         ) VALUES (
                      #{billNo},
                      #{bizType},
@@ -248,7 +254,9 @@
                      #{remark},
                      #{createBy},
                      #{createTime},
-                     #{isDelete}
+                     #{isDelete},
+                     #{isUploadPhoto},
+                     #{demandDeptName}
                  )
     </insert>
 
@@ -272,6 +280,8 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="isDelivery != null and isDelivery != ''">is_delivery = #{isDelivery},</if>
             <if test="isDelete != null and isDelete != ''">is_delete = #{isDelete},</if>
+            <if test="isUploadPhoto != null ">is_upload_photo = #{isUploadPhoto},</if>
+            <if test="demandDeptName != null and demandDeptName != ''">demand_dept_name = #{demandDeptName},</if>
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -68,6 +68,8 @@
         <result property="isUpdate"      column="is_update"/>
         <result property="scene" column="scene"/>
         <result property="sceneName" column="sceneName"/>
+        <result property="isUploadPhoto" column="is_upload_photo"/>
+        <result property="demandDeptName" column="demand_dept_name"/>
     </resultMap>
 
     <!-- ========================= 公共查询 SQL（联表完整版） ========================= -->
@@ -275,6 +277,9 @@
             <if test="endDate != null">
                 AND ri.operation_time &lt;= #{endDate}
             </if>
+            <if test="remark != null and remark != ''">
+                AND ri.remark LIKE CONCAT('%', #{remark}, '%')
+            </if>
         </where>
     </select>
 
@@ -309,7 +314,7 @@
             is_delivery,
             fycde_1, fycde_2,
             is_update,
-            create_by, create_time, is_delete,scene
+            create_by, create_time, is_delete,scene,is_upload_photo,demand_dept_name
         )
         VALUES (
                    #{operationType}, #{bizType}, #{wlType}, #{cangku}, #{operationTime}, #{operator},
@@ -327,7 +332,7 @@
                    #{isDelivery},
                    #{fycde1}, #{fycde2},
                    #{isUpdate},
-                   #{createBy}, #{createTime}, #{isDelete},#{scene}
+                   #{createBy}, #{createTime}, #{isDelete},#{scene},#{isUploadPhoto},#{demandDeptName}
                )
     </insert>
 
@@ -383,7 +388,9 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
-            <if test="scene != null">scene = #{scene}</if>
+            <if test="scene != null">scene = #{scene},</if>
+            <if test="isUploadPhoto != null">is_upload_photo = #{isUploadPhoto},</if>
+            <if test="demandDeptName != null">demand_dept_name = #{demandDeptName},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -691,6 +698,9 @@
             <if test="isDelivery != null">
                 is_delivery = #{isDelivery},
             </if>
+            <if test="isUploadPhoto != null">
+                is_upload_photo = #{isUploadPhoto},
+            </if>
         </set>
         WHERE bill_no = #{billNo}
     </update>

src/main/resources/mybatis/wisdom/RkRecordMapper.xml

@@ -86,6 +86,8 @@
         <result property="operatorName" column="operatorName"/>
         <result property="parentWarehouseName" column="parentWarehouseName"/>
         <result property="warehouseName" column="warehouseName"/>
+        <result property="isUploadPhoto" column="is_upload_photo"/>
+        <result property="demandDeptName" column="demand_dept_name"/>
     </resultMap>
 
     <!-- ===================== 查询字段（统一视图） ===================== -->
@@ -404,7 +406,9 @@
         create_time,
         update_by,
         update_time,
-        is_delete
+        is_delete,
+        is_upload_photo,
+        demand_dept_name
         )
         VALUES (
 
@@ -471,7 +475,9 @@
         #{createTime},
         #{updateBy},
         #{updateTime},
-        #{isDelete}
+        #{isDelete},
+        #{isUploadPhoto},
+        #{demandDeptName}
         )
     </insert>
 
@@ -542,6 +548,8 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="isUploadPhoto != null">is_upload_photo = #{isUploadPhoto},</if>
+            <if test="demandDeptName != null">demand_dept_name = #{demandDeptName},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -840,6 +848,9 @@
             <if test="endDate != null">
                 AND rr.operation_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
             </if>
+            <if test="remark != null and remark != ''">
+                AND rr.remark LIKE CONCAT('%', #{remark}, '%')
+            </if>
         </where>
 
     </select>
@@ -930,7 +941,9 @@
             <if test="isDelivery != null">
                 is_delivery = #{isDelivery},
             </if>
-
+            <if test="isUploadPhoto != null">
+                is_upload_photo = #{isUploadPhoto},
+            </if>
             update_time = NOW()
         </set>