feat(detail): 参会人表新增增值税及附加/摘要/现场照片 3 列 + 劳务协议展示, 角色=劳务形式, 费项改名应发金额/个税税金/实发金额

2026-08-22 16:27:54 +08:00
parent 2ae4cd3ea5
commit da7c19af6c
47 changed files with 4976 additions and 15 deletions
@@ -38,6 +38,12 @@ public class BizMeetingAttendee extends BaseEntity {
    private BigDecimal feePreTax;
    private BigDecimal tax;
    private BigDecimal fee;
+    /** 增值税及附加成本 (财务口径: 平台承担的开票税 + 附加税) */
+    private BigDecimal vatAndSurcharge;
+    /** 摘要 (备注/说明) */
+    private String summary;
+    /** 现场照片 (OSS URLs, 多张用逗号分隔) */
+    private String onSitePhotos;
    /* ===== 审计 + 签字结果 ===== */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date signedAt;
@@ -97,6 +103,12 @@ public class BizMeetingAttendee extends BaseEntity {
    public void setTax(BigDecimal tax) { this.tax = tax; }
    public BigDecimal getFee() { return fee; }
    public void setFee(BigDecimal fee) { this.fee = fee; }
+    public BigDecimal getVatAndSurcharge() { return vatAndSurcharge; }
+    public void setVatAndSurcharge(BigDecimal vatAndSurcharge) { this.vatAndSurcharge = vatAndSurcharge; }
+    public String getSummary() { return summary; }
+    public void setSummary(String summary) { this.summary = summary; }
+    public String getOnSitePhotos() { return onSitePhotos; }
+    public void setOnSitePhotos(String onSitePhotos) { this.onSitePhotos = onSitePhotos; }
    public Date getSignedAt() { return signedAt; }
    public void setSignedAt(Date signedAt) { this.signedAt = signedAt; }
    public String getSignedIp() { return signedIp; }
@@ -22,6 +22,9 @@
        <result property="feePreTax"     column="fee_pre_tax" />
        <result property="tax"           column="tax" />
        <result property="fee"           column="fee" />
+        <result property="vatAndSurcharge" column="vat_and_surcharge" />
+        <result property="summary"       column="summary" />
+        <result property="onSitePhotos"  column="on_site_photos" />
        <result property="signedAt"      column="signed_at" />
        <result property="signedIp"      column="signed_ip" />
        <result property="handsign"  column="handsign"  />
@@ -49,10 +52,13 @@
    <insert id="insertWithProfile" parameterType="BizMeetingAttendee" useGeneratedKeys="true" keyProperty="id">
        insert into biz_meeting_attendee(meeting_id, user_id, name, phone, work_unit, department, title,
            id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name,
-            id_card_attachments, labor_form, fee_pre_tax, tax, fee, create_by, create_time)
+            id_card_attachments, labor_form, fee_pre_tax, tax, fee, vat_and_surcharge, summary, on_site_photos,
+            create_by, create_time)
        values(#{meetingId}, #{userId}, #{name}, #{phone}, #{workUnit}, #{department}, #{title},
            #{idCard}, #{bankCard}, #{bankName}, #{bankBranch}, #{bankRegion}, #{bankAddress}, #{accountName},
-            #{idCardAttachments}, #{laborForm}, #{feePreTax}, #{tax}, #{fee}, #{createBy}, sysdate())
+            #{idCardAttachments}, #{laborForm}, #{feePreTax}, #{tax}, #{fee},
+            #{vatAndSurcharge}, #{summary}, #{onSitePhotos},
+            #{createBy}, sysdate())
    </insert>
    <!-- 批量插入参会人 (BizMeetingController.add 调用) -->
    <insert id="insertBatch">
@@ -83,6 +89,9 @@
            <if test="feePreTax != null">fee_pre_tax = #{feePreTax},</if>
            <if test="tax != null">tax = #{tax},</if>
            <if test="fee != null">fee = #{fee},</if>
+            <if test="vatAndSurcharge != null">vat_and_surcharge = #{vatAndSurcharge},</if>
+            <if test="summary != null">summary = #{summary},</if>
+            <if test="onSitePhotos != null">on_site_photos = #{onSitePhotos},</if>
            update_by = #{updateBy},
            update_time = sysdate()
        </set>
@@ -125,15 +134,15 @@
        delete from biz_meeting_attendee where meeting_id = #{meetingId} and user_id = #{userId}
    </delete>
    <select id="selectByMeetingId" resultMap="BizMeetingAttendeeResult" parameterType="Long">
-        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
+        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, vat_and_surcharge, summary, on_site_photos, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
        from biz_meeting_attendee where meeting_id = #{meetingId}
    </select>
    <select id="selectByUserId" resultMap="BizMeetingAttendeeResult" parameterType="Long">
-        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
+        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, vat_and_surcharge, summary, on_site_photos, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
        from biz_meeting_attendee where user_id = #{userId}
    </select>
    <select id="selectById" resultMap="BizMeetingAttendeeResult" parameterType="Long">
-        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
+        select id, meeting_id, user_id, name, phone, work_unit, department, title, id_card, bank_card, bank_name, bank_branch, bank_region, bank_address, account_name, id_card_attachments, labor_form, fee_pre_tax, tax, fee, vat_and_surcharge, summary, on_site_photos, signed_at, signed_ip, handsign, labor_protocol, create_by, create_time
        from biz_meeting_attendee where id = #{id}
    </select>
    <!--