Merge branch 'master' into 24年二季度其他

db/统计视图.sql

@@ -328,6 +328,12 @@ update pay_confirm_payment_record
 set no_tax_amount = amount_received / 1.06,
     tax           = amount_received - no_tax_amount
 where amount_received is not null;
+-- 2024-7-18 16:01:31 处理打包管理历史数据
+update pay_pack_company
+set receivable_amount = pack_charge_total,
+    no_tax_amount     = receivable_amount / 1.06,
+    tax               = receivable_amount - no_tax_amount
+where pack_year != 2024;
 -- 六个项目处理历史数据
 update pay_common_project
 set confirm_no_tax_amount = confirm_amount / 1.06,

db/统计视图（新）.sql

@@ -578,7 +578,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -614,7 +614,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -651,7 +651,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -688,7 +688,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -725,7 +725,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -762,43 +762,43 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-        where pack = 0
+        where pack = 0 or year < 2024
       group by tcp.id
-#       UNION ALL
-#       SELECT
-#           ppc.id AS id,
-#           ppc.id AS superId,
-#           ppc.company_temporary_name AS projectName,
-#           ppc.pack_principal_name AS principalName,
-#           ppc.company_id AS chargeCompanyId,
-#           ppc.company_temporary_id AS chargeCompanyTemporaryId,
-#           ppc.company_temporary_name AS chargeCompanyTemporaryName,
-#           22 AS chargeUse,
-#           sd.depart_name AS depart,
-#           1 AS pack,
-#           ppc.pack_year AS year,
-#           ppc.in_account AS payStatue,
-#           sd.org_code AS departCode,
-#           sd.id AS departId,
-#           ppc.pack_principal_id AS principalNameId,
-#           8 AS type,
-#           ppc.receivable_amount AS receivableAmount,
-#           ppc.no_tax_amount AS allMoney,
-#           ppc.paid_amount AS comeAllMoney,
-#           ppc.invoice_amount AS billMoney,
-#           ppc.confirm_amount AS confirmAmount,
-#           ppc.paid_no_tax_amount AS paidNoTaxAmount,
-#           ppc.invoice_no_tax_amount AS invoiceNoTaxAmount,
-#           ppc.confirm_no_tax_amount AS confirmNoTaxAmount,
-#           ppc.pack_contact_temporary_name AS contactsName,
-#           group_concat( date_format( pcpr.payment_date, '%Y-%m' ) SEPARATOR ',' ) AS confirmDate,
-#           ppc.create_time AS createTime
-#       FROM pay_pack_company ppc
-#                LEFT JOIN sys_user su ON ppc.pack_principal_id = su.id
-#                LEFT JOIN sys_depart sd ON su.depart_ids = sd.id
-#                LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
-#       GROUP BY
-#           ppc.id
+      UNION ALL
+      SELECT
+          ppc.id AS id,
+          ppc.id AS superId,
+          ppc.company_temporary_name AS projectName,
+          ppc.pack_principal_name AS principalName,
+          ppc.company_id AS chargeCompanyId,
+          ppc.company_temporary_id AS chargeCompanyTemporaryId,
+          ppc.company_temporary_name AS chargeCompanyTemporaryName,
+          22 AS chargeUse,
+          sd.depart_name AS depart,
+          1 AS pack,
+          ppc.pack_year AS year,
+          ppc.in_account AS payStatue,
+          sd.org_code AS departCode,
+          sd.id AS departId,
+          ppc.pack_principal_id AS principalNameId,
+          8 AS type,
+          ppc.receivable_amount AS receivableAmount,
+          ppc.no_tax_amount AS allMoney,
+          ppc.paid_amount AS comeAllMoney,
+          ppc.invoice_amount AS billMoney,
+          ppc.confirm_amount AS confirmAmount,
+          ppc.paid_no_tax_amount AS paidNoTaxAmount,
+          ppc.invoice_no_tax_amount AS invoiceNoTaxAmount,
+          ppc.confirm_no_tax_amount AS confirmNoTaxAmount,
+          ppc.pack_contact_temporary_name AS contactsName,
+          group_concat( date_format( pcpr.payment_date, '%Y-%m' ) SEPARATOR ',' ) AS confirmDate,
+          ppc.create_time AS createTime
+      FROM pay_pack_company ppc
+               LEFT JOIN sys_user su ON ppc.pack_principal_id = su.id
+               LEFT JOIN sys_depart sd ON su.depart_ids = sd.id
+               LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
+      GROUP BY
+          ppc.id
      ) pp
 order by pp.createTime;
 
@@ -931,7 +931,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -968,7 +968,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -1006,7 +1006,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -1044,7 +1044,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -1082,7 +1082,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -1120,7 +1120,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tcp.id
       union all
       SELECT
@@ -1231,7 +1231,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -1268,7 +1268,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -1306,7 +1306,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -1344,7 +1344,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -1382,7 +1382,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -1420,7 +1420,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tcp.id
       UNION ALL
       SELECT

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -1261,9 +1261,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //打包时不需要上传付款凭证
             if (Objects.equals(payMode,MeetingSubitemCommon.PAY_MODE_3)) {
                 isZero = true;
-                amountReceivable = new BigDecimal("0.00");
-                payMeetingSituation1.setAmountReceivable(new BigDecimal("0.00"));
-                payMeetingSituation.setAmountReceivable(new BigDecimal("0.00"));
             }
             payMeetingSituation1.setIsZero(isZero);
             payMeetingSituation1.setPayMode(payMode);