From 257278343dcbc20679b52803db31db68432df453 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 4 Jul 2024 16:29:15 +0800 Subject: [PATCH 001/111] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=8F=9C=E5=8D=95=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index ce4c8ad8..1944c0dc 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -104,3 +104,33 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1800701388810936321', '1430376424950026242', '委员信息', '/organizationalManage/committeeMemberInfo', 'organizationalManage/committeeMemberInfo/CommitteeMemberInfoList', NULL, NULL, 1, NULL, '1', 24.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-06-12 09:27:21', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1800701184820961281', '1430376424950026242', '委员会详情', '/organizationalManage/committeeDetail', 'organizationalManage/committeeInfo/CommitteeInfoDetail', NULL, NULL, 1, NULL, '1', 23.00, 0, NULL, 1, 1, 0, 1, NULL, 'LKGLZ', '2024-06-12 09:26:33', 'LKGLZ', '2024-06-12 09:26:44', 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1800698635388772353', '', '委员会', '/organizationalManage/committeeInfo', 'organizationalManage/committeeInfo/CommitteeInfoList', NULL, NULL, 0, NULL, '1', 4.10, 0, 'cus_yinzhang', 1, 0, 0, 0, NULL, 'LKGLZ', '2024-06-12 09:16:25', 'LKGLZ', '2024-06-12 09:16:36', 0, 0, '1', 0, 1); + +-- 20240701 财务管理-修改待确收金额 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1806586851988770818', '1435815710331621378', '修改待确收金额', NULL, NULL, NULL, NULL, 2, 'incomePaymentAndInvoiving:editReceivableAmount', '0', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-06-28 15:14:05', NULL, NULL, 0, 0, '1', 0, 1); +-- 20240701 普通项目-新增复制 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1807697397756596226', '1430376521213497345', '复制', '', NULL, NULL, NULL, 2, 'generalProject:copy', '1', 4.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-01 16:47:00', NULL, NULL, 0, 0, '1', 0, 1); +-- 20240701 会员信息统计 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1807709111403286529', '1807708679419334658', '导出', NULL, NULL, NULL, NULL, 2, 'memberStatistic:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-01 17:33:32', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1807709030168006657', '1807708679419334658', '查询', NULL, NULL, NULL, NULL, 2, 'memberStatistic:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-01 17:33:13', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1807708679419334658', '1438394322899558402', '会员信息统计', '/incomePayments/memberManage/MemberStatisticList', 'incomePayments/memberManage/MemberStatisticList', NULL, NULL, 1, NULL, '1', 8.11, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2024-07-01 17:31:49', NULL, NULL, 0, 0, '1', 0, 1); +-- 20240703 工作组-成员单位维护-确认凭证 工作组-全部文件导出 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808440661174550530', '1431167539278086146', '确认凭证', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:confirmVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 18:00:27', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808439808279609346', '1430718058514440194', '全部文件导出', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:exportAllFile', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 17:57:04', NULL, NULL, 0, 0, '1', 0, 1); +-- 20240703 工作组、起草组-会议参会情况-批量审核报名信息 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808458564737335298', '1742070808427126785', '批量审核报名信息', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:batchAuditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 19:11:36', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808458432167968769', '1443462660843458561', '批量审核报名信息', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:batchAuditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 19:11:04', NULL, NULL, 0, 0, '1', 0, 1); +-- 20240704 会议参会情况-编辑打包前金额 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808714130038607873', '1443470901166039042', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 12:07:08', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808713535055613954', '1443461591480487938', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 12:04:46', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808712529420898306', '1744610339198091266', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 12:00:46', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808712332892590081', '1470954992463327234', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:59:59', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808712185471193089', '1803335479314161665', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'overseasMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:59:24', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808711899306414081', '1443460205023940610', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:58:16', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808711775985487874', '1433322232030777345', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:57:46', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808711651183972353', '1443462660843458561', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:57:17', NULL, NULL, 0, 0, '1', 0, 1); + +--20240704 会议酒店推荐 相关菜单 +INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808762081121292290', '1808757213186904065', '下载模板', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:17:40', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761976095920129', '1808757213186904065', '导入', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:17:15', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761869799673858', '1808757213186904065', '查询', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:list', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:16:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808757213186904065', '1430376424950026242', '会议酒店推荐', '/projectManagement/allMeetingList/RecommendHotelPage', 'projectManagement/RecommendHotelPage', NULL, NULL, 1, NULL, '1', 40.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-07-04 14:58:19', 'LKGLZ', '2024-07-04 14:58:31', 0, 0, '1', 0, 1); From d8e3fa05e70c565c7ba5ee3f7960cb4eee6a64cf Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 4 Jul 2024 18:09:45 +0800 Subject: [PATCH 002/111] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E5=B9=B4?= =?UTF-8?q?=E5=BA=A6=E6=95=B0=E6=8D=AE=E9=94=81=E5=AE=9A=E3=80=81=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index 1944c0dc..df947a68 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -134,3 +134,14 @@ INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, ` INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761976095920129', '1808757213186904065', '导入', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:17:15', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761869799673858', '1808757213186904065', '查询', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:list', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:16:50', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808757213186904065', '1430376424950026242', '会议酒店推荐', '/projectManagement/allMeetingList/RecommendHotelPage', 'projectManagement/RecommendHotelPage', NULL, NULL, 1, NULL, '1', 40.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-07-04 14:58:19', 'LKGLZ', '2024-07-04 14:58:31', 0, 0, '1', 0, 1); +--20240704 年度数据锁定 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786188755947522', '1808784364816715778', '批量删除', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:53:28', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786109202583554', '1808784364816715778', '删除', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:53:09', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786043586891777', '1808784364816715778', '编辑', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:53', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808785934673399809', '1808784364816715778', '新增', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:27', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808785856063754242', '1808784364816715778', '查询', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:08', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808784364816715778', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '年度数据锁定', '/isystem/annualDataLockingList', 'system/AnnualDataLockingList', NULL, NULL, 1, NULL, '1', 9.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:46:13', NULL, NULL, 0, 0, '1', 0, 1); +--20240704 企业分类统计菜单 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808798008250093569', '1808797556947177473', '导出', NULL, NULL, NULL, NULL, 2, 'companyPaymentClassificationStatistics:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 17:40:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808797925806854146', '1808797556947177473', '查询', NULL, NULL, NULL, NULL, 2, 'companyPaymentClassificationStatistics:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 17:40:06', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808797556947177473', '1437320526513905666', '企业来款分类统计', '/statisticalReport/enterprisePaymentStatistics/enterprisePaymentClassificationStatisticsList', 'statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList', NULL, NULL, 1, NULL, '1', 2.10, 0, NULL, 1, 0, 1, 0, NULL, 'LKGLZ', '2024-07-04 17:38:38', NULL, NULL, 0, 0, '1', 0, 0); From f50eb80d6ffe42a0e48f928303f1a03b46c216f3 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jul 2024 14:48:45 +0800 Subject: [PATCH 003/111] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=A2=84?= =?UTF-8?q?=E4=BC=B0=E5=88=B0=E8=B4=A6=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMemberProjectSubitemController.java | 34 ++++++++++++++++++- .../TbMemberProjectSubitemController.java | 19 ++++++++--- .../member/entity/TbMemberProjectSubitem.java | 14 ++++++-- .../ITbMemberProjectSubitemService.java | 8 +++++ .../vo/TbMemberProjectSubitemEditVO.java | 4 +-- .../controller/PayPackCompanyController.java | 17 ++++++++++ .../PayCommonProjectController.java | 26 +++++++++++++- .../PayWorkingGroupSubItemController.java | 31 +++++++++++++++++ .../entity/PayWorkingGroupSubItem.java | 2 +- .../PayWorkingGroupSubItemServiceImpl.java | 3 +- 10 files changed, 146 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 62188e81..dd2376cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -2,6 +2,7 @@ package com.jero.member.controller; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -36,6 +37,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.vo.PayMemberProjectSubitemExcel; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.PayWorkingGroupSubItem; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.commons.collections.CollectionUtils; @@ -87,6 +89,17 @@ public class PayMemberProjectSubitemController extends JeroController parameterMap = req.getParameterMap(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, parameterMap); + // 处理预计到账开始日期，拼接 -01 + if (StringUtils.isNotBlank(payMemberProjectSubitem.getEstimatedArrivalStartDate())) { + String startDate = payMemberProjectSubitem.getEstimatedArrivalStartDate() + "-01"; + payMemberProjectSubitem.setEstimatedArrivalStartDate(startDate); + } + // 处理预计到账结束日期，计算该月最后一天 + if (StringUtils.isNotBlank(payMemberProjectSubitem.getEstimatedArrivalEndDate())) { + YearMonth yearMonth = YearMonth.parse(payMemberProjectSubitem.getEstimatedArrivalEndDate(), DateTimeFormatter.ofPattern("yyyy-MM")); + LocalDate endDate = yearMonth.atEndOfMonth(); + payMemberProjectSubitem.setEstimatedArrivalEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } // 预计到账开始日期 String estimatedArrivalStartDate = payMemberProjectSubitem.getEstimatedArrivalStartDate(); // 预计到账结束日期 @@ -112,6 +125,17 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = memberProjectSubitemService.getPage(page, queryWrapper); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + // 处理 预估到账日期 字段 ,变为yyyy-MM格式 + if(StringUtils.isNotBlank(p.getEstimatedArrivalDate())){ + String estimatedArrivalDate = p.getEstimatedArrivalDate(); + String formattedDate = estimatedArrivalDate.substring(0, 7); // 截取字符串的前7个字符 "yyyy-MM" + p.setEstimatedArrivalDate(formattedDate); + } + }); + } return Result.OK(pageList); } @@ -170,6 +194,7 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(pageNo, pageSize); + // 处理预计到账开始日期，拼接 -01 + if (StringUtils.isNotBlank(tbMemberProjectSubitem.getEstimatedArrivalDate_begin())) { + String startDate = tbMemberProjectSubitem.getEstimatedArrivalDate_begin() + "-01"; + tbMemberProjectSubitem.setEstimatedArrivalDate_begin(startDate); + } + // 处理预计到账结束日期，计算该月最后一天 + if (StringUtils.isNotBlank(tbMemberProjectSubitem.getEstimatedArrivalDate_end())) { + YearMonth yearMonth = YearMonth.parse(tbMemberProjectSubitem.getEstimatedArrivalDate_end(), DateTimeFormatter.ofPattern("yyyy-MM")); + LocalDate endDate = yearMonth.atEndOfMonth(); + tbMemberProjectSubitem.setEstimatedArrivalDate_end(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } IPage pageList = tbMemberProjectSubitemService.pageList(page, req, tbMemberProjectSubitem); for (TbMemberProjectSubitem record : pageList.getRecords()) { record.setEmail(PasswordUtil.decrypt(record.getEmail())); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 440d5a6e..b485c0c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -174,12 +174,22 @@ public class TbMemberProjectSubitem implements Serializable { private BigDecimal confirmAmount; /**预估到账日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "预估到账日期") - @Excel(name = "预估到账日期", width = 15, format = "yyyy-MM-dd") + @Excel(name = "预估到账日期", width = 15, format = "yyyy-MM") private Date estimatedArrivalDate; + /**预计到账开始日期*/ + @ApiModelProperty(value = "预计到账开始的日期") + @TableField(exist = false) + private String estimatedArrivalDate_begin; + + /**预计到账结束的日期*/ + @ApiModelProperty(value = "预计到账结束的日期") + @TableField(exist = false) + private String estimatedArrivalDate_end; + /**需要发票*/ @Excel(name = "需要发票", width = 15,dicCode = "invoice_type") @ApiModelProperty(value = "需要发票") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 019f1da0..22188dfa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -536,6 +536,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); + String estimatedArrivalDateBegin = tbMemberProjectSubitem.getEstimatedArrivalDate_begin(); + String estimatedArrivalDateEnd = tbMemberProjectSubitem.getEstimatedArrivalDate_end(); if (StringUtils.isNotBlank(invalidationDateStr)){ DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); queryWrapper.eq("year(invalidation_date)",invalidationDate.year()); @@ -546,6 +548,12 @@ public class ITbMemberProjectSubitemService extends ServiceImpl add(@RequestBody PayPackCompany payPackCompany) { + if (!StringUtils.isBlank(payPackCompany.getEstimatedArrivalDate())) { + payPackCompany.setEstimatedArrivalDate(payPackCompany.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payPackCompany); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -163,6 +172,9 @@ public class PayPackCompanyController extends JeroController edit(@RequestBody PayPackCompany payPackCompany) { + if (!StringUtils.isBlank(payPackCompany.getEstimatedArrivalDate())) { + payPackCompany.setEstimatedArrivalDate(payPackCompany.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payPackCompany); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -351,6 +363,11 @@ public class PayPackCompanyController extends JeroController add(@RequestBody PayCommonProject payCommonProject) { - if (Objects.isNull(payCommonProject.getEstimatedArrivalDate())) { + if (StringUtils.isBlank(payCommonProject.getEstimatedArrivalDate())) { return Result.error("预估到账日期不能为空"); } + // 给预估到账日期字段 yyyy-MM 拼接 -01 以便正确入库 + payCommonProject.setEstimatedArrivalDate(payCommonProject.getEstimatedArrivalDate() + "-01"); StringBuilder msg = ValidUtil.validateAll(payCommonProject); if(!StringUtils.isBlank(msg)){ return Result.error(msg.toString()); @@ -412,6 +434,8 @@ public class PayCommonProjectController extends JeroController add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getEstimatedArrivalDate())) { + payWorkingGroupSubItem.setEstimatedArrivalDate(payWorkingGroupSubItem.getEstimatedArrivalDate() + "-01"); + } // 找到工作组 看是否收费，如果不收费则填入默认字段 payWorkingGroupService.validAndSetDefaultValue(payWorkingGroupSubItem); StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); @@ -472,6 +495,9 @@ public class PayWorkingGroupSubItemController extends JeroController edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getEstimatedArrivalDate())) { + payWorkingGroupSubItem.setEstimatedArrivalDate(payWorkingGroupSubItem.getEstimatedArrivalDate() + "-01"); + } StringBuilder msg = ValidUtil.validateAll(payWorkingGroupSubItem); if (!StringUtils.isBlank(msg)) { return Result.error(msg.toString()); @@ -746,6 +772,11 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 0ff6e969..13e68a2d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -130,7 +130,7 @@ public class PayWorkingGroupSubItem implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "预估到账日期") - @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM-dd") + @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM") private String estimatedArrivalDate; /**实收金额（元）*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index cf651e69..fb15b4ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -793,7 +793,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); } else { try { - LocalDate.parse(estimatedArrivalDate, DateTimeFormatter.ofPattern("yyyy-MM-dd")); + p.setEstimatedArrivalDate(estimatedArrivalDate + "-01"); + LocalDate.parse(estimatedArrivalDate + "-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")); } catch (Exception e) { msg.append("第").append(list.indexOf(p) + 3).append("行预估到账日期格式不正确，请修改。
"); } From a969d6a498eeef32187ec589ecc85435299c8a6f Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jul 2024 18:16:56 +0800 Subject: [PATCH 004/111] =?UTF-8?q?add:=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98-=E5=B9=B4=E5=BA=A6=E4=BC=9A=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnnualMemberProjectController.java | 84 +++++++++++++++++++ .../mapper/AnnualMemberProjectMapper.java | 20 +++++ .../mapper/xml/AnnualMemberProjectMapper.xml | 25 ++++++ .../service/IAnnualMemberProjectService.java | 66 +++++++++++++++ .../member/vo/AnnualMemberProjectExcelVO.java | 50 +++++++++++ 5 files changed, 245 insertions(+) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/AnnualMemberProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java new file mode 100644 index 00000000..fa6b7014 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java @@ -0,0 +1,84 @@ +package com.jero.member.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.oConvertUtils; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.IAnnualMemberProjectService; +import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.member.vo.AnnualMemberProjectExcelVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 年度会员维护 + */ +@Api(tags="年度会员维护") +@RestController +@RequestMapping("/member/annulMemberProject") +@Slf4j +public class AnnualMemberProjectController extends JeroController { + + @Resource + private IAnnualMemberProjectService annualMemberProjectService; + + + /** + * 分页列表查询 + */ + @RequiresPermissions("safeguardStardsMember:search") + @ApiOperation(value="年度会员维护-分页列表查询", notes="年度会员维护-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page<>(pageNo, pageSize); + IPage pageList = annualMemberProjectService.pageList(page, req, tbMemberProjectSubitem); + return Result.OK(pageList); + } + + /** + * 导出excel + */ + @ApiOperation(value = "导出") + @RequiresPermissions("safeguardStardsMember:export") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest req, TbMemberProjectSubitem tbMemberProjectSubitem) { + List pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem); + List recordList; + // 过滤选中数据 + String selections = req.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + recordList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } else { + recordList = pageList; + } + List exportList = new ArrayList<>(); + for (TbMemberProjectSubitem item : recordList) { + AnnualMemberProjectExcelVO annualMemberProjectExcelVO = new AnnualMemberProjectExcelVO(); + annualMemberProjectExcelVO.setMemberNo(item.getMemberNo()); + annualMemberProjectExcelVO.setMemberStatus(item.getMemberStatus()); + annualMemberProjectExcelVO.setLiaisonManId(item.getLiaisonManId()); + annualMemberProjectExcelVO.setCompanyName(item.getCompanyName()); + annualMemberProjectExcelVO.setInvalidationDateStr(item.getInvalidationDateStr()); + annualMemberProjectExcelVO.setEffectiveDateStr(item.getEffectiveDateStr()); + exportList.add(annualMemberProjectExcelVO); + } + return super.exportListXls(exportList, AnnualMemberProjectExcelVO.class, "年度会员维护表"); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/AnnualMemberProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/AnnualMemberProjectMapper.java new file mode 100644 index 00000000..c1095cb9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/AnnualMemberProjectMapper.java @@ -0,0 +1,20 @@ +package com.jero.member.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.member.entity.TbMemberProjectSubitem; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 年度会员维护 + */ +public interface AnnualMemberProjectMapper { + + IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List pageList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml new file mode 100644 index 00000000..ace813f7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java new file mode 100644 index 00000000..19ac4c45 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java @@ -0,0 +1,66 @@ +package com.jero.member.service; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.mapper.AnnualMemberProjectMapper; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * 年度会员维护 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class IAnnualMemberProjectService { + + @Resource + private AnnualMemberProjectMapper annualMemberProjectMapper; + @Resource + private RolePermissionService rolePermissionService; + + + public IPage pageList(Page page, HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) { + QueryWrapper queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem); + return annualMemberProjectMapper.pageList(page,queryWrapper); + } + + public List pageList(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) { + QueryWrapper queryWrapper = generateQueryWrapper(request, tbMemberProjectSubitem); + return annualMemberProjectMapper.pageList(queryWrapper); + } + + private QueryWrapper generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); + String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); + String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); + if (StringUtils.isNotBlank(invalidationDateStr)){ + DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); + queryWrapper.eq("year(invalidation_date)",invalidationDate.year()); + queryWrapper.eq("month(invalidation_date)",invalidationDate.month()+1); + } + if (StringUtils.isNotBlank(effectiveDateStr)){ + DateTime effectiveDate = DateUtil.parse(effectiveDateStr, DatePattern.NORM_MONTH_PATTERN); + queryWrapper.eq("year(effective_date)",effectiveDate.year()); + queryWrapper.eq("month(effective_date)",effectiveDate.month()+1); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { + queryWrapper.eq("tmp.director_id",sysUser.getId()); + } + return queryWrapper; + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java new file mode 100644 index 00000000..098c1283 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AnnualMemberProjectExcelVO.java @@ -0,0 +1,50 @@ +package com.jero.member.vo; + +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +public class AnnualMemberProjectExcelVO { + + /**id*/ + @ApiModelProperty(value = "id") + private String id; + + /**会员单位*/ + @ApiModelProperty(value = "会员单位") + @Excel(name = "会员单位", width = 20) + private String companyName; + + /**会员编号*/ + @Excel(name = "会员编号", width = 20) + @ApiModelProperty(value = "会员编号") + private String memberNo; + + /**会员状态*/ + @Excel(name = "会员状态", width = 15, dicCode = "member_status") + @ApiModelProperty(value = "会员状态") + @Dict(dicCode = "member_status") + private Integer memberStatus; + + /**会员联系人*/ + @ApiModelProperty(value = "企业联系人") + @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + private String liaisonManId; + + /** 生效日期 */ + @ApiModelProperty(value = "生效日期") + @Excel(name = "会员单位", width = 20) + private String effectiveDateStr; + + /** + * 失效日期 + */ + @ApiModelProperty(value = "失效日期") + @Excel(name = "失效日期", width = 20) + private String invalidationDateStr; + + +} From 67774c96ffbcaa66fbb0c1eff5e4cf5f8d30d0b2 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jul 2024 09:36:34 +0800 Subject: [PATCH 005/111] =?UTF-8?q?update:=E5=B9=B4=E5=BA=A6=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4-=E8=AF=A6=E6=83=85-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA,=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/member/entity/TbMemberProjectSubitem.java | 12 ++++++++++-- .../member/mapper/xml/AnnualMemberProjectMapper.xml | 1 + .../mapper/xml/TbMemberProjectSubitemMapper.xml | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index b485c0c4..ee0c046f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -112,7 +112,7 @@ public class TbMemberProjectSubitem implements Serializable { private String postContactId; /**邮箱*/ - //@Excel(name = "邮箱", width = 20,exportConvert = true) + @Excel(name = "邮箱", width = 20,exportConvert = true) @ApiModelProperty(value = "邮箱") private String email; @@ -204,13 +204,16 @@ public class TbMemberProjectSubitem implements Serializable { /**到账*/ @ApiModelProperty(value = "到账") + @Excel(name = "是否到账", width = 15, dicCode = "account_type") private Integer inAccount; /**开票*/ @ApiModelProperty(value = "开票") + @Excel(name = "收否开票", width = 15, dicCode = "make_invoice_type") private Integer makeInvoice; @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））") + @Excel(name = "是否确收", width = 15, dicCode = "affirmi_ncome") private Integer affirmIncome; /**邮寄*/ @@ -219,7 +222,7 @@ public class TbMemberProjectSubitem implements Serializable { /**提票"*/ @ApiModelProperty(value = "提票") - //@Excel(name = "提票", width = 15,dicCode = "yn") + @Excel(name = "是否提票", width = 15,dicCode = "yn") @Dict(dicCode = "yn") private Integer ticketCollection; @@ -410,4 +413,9 @@ public class TbMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "权益状态") @TableField(exist = false) private String equityStatus; + + @ApiModelProperty(value = "信用代码") + @TableField(exist = false) + @Excel(name = "信用代码", width = 15) + private String dutyCode; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml index ace813f7..b32681de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml @@ -18,6 +18,7 @@ select vmps.* from v_member_project_subitem vmps + LEFT JOIN tb_member_project tmp on tmp.id = vmps.project_id ${ew.customSqlSegment} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index 86f74404..ac529314 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -88,9 +88,10 @@ From 79a2fdaeb383e40bbb7633711396c073929cda2c Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jul 2024 11:07:05 +0800 Subject: [PATCH 006/111] =?UTF-8?q?update:=E5=9C=A8=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A2=AB=E6=8B=89=E5=85=A5=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbMemberProjectSubitemController.java | 25 ++++++++++--------- .../xml/TbMemberProjectSubitemMapper.xml | 3 +-- .../PayPackCompanyProjectServiceImpl.java | 8 ++++++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index 37b842bc..dfcc2a10 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -7,24 +7,15 @@ import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.format.DateParser; -import com.jero.aspect.annotation.CompanyNameTranslate; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; -import com.jero.member.entity.PayMemberProjectSubitem; -import com.jero.member.entity.TbMemberProject; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.service.IPayCompanyManagementService; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -60,6 +51,8 @@ public class TbMemberProjectSubitemController extends JeroController diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index 88676a38..65ae6d13 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.common.PackCommon; @@ -85,6 +86,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.in(PayPackCompanyProject::getProjectId, Arrays.asList(payPackCompanyProject.getProjectIds())); From 78a553c1bd850ec811a5345220f6f3fbc7afee4b Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jul 2024 13:43:14 +0800 Subject: [PATCH 007/111] =?UTF-8?q?add:=E5=B7=A5=E4=BD=9C=E7=BB=84,?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84=E4=BC=9A=E8=AE=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DraftGroupMeetingSituationController.java | 23 +++++++++++++++++++ .../WorkGroupMeetingSituationController.java | 23 +++++++++++++++++++ .../java/com/jero/meeting/vo/CheckVO.java | 1 + .../AnnualMemberProjectController.java | 4 ++-- .../service/IAnnualMemberProjectService.java | 8 +++---- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index 030ebc28..324f52b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 起草组会议 参会人信息 @@ -194,6 +195,28 @@ public class DraftGroupMeetingSituationController extends JeroController checkRegisterBatch(@RequestBody CheckVO checkVO) { + List ids = Arrays.asList(checkVO.getIds().split(",")); + List checkVOS = ids.stream() + .map(id -> { + CheckVO checkVO1 = new CheckVO(); + checkVO1.setCheckResult(checkVO.getCheckResult()); + checkVO1.setCheckRemark(checkVO.getCheckRemark()); + checkVO1.setId(id); + return checkVO1; + }) + .collect(Collectors.toList()); + checkVOS.forEach(payMeetingSituationService::checkRegister); + return Result.OK("审核成功!"); + } + // /** // * 审核缴费凭证 // */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index f359b550..3894adf6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** @@ -203,6 +204,28 @@ public class WorkGroupMeetingSituationController extends JeroController checkRegisterBatch(@RequestBody CheckVO checkVO) { + List ids = Arrays.asList(checkVO.getIds().split(",")); + List checkVOS = ids.stream() + .map(id -> { + CheckVO checkVO1 = new CheckVO(); + checkVO1.setCheckResult(checkVO.getCheckResult()); + checkVO1.setCheckRemark(checkVO.getCheckRemark()); + checkVO1.setId(id); + return checkVO1; + }) + .collect(Collectors.toList()); + checkVOS.forEach(payMeetingSituationService::checkRegister); + return Result.OK("审核成功!"); + } + /** * 合并开票 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java index a2631235..03001253 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CheckVO.java @@ -13,4 +13,5 @@ public class CheckVO { private Integer checkResult; private String checkRemark; private String id; + private String ids; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java index fa6b7014..59e23b89 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java @@ -39,7 +39,7 @@ public class AnnualMemberProjectController extends JeroController> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem, @@ -55,7 +55,7 @@ public class AnnualMemberProjectController extends JeroController pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java index 19ac4c45..22ebb539 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java @@ -56,10 +56,10 @@ public class IAnnualMemberProjectService { queryWrapper.eq("year(effective_date)",effectiveDate.year()); queryWrapper.eq("month(effective_date)",effectiveDate.month()+1); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { - queryWrapper.eq("tmp.director_id",sysUser.getId()); - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) { +// queryWrapper.eq("tmp.director_id",sysUser.getId()); +// } return queryWrapper; } From 9e0ecc0ab0de006efc77fb17f08bbe89d5512f41 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jul 2024 16:47:57 +0800 Subject: [PATCH 008/111] =?UTF-8?q?add:=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5;?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4=E5=87=AD=E8=AF=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 34 +++++++++++++++++-- .../impl/PayPaymentCheckServiceImpl.java | 3 ++ .../jero/project/common/PayProjectCommon.java | 17 ++++++++++ .../PayWorkingGroupSubItemController.java | 17 ++++++++++ .../entity/PayWorkingGroupSubItem.java | 6 ++++ .../xml/PayWorkingGroupSubItemMapper.xml | 10 +++++- .../IPayWorkingGroupSubItemService.java | 6 ++++ .../PayWorkingGroupSubItemServiceImpl.java | 25 +++++++++++--- 8 files changed, 110 insertions(+), 8 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index df947a68..d185ef55 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -129,19 +129,47 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808711775985487874', '1433322232030777345', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:57:46', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808711651183972353', '1443462660843458561', '编辑打包前金额', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:editBeforePackMoney', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 11:57:17', NULL, NULL, 0, 0, '1', 0, 1); ---20240704 会议酒店推荐 相关菜单 +-- 20240704 会议酒店推荐 相关菜单 INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808762081121292290', '1808757213186904065', '下载模板', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:17:40', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761976095920129', '1808757213186904065', '导入', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:17:15', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808761869799673858', '1808757213186904065', '查询', NULL, NULL, NULL, NULL, 2, 'recommendHotelPage:list', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 15:16:50', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808757213186904065', '1430376424950026242', '会议酒店推荐', '/projectManagement/allMeetingList/RecommendHotelPage', 'projectManagement/RecommendHotelPage', NULL, NULL, 1, NULL, '1', 40.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-07-04 14:58:19', 'LKGLZ', '2024-07-04 14:58:31', 0, 0, '1', 0, 1); ---20240704 年度数据锁定 +-- 20240704 年度数据锁定 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786188755947522', '1808784364816715778', '批量删除', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:53:28', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786109202583554', '1808784364816715778', '删除', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:53:09', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808786043586891777', '1808784364816715778', '编辑', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:53', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808785934673399809', '1808784364816715778', '新增', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:27', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808785856063754242', '1808784364816715778', '查询', NULL, NULL, NULL, NULL, 2, 'annualDataLockingList:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:52:08', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808784364816715778', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '年度数据锁定', '/isystem/annualDataLockingList', 'system/AnnualDataLockingList', NULL, NULL, 1, NULL, '1', 9.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2024-07-04 16:46:13', NULL, NULL, 0, 0, '1', 0, 1); ---20240704 企业分类统计菜单 +-- 20240704 企业分类统计菜单 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808798008250093569', '1808797556947177473', '导出', NULL, NULL, NULL, NULL, 2, 'companyPaymentClassificationStatistics:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 17:40:26', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808797925806854146', '1808797556947177473', '查询', NULL, NULL, NULL, NULL, 2, 'companyPaymentClassificationStatistics:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-04 17:40:06', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808797556947177473', '1437320526513905666', '企业来款分类统计', '/statisticalReport/enterprisePaymentStatistics/enterprisePaymentClassificationStatisticsList', 'statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList', NULL, NULL, 1, NULL, '1', 2.10, 0, NULL, 1, 0, 1, 0, NULL, 'LKGLZ', '2024-07-04 17:38:38', NULL, NULL, 0, 0, '1', 0, 0); + +-- 20240705 标协会员的视图创建 +CREATE VIEW v_member_project_subitem AS +SELECT + `t1`.`id` AS `id`, + `t1`.`member_no` AS `member_no`, + `t1`.`company_name` AS `company_name`, + `t1`.`liaison_man_id` AS `liaison_man_id`, + `t1`.`member_status` AS `member_status`, + `t1`.`effective_date` AS `effective_date`, + `t1`.`invalidation_date` AS `invalidation_date`, + `t1`.`create_time` AS `create_time`, + `t1`.`project_id` AS `project_id` +FROM + ( + `tb_member_project_subitem` `t1` + JOIN ( SELECT `tb_member_project_subitem`.`company_id` AS `company_id`, max( `tb_member_project_subitem`.`create_time` ) AS `max_create_time` FROM `tb_member_project_subitem` GROUP BY `tb_member_project_subitem`.`company_id` ) `t2` ON ((( + `t1`.`company_id` = `t2`.`company_id` + ) + AND ( `t1`.`create_time` = `t2`.`max_create_time` )))) +WHERE + ( + `t1`.`member_status` IS NOT NULL); + +-- 20240708 工作组成员新增是否审核,是否确认凭证字段 +ALTER TABLE `tb_member_project_subitem` + add column check_payment_status tinyint(1) comment '是否审核（1：是，0：否）', + add column confirm_voucher tinyint(1) comment '是否确认凭证（1：是，0：否）'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index e6c5b4a3..73032929 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -563,6 +563,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl0 && <总金额（半满标志））） */ public static Integer AFFIRM_INCOME0 = 0; + + /** + * 1 已审核 + */ + public static Integer IS_CHECK_PAY_MENT = 1; + /** + * 0 未审核 + */ + public static Integer NOT_CHECK_PAY_MENT = 0; + /** + * 1 确认凭证 + */ + public static Integer IS_CONFIRM_VOUCHER = 1; + /** + * 0 未确认凭证 + */ + public static Integer NOT_CONFIRM_VOUCHER = 0; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index b263329c..fe7c40b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -455,6 +455,9 @@ public class PayWorkingGroupSubItemController extends JeroController errInfoList = new ArrayList<>(); for (String workingGroupId : workingGroupIdsArr) { @@ -932,4 +935,18 @@ public class PayWorkingGroupSubItemController extends JeroController confirmVoucher(@RequestParam(name = "id") String id) { + payWorkingGroupSubItemService.confirmVoucher(id); + return Result.OK("确认凭证成功！"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 13e68a2d..d54c5cb7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -614,4 +614,10 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "工作组ids 多个以逗号分隔") @TableField(exist = false) private String workingGroupIds; + + @ApiModelProperty(value = "是否审核（1：是，0：否") + private Integer checkPaymentStatus; + + @ApiModelProperty(value = "是否确认凭证（1：是，0：否") + private Integer confirmVoucher; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 9c3fd69a..acdf652f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -57,7 +57,9 @@ pwgs.tax_rate, pwgs.no_tax_amount, pwgs.label, - pwgs.estimated_arrival_date + pwgs.estimated_arrival_date, + pwgs.check_payment_status, + pwgs.confirm_voucher FROM pay_working_group_subitem pwgs LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id left join pay_company_management_temporary pcmt on pwgs.charge_company_temporary_id = pcmt.id @@ -92,6 +94,12 @@ and pwgs.id = #{payWorkingGroupSubItem.id} + + and pwgs.confirm_voucher = #{payWorkingGroupSubItem.confirmVoucher} + + + and pwgs.check_payment_status = #{payWorkingGroupSubItem.checkPaymentStatus} + GROUP BY pwgs.id ORDER BY pwgs.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index 8b67317f..13869c55 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -145,4 +145,10 @@ public interface IPayWorkingGroupSubItemService extends IService listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); // 添加联系人表 @@ -453,10 +455,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId, workingGroupSubItemId); @@ -1498,4 +1502,17 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayWorkingGroupSubItem::getId, id); + updateWrapper.set(PayWorkingGroupSubItem::getConfirmVoucher, PayProjectCommon.IS_CONFIRM_VOUCHER); + payWorkingGroupSubItemMapper.update(null, updateWrapper); + } } From 8423a1b0e824c0370ceb856a43addcd96479d475 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Tue, 9 Jul 2024 10:35:04 +0800 Subject: [PATCH 009/111] =?UTF-8?q?update:=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=8C=89=E7=85=A7sortNo=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F,?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 32 +++++++------------ .../xml/PayPackCompanyProjectMapper.xml | 29 ++++++++++++----- .../controller/PayWorkingGroupController.java | 1 + .../jero/project/entity/PayCommonProject.java | 3 ++ .../jero/project/entity/PayWorkingGroup.java | 3 ++ .../mapper/xml/PayWorkingGroupMapper.xml | 8 +++-- 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index d185ef55..54896d6f 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -148,28 +148,18 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com -- 20240705 标协会员的视图创建 CREATE VIEW v_member_project_subitem AS -SELECT - `t1`.`id` AS `id`, - `t1`.`member_no` AS `member_no`, - `t1`.`company_name` AS `company_name`, - `t1`.`liaison_man_id` AS `liaison_man_id`, - `t1`.`member_status` AS `member_status`, - `t1`.`effective_date` AS `effective_date`, - `t1`.`invalidation_date` AS `invalidation_date`, - `t1`.`create_time` AS `create_time`, - `t1`.`project_id` AS `project_id` -FROM - ( - `tb_member_project_subitem` `t1` - JOIN ( SELECT `tb_member_project_subitem`.`company_id` AS `company_id`, max( `tb_member_project_subitem`.`create_time` ) AS `max_create_time` FROM `tb_member_project_subitem` GROUP BY `tb_member_project_subitem`.`company_id` ) `t2` ON ((( - `t1`.`company_id` = `t2`.`company_id` - ) - AND ( `t1`.`create_time` = `t2`.`max_create_time` )))) -WHERE - ( - `t1`.`member_status` IS NOT NULL); +select `t1`.`id` AS `id`,`t1`.`member_no` AS `member_no`,`t1`.`company_name` AS `company_name`,`t1`.`liaison_man_id` AS `liaison_man_id`, + `t1`.`member_status` AS `member_status`,`t1`.`effective_date` AS `effective_date`,`t1`.`invalidation_date` AS `invalidation_date`, + `t1`.`create_time` AS `create_time`,`t1`.`project_id` AS `project_id` from (`tb_member_project_subitem` `t1` join + (select `tb_member_project_subitem`.`company_id` AS `company_id`,max(`tb_member_project_subitem`.`create_time`) AS `max_create_time` + from `tb_member_project_subitem` group by `tb_member_project_subitem`.`company_id`) `t2` on(((`t1`.`company_id` = `t2`.`company_id`) + and (`t1`.`create_time` = `t2`.`max_create_time`)))) where (`t1`.`member_status` is not null); -- 20240708 工作组成员新增是否审核,是否确认凭证字段 ALTER TABLE `tb_member_project_subitem` add column check_payment_status tinyint(1) comment '是否审核（1：是，0：否）', - add column confirm_voucher tinyint(1) comment '是否确认凭证（1：是，0：否）'; \ No newline at end of file + add column confirm_voucher tinyint(1) comment '是否确认凭证（1：是，0：否）'; + +-- 20240708 工作组表新增自定义排序字段 +ALTER TABLE `pay_working_group` + add column sort_no int comment '自定义排序顺序' \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index dcac6bce..ca99ebe3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -30,13 +30,14 @@ ( project.phone = '' or project.phone IS NULL, pcmt.phone, project.phone ) AS phone, IF ( project.email = '' or project.email IS NULL, pcmt.email, project.email ) AS email, - affirm_income + affirm_income, + project.sort_no from ( select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount, c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,pcm.phone,pcm.email,affirm_income - ,c.mail_contacts_id,c.mail_contacts_temporary_id,c.mail_contacts_temporary_name + ,c.mail_contacts_id,c.mail_contacts_temporary_id,c.mail_contacts_temporary_name, NULL as sort_no from pay_common_project c left join sys_user su on c.principal_id = su.id LEFT JOIN pay_contacts_management pcm ON c.contacts_temporary_id = pcm.id @@ -56,7 +57,7 @@ UNION ALL select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsubc.contacts_temporary_id as contacts_temporary_id,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,pcm.phone,pcm.email,affirm_income - ,gsub.mail_contacts_id,gsub.mail_contacts_temporary_id,gsub.mail_contacts_temporary_name + ,gsub.mail_contacts_id,gsub.mail_contacts_temporary_id,gsub.mail_contacts_temporary_name,g.sort_no from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id @@ -77,7 +78,7 @@ UNION ALL select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_temporary_id AS contacts_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable, sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,pcm.phone,pcm.email,affirm_income - ,sit.post_contact_id as mail_contacts_id,sit.post_contact_temporary_id as mail_contacts_temporary_id,sit.post_contact_name as mail_contacts_temporary_name + ,sit.post_contact_id as mail_contacts_id,sit.post_contact_temporary_id as mail_contacts_temporary_id,sit.post_contact_name as mail_contacts_temporary_name, NULL as sort_no from pay_meeting meeting left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id @@ -98,7 +99,7 @@ UNION ALL select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id, su.realname,msub.company_contact_temporary_id AS contacts_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable, msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,pcm.phone,pcm.email,affirm_income - ,msub.post_contact_id as mail_contacts_id,msub.post_contact_temporary_id as mail_contacts_temporary_id,msub.post_contact_name as mail_contacts_temporary_name + ,msub.post_contact_id as mail_contacts_id,msub.post_contact_temporary_id as mail_contacts_temporary_id,msub.post_contact_name as mail_contacts_temporary_name, NULL as sort_no from pay_member_project pmp left join sys_user su on pmp.director_id = su.id inner join pay_member_project_subitem msub on pmp.id = msub.project_id @@ -118,7 +119,7 @@ UNION ALL select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id, su.realname,'',pcm.name as contacts_temporary_name,tmsub.company_name,tmsub.amount_receivable, tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,pcm.phone,pcm.email,affirm_income - ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name + ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name, NULL as sort_no from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id @@ -138,7 +139,7 @@ UNION ALL select tcp.id,tmember.project_name,tcp.invoice_amount,tcp.charge_use,tmember.director_id, su.realname,'',pcm.name as contacts_temporary_name,tcp.company_name,tcp.amount_receivable, tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,pcm.phone,pcm.email,affirm_income - ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name + ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name, NULL as sort_no from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_certificate_payment tcp on tmember.id = tcp.project_id @@ -166,7 +167,19 @@ AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate} - GROUP BY ppcp.project_id ORDER BY project.paid_amount asc,project.create_time desc + GROUP BY ppcp.project_id + ORDER BY + CASE + WHEN project.projectType = 2 THEN 0 + ELSE 1 + END, + CASE + WHEN project.projectType = 2 AND project.sort_no IS NULL THEN 1 + WHEN project.projectType = 2 THEN 0 + END, + project.sort_no ASC, + project.paid_amount ASC, + project.create_time DESC + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 32d3ba8c..85a1d341 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -267,4 +267,6 @@ public interface IPayWorkingGroupService extends IService { * @param response */ void exportAllFile(HttpServletRequest request, HttpServletResponse response, PayWorkingGroup payWorkingGroup); + + List queryPageListForCompanyClassification(CompanyComeMoneySearch companyComeMoneySearch); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 0b3c613c..02b35a20 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -1023,6 +1023,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageListForCompanyClassification(CompanyComeMoneySearch companyComeMoneySearch) { + return payWorkingGroupMapper.queryPageListForCompanyClassification(companyComeMoneySearch); + } + private void createEntry(ZipOutputStream zipos, String folderPath, Set addedEntries) throws IOException { if (!addedEntries.contains(folderPath)) { zipos.putNextEntry(new ZipEntry(folderPath)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index fa97b0a4..098cbd2a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -1,5 +1,6 @@ package com.jero.statistics.controller; +import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; @@ -8,9 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; +import com.jero.common.util.SpringContextUtils; import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.service.IPayCompanyManagementService; +import com.jero.config.StaticConfig; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; @@ -20,7 +24,10 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.poi.excel.entity.TemplateExportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,9 +36,15 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.net.URLEncoder; import java.text.DecimalFormat; import java.util.*; +import static cn.hutool.poi.excel.sax.AttributeName.s; + /** * @author zql * @date 2021/9/23 14:07 @@ -212,6 +225,202 @@ public class CompanyComeMoneyStatisticsController { } + /** + * 分类统计 + * + * @param companyComeMoneySearch 企业来款统计 + */ + @RequiresPermissions("companyPaymentStatistics:search") + @ApiOperation(value = "企业来款统计-分类统计") + @GetMapping(value = "/classification") + public Result classification(CompanyComeMoneySearch companyComeMoneySearch, + HttpServletResponse response) { + String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); + List chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + + String year = companyComeMoneySearch.getYear(); + List years = StrUtil.split(year, ','); + companyComeMoneySearch.setYears(years); + Map map = new HashMap<>(); + //获取表头 + List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); + List> titleList = new ArrayList<>(); + for (String s : years) { + Map lm = new HashMap<>(); + lm.put("name", s + "年度待确收金额"); + lm.put("je", "t.je_"+s); + + titleList.add(lm); + } + for (String s : years) { + for (DictModel dictModel : dictModels) { + Map lm = new HashMap<>(); + String text = dictModel.getText(); + String value = dictModel.getValue(); + lm.put("name", s + "年度-" + text +"-待确收金额"); + lm.put("je", "t.je_"+s+"_"+value); + titleList.add(lm); + } + } + map.put("titleList", titleList); + //获取数据 + List list = payWorkingGroupService.queryPageListForCompanyClassification(companyComeMoneySearch); + List> valList = new ArrayList<>(); + //先按企业id分组 + Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); + for (String companyId : chargeCompanyIds) { + Map lm = new HashMap<>(); + //获取单一企业数据 + List companyDateList = companyIdKeyMap.get(companyId); + if (companyDateList.isEmpty()) { + continue; + }else { + String companyName = companyDateList.get(0).getCompanyName(); + lm.put("name", companyName); + } + //按年份分组 + Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + BigDecimal bigDecimal = new BigDecimal("0.00"); + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + lm.put("je_"+yearKey, bigDecimal.toString()); + } + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + for (DictModel dictModel : dictModels) { + BigDecimal bigDecimal = new BigDecimal("0.00"); + String value = dictModel.getValue(); + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + } + lm.put("je_"+yearKey+"_"+value, bigDecimal.toString()); + } + } + valList.add(lm); + } + map.put("valList", valList); + return Result.OK(map); + + }/** + * 分类统计 + * + * @param companyComeMoneySearch 企业来款统计 + */ + @RequiresPermissions("companyPaymentStatistics:search") + @ApiOperation(value = "企业来款统计-分类统计导出") + @GetMapping(value = "/classificationExcel") + public void classificationExcel(CompanyComeMoneySearch companyComeMoneySearch, + HttpServletResponse response) { + String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); + List chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + + String year = companyComeMoneySearch.getYear(); + List years = StrUtil.split(year, ','); + companyComeMoneySearch.setYears(years); + Map map = new HashMap<>(); + //获取表头 + List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); + List> titleList = new ArrayList<>(); + for (String s : years) { + Map lm = new HashMap<>(); + lm.put("name", s + "年度待确收金额"); + lm.put("je", "t.je_"+s); + + titleList.add(lm); + } + for (String s : years) { + for (DictModel dictModel : dictModels) { + Map lm = new HashMap<>(); + String text = dictModel.getText(); + String value = dictModel.getValue(); + lm.put("name", s + "年度-" + text +"-待确收金额"); + lm.put("je", "t.je_"+s+"_"+value); + titleList.add(lm); + } + } + map.put("titleList", titleList); + //获取数据 + List list = payWorkingGroupService.queryPageListForCompanyClassification(companyComeMoneySearch); + List> valList = new ArrayList<>(); + //先按企业id分组 + Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); + for (String companyId : chargeCompanyIds) { + Map lm = new HashMap<>(); + //获取单一企业数据 + List companyDateList = companyIdKeyMap.get(companyId); + if (companyDateList.isEmpty()) { + continue; + }else { + String companyName = companyDateList.get(0).getCompanyName(); + lm.put("name", companyName); + } + //按年份分组 + Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + BigDecimal bigDecimal = new BigDecimal("0.00"); + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + lm.put("je_"+yearKey, bigDecimal.toString()); + } + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + for (DictModel dictModel : dictModels) { + BigDecimal bigDecimal = new BigDecimal("0.00"); + String value = dictModel.getValue(); + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + } + lm.put("je_"+yearKey+"_"+value, bigDecimal.toString()); + } + } + valList.add(lm); + } + map.put("valList", valList); + + + String excelName = "企业来款分类统计导出模板.xlsx"; + String tPath = StaticConfig.TEMPLATE_PATH + excelName; + + TemplateExportParams params = new TemplateExportParams(tPath); + params.setColForEach(true); + Workbook workbook = ExcelExportUtil.exportExcel(params, map); + try { + response.setContentType("application/ms-excel;charset=UTF-8"); + response.setContentType("application/x-download"); + response.setCharacterEncoding("UTF-8"); + response.setHeader("Content-Disposition", + "attachment;filename=".concat(String.valueOf(URLEncoder.encode("征集问题.xls", "UTF-8")))); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + workbook.close(); + + if (outputStream != null) { + outputStream.close(); + } + }catch (Exception e){ + + } + + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyClassificationList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyClassificationList.java new file mode 100644 index 00000000..ae803ea2 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyClassificationList.java @@ -0,0 +1,28 @@ +package com.jero.statistics.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @author zql + * @date 2021/9/23 14:09 + */ +@Data +public class CompanyComeMoneyClassificationList { + + @ApiModelProperty(value = "企业id") + private String companyId; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "年度待确收金额") + private String allMoney; + + @ApiModelProperty(value = "年份") + private String year; + + @ApiModelProperty(value = "来款用途") + private String chargeUse; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index 2055f662..55cc2d22 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -24,6 +24,7 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "来款年份") private String year; + private List years; @ApiModelProperty(value = "应收总金额") private String allMoney; diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 2a20140c..a6db1531 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -361,4 +361,6 @@ template: #批复文件pdf pdf: D:\\hzwl\\income_payments\\income_payments_managerment\\template\\approvalTemplate.pdf #入会申请表word - applicationWord: E:\\biao_zhun_suo\\template\\applicationWord.docx \ No newline at end of file + applicationWord: E:\\biao_zhun_suo\\template\\applicationWord.docx + #模版目录 + templatePath: D:\\hzwl\\income_payments\\income_payments_managerment\\template\\ \ No newline at end of file diff --git a/template/企业来款分类统计导出模板.xlsx b/template/企业来款分类统计导出模板.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3a24478b6bc6cb5ec7a384d19aa8e3e049cc8e7d GIT binary patch literal 9509 zcma)CWmsHG(k8fD2rj`P=-?2X3=TmP1_pNv4ucci-8}>e4#C}myGwxJ65KWLL9%-# zdv~9&f1ESVnYX(7ywzRZr>YcWU|^A<9$SF?ityw8-wo;Ehk=#8f~}Rc9gD&P4Cmni z;!juu_iQQa6DTMSXecPmzru8_t(hT~7HLs!(l7uV;Dz@+=4UH*CJH4sdhfuO2{fHFve?m^BiBsK_T-lc?@p~$Zc*8vj^x+cI%)5(H=iJ8SS2S{F8Nf`IxSq&F;DPQHT`)9*rZ zp8Qy_eEj$=gB-Q6rXo@h1?J2C^lGef{aOD?ye;Y(@0rgl;+obdso7}xI`4PGHk+IlP7(Hh4(;DY`o`my#smy~lrrHTQaP7XG29?H&7>ZFJdX+O5$Y<-|U=-VkHj7_t2%c3B6>A~a= zHLEEWq&v%_5f^`dREooV6ZQ`Ix*ct>d^g=*)S{xKdffyGx;ezt*n#FT=dJZj<=>!kq=;(6_;;tkrD4GY8) zr5Xkqhx#K@(>1)1!jA!M3Id+_3V zXLDnPl6vT*dAaXYVN}BUw7}ygmpIJbn#7AXaHJvFaS_A3D|JiQE+OfO%Rpt9+5VA< z(*PPSEFAp~I}?uDKe# z-iP8Xhw^5SFQn*-N!Ols_{+(j039YNA(&LUUCAQM8Ii@KOM!G|1?5Q;3JZocinJ<@ zV$cl{FZPoZg73#y&U#C(zrguy^aM(~^2 zc*KwEtg-c#MpU(BJ-hIvf_ZvPts6m@ja_ufwh+My=U(&~@}t-W-oa;f;pB^` zgzE0-!J`EB06g(_)>Ph_R68UNG}?U9OY~;jhL|QwWc8xnilv!cK(-IJ7)LcHsS~T9 z<0ToCeS83*s_Sywt3t9)4s|7JP$>DD?7z?4$G!1k=GvPWS{nYgH~L=RpkBg3K{Y>2 z$Vb=l2ka;K=XBfy4Mq@g;}C>Ef=>@3~$M( zICwh2nDJcgW1V!U)_ew((ei}Ldmb0<@9+_W#;~#&JHxEQfe?rL9~UK=0tBnD2+uQu z1tt*n=_{JjNC3XNRLq}I^A0TsAl_7s$Gt;=AK6DzM$&9?CLOU~jj>89LYp0=pSJ(- z8$yTc%*Qd)k#v4-`h}r&v@%;Tq|QW!! z0Y$M+WGZ^+yEbzIN@%X30Br_puoOd_S&pN^)-=?MX`3{cys7+W*Bnr20ZX~%ouhRc zrIpFNQ_x8g5&J{$>gF8|mJE`EiI zOHh2~O{mjyp{OF26k(6Ef42!@r6svEd@8Jj0k#Y$!dyqs^*eumJxfVByg+i=Bnw|M zBSd7~{IkiE11$kh!bX?7wcF*2lK`P~As73*Lxhk0Sp2WHzu>xE4d!{eohcsPjF)N) z-pxngaor^x2;E)f4c`jWW#s@_njyzK6|^kPw`(<4WUfmH#Ap_f3@SBP?n97u2=!75 zdZ;-s>EU$DR(Bu|HXZx|=_Cok%T^-0SMIemjy_HSV)utnN(c8}R-fw$#(ZHvIpeYM z>JA;HSzUwzzqJEl?GKLydD;qA*wkS1oeeIC=EuwpG5VB9xxLT;I1ccCpo=r{R%V1b z3zGw!L!2ToX-m2ddXjYX3Faw9o?=-^UK=c7n$p`#V)yjV8$ZvU3mQC1%k2F$yu&5v z5T$?_=n{IM|K0b9Fj*@0QsrDxbkB>7oZu#OckpVY%fZ)I_BE@ah_SEVVekCfQfb`j z&WPZxsZj387oe?Fu3(x(Ab@DrX#7oR^gzH~6i0PASs=Xv4jirQ^-}jhG3FV%v+#D8 z{WtO%sf%-QYa+fp%dzO^-}^&dZJp8B16rDRNhpgNQ0*P^v}vgp<{Af459S;x`Io+E z@CPsqx;)+YoXPrX5}&T~Dfo=~yJmpL^oNd`W-+URbSpL|b6p5h^tGx|%Yc4aQK$??1}prM%Nz!K?#CC2CoE0{pw zlX(~3y#WCgy!~hbcrO^;?(0$?B$&^v5 zp@|0*4|rm?MS+|8^+KcKyY~sq7)OxMfH9+7&a7G;t&=w$M#3pt{Cp_z_FY!wnP&7a zCUF8JUbP;z5I#wpKmos1WpF-Y2_m+pIlv~k(2H%0>xd8cGr^@4(@fM8GsL6W=1`mR zF4THkS!$kc!=Hc0GA$U2Cr{MS7}{Gg*6aOF58j4FzfVd+ zs+v!bI&#Ap4>dVqy?$NmCfpzc{sF(|Q$#@koY@VzRhVu-3eBv>=Yz z5!x~KEp&D206-4Zh?s3SXFI`Zx%}L^4XxCCu6nOqn#v5Nioxb)$MVUHLUzGS9Zr+^ z$q?My8xV@vYUlau3gCUQ&OKZ!{Kbd<%H=)>@f=nXVW0DR*uS4K;j$J_SW%&%A~d0( z(0*+ccJ|H|hIWr9mIbhR1kqc9yYMfb_`Kd2h{h$&1CC9)(+!lW!3wXSMWJ!R_Kx-g z%e&JE@*03~(58qua7b{7DsgnhqL;$Bbb;bIruVYDyB;enhw1DIcHx@?kk3bk^F=rj z-J4B9n*tXV?(2{x#2Uuong!iL3hnq8-kiJj0BNt!{*1|) z+P9@~(I>$ch#2;+K|o`W_E}-P{h(?`S?Yd~IY_5Kx9L9640f94f z1LKVY-o8LZd#CD~{YY3))bqZr!J+E=cgV*fHbU z0-onk34Ckcl{_3~#he63jfui? ziRe77P>*dT-VwdQHPsAoG=6Gh2( zre=#36nrX$wsNfgU`MRBIO4@3dg``n04oqje!8j{_q4;-PMXYRBdBPJD+mAm0iPp= zsm)B+kB>Yx!m3s^QS-VFAYGI7R;`$Ds(a%o}S6K_T@uy{cT`9y7EjWndn7QpWt@_T4D)P+>8eOh9BTEbA zno7I~$3A~ZuGWS-3R5oz#W(95R@*r`34bi2~h*QYnGlRIR4 zwPk)jw$tym)QaUGG)Mml$XzR?9)Mt*TvZVm4NuQ;DIZT`8%f`(w>M@nLosp`aSp`Z zR{17H-v{e<`N-l=If6?O3YA1F$Gma1+uy$Y8a|1kL%cm3AhE@6En%Xv4gZ93b=Ts; z;$(y*8J#~E0K5&N)8$0LEm4nKLc~p9ab7Zstk267nt%%YWJ2}vIouRNp>iY?PQ)3r zBo-m>H*r?4%`~;X*6*{cB6@CPVd$Fvx3wHtQkbP9^tR$KA!g$6E z668Xv-9{Xi`V?kOe|wo*;l10}4kpa2W}+PtEzOhp*6;9;9awd04^!16vkUQ0$V|7l zI&mHOko!(?9@P#FJ}yz!g3lE9#|-B9_f`=IB>n7%&16b%Lsj20OY5&~42~sA2WIk1 z1unU!7O=SuWLHpAG4|!r^}maMt@wF?F-*75u7ksW_GL*I)C&JRTb*uQtzS@Hv^k<3 z4H)f1SKOBX5TU3GUC}af{acl4(S?Lh`#wZcf_|xyACGLK=#-^MPoGPRRB2}@sq75V zRlRwwh{nSc06`ubyylOagckMhRqRvKE%AA_1bYs}wZi?W)lf0YZ1s8atIk{S=bGC# zf;a(#0+7#EyoywTq0i;xZQCmqtVEqZ1x>w;HiG@xQK~8%nwecJNlDdOT_)E@;RTZ^ zm@UlCw8}tzN6A!5qOlPTqu9_{gOo5K(?*INtC*TUK}F`piuJL{(@I9GuVO$j{lnE9 zv{)U`W$65sRK5SWTEPBG|JU;o_4t~-50vP`M3IwirPPzr!L{lSsHxA5mKc6A4ttgn zlBGQXJ0}xkjcy;}oR@3wv1LxxU?Qa~(RFIzsR)s`Aclo(&ex~AM=!0tgrX_zyQ*PQ zc14rQ(kOt|_d_Sf7ql&xS68krVZE6Ah#<%t&czhWUf!FF)!y-pE?7DxUnsK7#JH1{ zhzy^|?Qc)XKMm4wTynHB4*HJmA&f=nnSLUnj)nMKF&cg%1^TFSiuyP)9 zj%y1AuV-@kkN9q87|*j_t*us!vkZ}?H$x86DnKr=Kad0#m3bNLu1i}UK8d(-1F-?* zUc5N+jYH|ThQ}#Rc`Ys6?)O#z66r7;O~@+;@$qehiy@&~G1>Q<#&p;vH^Zc!uzhk? zLPj}l01tI=SV)9IDilzRYDEfF`Z>257FH%bg&u&yt^*fKWHd0)FJK@{;}tBBk^+}( znILgiC(Zp%$Cg_JA$cLY5&a{&R;Ab4VqOpqE*3Jkf^nXwhs`xBxh~+z51a7VZHbyZ zPZy55`-a|ym*W_MGA1A}-Mp}06l6Sn`($jXU&^=Ro0H#CFjx`DLx%s};oXNm^1f zOGDUgYLM4oEOPo!k###(m7iwII1HrB7AtTn~{rOnJ%Ev7Lc<2 ztlb}2(g%E(`xcQ1w~i36j<|>_N!1X5GJV^K`sU$TMHyUZ2hC$QA>f(Q9^IJjIA65d z_vlq!gW<%b!m{n>@C%Nw-pj4(aXozmfx<#&WlJ%+7;QP3ZP}YdXS_U3KGycEL*Sm{ zI>V`rqShu3K8{YWx~tRTm)3s)%X*4+*P^4~?Dt%|4O&=EZ4N`~F0ckjS6-hJ(Hg_q z%5&nq7-&)#hBf3C7je5$p{*A~o<5yeP#!%~tOWJvA{zq|DOuQWW?~M7ZLyEuoUF;p z+W-OISHG6)T)Y}uz)ezvzBBD{#Xk9JswkhAnAEzNwQSnW&IgY;v#33Jw~{QTf4R@qt0B?RF-iQ}{

*U{2|5%{)|vnQD)nn!1$qIK@ZjQ{pMgFHbXIgXQfy zAh7S&76`vupB~V1x_g!`s?1F$=bEeT>D*`5Ya}GAN}25-aEh_n1Ko+bu)p-cAe4ap zPQ0Ep5AP0APM4S2vr-UyERX8HxuUG~o;hw_ZBD}J)}Ja`d5@w=RnI|6VH~&rHJz+d z)0p2&BaG7WaD+dk6`;I+RQsZk9~bI77=z!{fSTs!11znuYkn>$Vb$-TpzN;-(b58T(9~Ttap3EM^p6 zmF%_oRwL)nCT_-H`b~cVlm@~5Y=?ocYAc5Y-3S?Op%p~xRrF&D@P=HZw|@G1hr;s= z?ALk*Sm6U={bfvfPLsQ8;TeG)%CvSt&BlECwQBq&0LYv;m5Rw>q5+`CY0AcWGGK>b zNg3ajiz>>e$-miChi)>ra=OT@K(+9DRg-%U{a(`#cd-PV{2yFiPZw009T?5=8qmOF zK!L_`;vwSxx%h+Dv}LVW$VXV0v_^B)Pb_ao9iH)+P<%qe?Gz96u#LGMx_|QbPmAjf zX^FXqPYS?82>UT>^ALlwGtsp*G*Gs;HGOCN^9#c;qFfqA1k>NO%}K3m?yK@Es$I)q zuehA4&+~G&3=I_tDRp8<^lngXb9iM{m4`MI&HhAGnYp+3_bC~k1E+%UoO;88ig2_* zB; z57B0fUtB!Kll82u%zuW4l{KwWSaIAlD(`i!1OSmEusBM7*p zy-?ZlyBiD1Ik_~N^pb}kx{M_znzOb{wf`PRY^+-sHAS6yz{ZS}xZof#*$*wqwEJ7rXx71!G z3@f}tX!-Q3wZ@3+nCOZ)j6San@(649rKnU?QqEO-3H=g69>#M(D_UtvYHE2c_!eJP zW!qthV+|`E|83cZb0h+nPksfP7}&T%0Tk^SDOjLVLPMq1Mq9 zkZHBf1cPzf(6!9BAvy5FB_S9ku{2<7G zfOyS)-w}1XGW1Q7<#ZxCer-6O8f@yB&sZ9ewwL0T{d}{W9jS4Y!(n`M0xeaM_?xVR zN3{HHQp$YskJD+@^a?}9MH7_@S!8NtfuUD&F3yW|dqYwQXet@m&cgk`Vca42hQBPKK;*e_8zczzw+ zV#Ao!4VEVhrp_F^5*{DlY;TJi)u`;3;AG9?<~lvEopnqROs~Ix%^ig z{GaGtKg`14d!VuYflk7Q`-2bq1^esj`!~C09jvHb2R=fw*M+)+2@D!DeO3hnUOH6fYpx0SX7mFLmdrrQ z!|ISHXrYp23EBX)^_-z%ySv)XT9b<~bGR!4r zbC~bPnV0Qy{`sQt+zqWlfKBAueUrXw75cZVn|;7x9HLy9+?Eh;FNCU#YqAF(cU?A6 zL_5G4{LH^wUdt{w@wE7IF!_k_Wjn8XvxSy;EF0!it-ws2w{o1ur+Xisr_<{|i@Xm_k>cCCYPr8{LKSB)52k)Ku{c?zeWvzA z-X&+D$cQW^;W+(SqOWp01c6fn=JV*`wHYf2q1C&9WU5Gtp5HqB^Am=$<0r&}vhI}> zqpU*^Oj~B7Rx8)0m&{EvOG-)VXk5hnZ7PhiFVf$hx~@`ri@f1~hg)5g9E2GfPZ6cu zZ2#R$=^fHD)eX*>EiY~ZpQDeyjvG#`)%#&tLFys^TtE}D3|H;3EwQ_>ynjK9YWU3Q zcz(PvA&Lx^%1CvQaNK(;avC(D^m_vtvSr&#=8x6adMnT|H3{q(gz=ya*~>m_i&wB` z=@e;_yRzMwB6Jo|(VUa%=lh?CLz>Q_rr_@ugmDE#PpMxF&zKM`e%g zFI60W*Y|rJ$0PWcKH9&E{i~|ucZzBm&^ulD%TdJp;F2Y>Uw1pdwv73p6b)b9iR-IG1)`NfjVU&a2zul?T7@29dq z`{^e5=QG;xJ^UUr{<8;*hY0fHDesQ}^8f$ci4lH^{yUfX_ZjkgHuF!7Vt*C;Gq?Hs zkbggZ{n^3z!>;f!yg_)tA(B7J{U2?(SmFQx literal 0 HcmV?d00001 From 93270ea8d336385cdb9d95899dff33bbecdeab5b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jul 2024 19:01:12 +0800 Subject: [PATCH 035/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyComeMoneyStatisticsController.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 098cbd2a..680c139b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -246,11 +246,18 @@ public class CompanyComeMoneyStatisticsController { //获取表头 List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); List> titleList = new ArrayList<>(); + Map map1 = new HashMap<>(); + map1.put("name", "企业名称"); + map1.put("key", "name"); + titleList.add(map1); + + Map allMap = new HashMap<>(); + BigDecimal zero = new BigDecimal("0.00"); for (String s : years) { Map lm = new HashMap<>(); lm.put("name", s + "年度待确收金额"); - lm.put("je", "t.je_"+s); - + lm.put("key", s); + allMap.put(s,zero.toString()); titleList.add(lm); } for (String s : years) { @@ -259,7 +266,8 @@ public class CompanyComeMoneyStatisticsController { String text = dictModel.getText(); String value = dictModel.getValue(); lm.put("name", s + "年度-" + text +"-待确收金额"); - lm.put("je", "t.je_"+s+"_"+value); + lm.put("key", s+"_"+value); + allMap.put(s+"_"+value,zero.toString()); titleList.add(lm); } } @@ -289,7 +297,10 @@ public class CompanyComeMoneyStatisticsController { String allMoney = list1.getAllMoney(); bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); } - lm.put("je_"+yearKey, bigDecimal.toString()); + lm.put(yearKey, bigDecimal.toString()); + String allStr = allMap.get(yearKey); + BigDecimal all = new BigDecimal(allStr).add(bigDecimal); + allMap.put(yearKey,all.toString()); } for (String yearKey : years) { //获得单一年数据 @@ -303,12 +314,17 @@ public class CompanyComeMoneyStatisticsController { bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); } } - lm.put("je_"+yearKey+"_"+value, bigDecimal.toString()); + String key = yearKey + "_" + value; + lm.put(key, bigDecimal.toString()); + String allStr = allMap.get(key); + BigDecimal all = new BigDecimal(allStr).add(bigDecimal); + allMap.put(key,all.toString()); } } valList.add(lm); } map.put("valList", valList); + map.put("allMap", allMap); return Result.OK(map); }/** From 65fac10f865048369c8558ef8bf2a4bb2e1246b3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jul 2024 19:13:47 +0800 Subject: [PATCH 036/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyComeMoneyStatisticsController.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 680c139b..f8b429cc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -42,6 +42,7 @@ import java.math.BigDecimal; import java.net.URLEncoder; import java.text.DecimalFormat; import java.util.*; +import java.util.stream.Collectors; import static cn.hutool.poi.excel.sax.AttributeName.s; @@ -236,8 +237,15 @@ public class CompanyComeMoneyStatisticsController { public Result classification(CompanyComeMoneySearch companyComeMoneySearch, HttpServletResponse response) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); - List chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + List chargeCompanyIds; + if (StringUtils.isNotBlank(chargeCompanyId)){ + chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + }else { + List list = payCompanyManagementService.list(); + chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + } String year = companyComeMoneySearch.getYear(); List years = StrUtil.split(year, ','); @@ -246,11 +254,6 @@ public class CompanyComeMoneyStatisticsController { //获取表头 List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); List> titleList = new ArrayList<>(); - Map map1 = new HashMap<>(); - map1.put("name", "企业名称"); - map1.put("key", "name"); - titleList.add(map1); - Map allMap = new HashMap<>(); BigDecimal zero = new BigDecimal("0.00"); for (String s : years) { @@ -338,8 +341,15 @@ public class CompanyComeMoneyStatisticsController { public void classificationExcel(CompanyComeMoneySearch companyComeMoneySearch, HttpServletResponse response) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); - List chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + List chargeCompanyIds; + if (StringUtils.isNotBlank(chargeCompanyId)){ + chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + }else { + List list = payCompanyManagementService.list(); + chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + } String year = companyComeMoneySearch.getYear(); List years = StrUtil.split(year, ','); From 1e3ca8738a6569936db26c2fc70b9a2bb0075b52 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jul 2024 19:27:41 +0800 Subject: [PATCH 037/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyComeMoneyStatisticsController.java | 28 +++++++++++++++---- .../entity/CompanyComeMoneySearch.java | 5 ++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index f8b429cc..4f8b2a75 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -235,7 +235,8 @@ public class CompanyComeMoneyStatisticsController { @ApiOperation(value = "企业来款统计-分类统计") @GetMapping(value = "/classification") public Result classification(CompanyComeMoneySearch companyComeMoneySearch, - HttpServletResponse response) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); List chargeCompanyIds; if (StringUtils.isNotBlank(chargeCompanyId)){ @@ -246,9 +247,16 @@ public class CompanyComeMoneyStatisticsController { chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); } - - String year = companyComeMoneySearch.getYear(); - List years = StrUtil.split(year, ','); + String year_begin = companyComeMoneySearch.getYear_begin(); + String year_end = companyComeMoneySearch.getYear_end(); + int integer1 = Integer.parseInt(year_begin); + int integer2 = Integer.parseInt(year_end); + int i = integer2 - integer1; + List years = new LinkedList<>(); + years.add(year_begin); + for (int i1 = 0; i1 < i; i1++) { + years.add(String.valueOf(integer1+i1)); + } companyComeMoneySearch.setYears(years); Map map = new HashMap<>(); //获取表头 @@ -351,8 +359,16 @@ public class CompanyComeMoneyStatisticsController { companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); } - String year = companyComeMoneySearch.getYear(); - List years = StrUtil.split(year, ','); + String year_begin = companyComeMoneySearch.getYear_begin(); + String year_end = companyComeMoneySearch.getYear_end(); + int integer1 = Integer.parseInt(year_begin); + int integer2 = Integer.parseInt(year_end); + int i = integer2 - integer1; + List years = new LinkedList<>(); + years.add(year_begin); + for (int i1 = 0; i1 < i; i1++) { + years.add(String.valueOf(integer1+i1)); + } companyComeMoneySearch.setYears(years); Map map = new HashMap<>(); //获取表头 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index 55cc2d22..6c07fada 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -24,6 +24,11 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "来款年份") private String year; + @ApiModelProperty(value = "来款年份开始") + private String year_begin; + @ApiModelProperty(value = "来款年份结束") + private String year_end; + private List years; @ApiModelProperty(value = "应收总金额") From 26908c2ceea2e7f9a2cc9fa224ad9079e35438d0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jul 2024 19:40:38 +0800 Subject: [PATCH 038/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyComeMoneyStatisticsController.java | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 4f8b2a75..e4ee8392 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -304,9 +304,11 @@ public class CompanyComeMoneyStatisticsController { //获得单一年数据 List dataList = yearKeyMap.get(yearKey); BigDecimal bigDecimal = new BigDecimal("0.00"); - for (CompanyComeMoneyClassificationList list1 : dataList) { - String allMoney = list1.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } lm.put(yearKey, bigDecimal.toString()); String allStr = allMap.get(yearKey); @@ -319,10 +321,12 @@ public class CompanyComeMoneyStatisticsController { for (DictModel dictModel : dictModels) { BigDecimal bigDecimal = new BigDecimal("0.00"); String value = dictModel.getValue(); - for (CompanyComeMoneyClassificationList list2 : dataList) { - if (list2.getChargeUse().equals(value)) { - String allMoney = list2.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } } String key = yearKey + "_" + value; @@ -413,9 +417,11 @@ public class CompanyComeMoneyStatisticsController { //获得单一年数据 List dataList = yearKeyMap.get(yearKey); BigDecimal bigDecimal = new BigDecimal("0.00"); - for (CompanyComeMoneyClassificationList list1 : dataList) { - String allMoney = list1.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } lm.put("je_"+yearKey, bigDecimal.toString()); } @@ -425,10 +431,12 @@ public class CompanyComeMoneyStatisticsController { for (DictModel dictModel : dictModels) { BigDecimal bigDecimal = new BigDecimal("0.00"); String value = dictModel.getValue(); - for (CompanyComeMoneyClassificationList list2 : dataList) { - if (list2.getChargeUse().equals(value)) { - String allMoney = list2.getAllMoney(); - bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } } } lm.put("je_"+yearKey+"_"+value, bigDecimal.toString()); From 2b4b99dd3e01ece258fae4ac9c6e96e9ddde5310 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 22 Jul 2024 11:38:52 +0800 Subject: [PATCH 039/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PayCompanyManagementMapper.java | 2 + .../mapper/xml/PayCompanyManagementMapper.xml | 9 ++ .../service/IPayCompanyManagementService.java | 1 + .../impl/PayCompanyManagementServiceImpl.java | 5 + .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../CompanyComeMoneyStatisticsController.java | 95 ++++++++++++++----- 6 files changed, 88 insertions(+), 26 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java index 57d92f4b..064af4f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java @@ -33,4 +33,6 @@ public interface PayCompanyManagementMapper extends BaseMapper pageSafetyCenter(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + Page pageHaveMoney(Page page, @Param("chargeCompanyIds") List chargeCompanyIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index 3071f2c3..d62ee0de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml @@ -46,4 +46,13 @@ left join pay_functional_safety_center_subitem pfscs on pcm.id = pfscs.company_id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index 2cb6d3bb..057da062 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -127,4 +127,5 @@ public interface IPayCompanyManagementService extends IService pageSafetyCenter(Page page, QueryWrapper queryWrapper); + Page pageHaveMoney(Page page, List chargeCompanyIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index e4ba21a2..ad57b75a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -715,6 +715,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl pageHaveMoney(Page page, List chargeCompanyIds) { + return payCompanyManagementMapper.pageHaveMoney(page, chargeCompanyIds); + } + /** * 校验企业名称和信用代码是否匹配 * @param payCompanyManagement diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index bd3fa5ba..21d63fcb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2713,7 +2713,7 @@ #{item} - + #{item} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index e4ee8392..68937b93 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; @@ -28,7 +29,9 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.TemplateExportParams; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -238,15 +241,20 @@ public class CompanyComeMoneyStatisticsController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); - List chargeCompanyIds; + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + List chargeCompanyIds = new ArrayList<>(); + CompanyComeMoneySearch allSearch = new CompanyComeMoneySearch(); if (StringUtils.isNotBlank(chargeCompanyId)){ chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); - }else { - List list = payCompanyManagementService.list(); - chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + allSearch.setChargeCompanyIds(chargeCompanyIds); + wrapper.in(PayCompanyManagement::getId,chargeCompanyIds); } + //获取分页后需要统计的企业 + Page page = new Page<>(pageNo, pageSize); + Page companyManagementPage = payCompanyManagementService.pageHaveMoney(page,chargeCompanyIds); + chargeCompanyIds = companyManagementPage.getRecords().stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); + companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + String year_begin = companyComeMoneySearch.getYear_begin(); String year_end = companyComeMoneySearch.getYear_end(); int integer1 = Integer.parseInt(year_begin); @@ -254,14 +262,21 @@ public class CompanyComeMoneyStatisticsController { int i = integer2 - integer1; List years = new LinkedList<>(); years.add(year_begin); - for (int i1 = 0; i1 < i; i1++) { + for (int i1 = 1; i1 <= i; i1++) { years.add(String.valueOf(integer1+i1)); } companyComeMoneySearch.setYears(years); + allSearch.setYears(years); + //获取当前分页数据 + List list = payWorkingGroupService.queryPageListForCompanyClassification(companyComeMoneySearch); + //获取总金额 + List allMoneyList = payWorkingGroupService.queryPageListForCompanyClassification(allSearch); + //拼接返回值map Map map = new HashMap<>(); //获取表头 List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); List> titleList = new ArrayList<>(); + //总金额map Map allMap = new HashMap<>(); BigDecimal zero = new BigDecimal("0.00"); for (String s : years) { @@ -283,8 +298,7 @@ public class CompanyComeMoneyStatisticsController { } } map.put("titleList", titleList); - //获取数据 - List list = payWorkingGroupService.queryPageListForCompanyClassification(companyComeMoneySearch); + //统计金额 List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); @@ -292,7 +306,7 @@ public class CompanyComeMoneyStatisticsController { Map lm = new HashMap<>(); //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (companyDateList.isEmpty()) { + if (CollectionUtil.isEmpty(companyDateList)) { continue; }else { String companyName = companyDateList.get(0).getCompanyName(); @@ -311,9 +325,6 @@ public class CompanyComeMoneyStatisticsController { } } lm.put(yearKey, bigDecimal.toString()); - String allStr = allMap.get(yearKey); - BigDecimal all = new BigDecimal(allStr).add(bigDecimal); - allMap.put(yearKey,all.toString()); } for (String yearKey : years) { //获得单一年数据 @@ -331,15 +342,51 @@ public class CompanyComeMoneyStatisticsController { } String key = yearKey + "_" + value; lm.put(key, bigDecimal.toString()); - String allStr = allMap.get(key); - BigDecimal all = new BigDecimal(allStr).add(bigDecimal); - allMap.put(key,all.toString()); } } valList.add(lm); } map.put("valList", valList); + //存入总金额 + //按年份分组 + Map> yearKeyMap = CollStreamUtil.groupByKey(allMoneyList, CompanyComeMoneyClassificationList::getYear); + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + BigDecimal bigDecimal = new BigDecimal("0.00"); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list1 : dataList) { + String allMoney = list1.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + } + String allStr = allMap.get(yearKey); + BigDecimal all = new BigDecimal(allStr).add(bigDecimal); + allMap.put(yearKey,all.toString()); + } + for (String yearKey : years) { + //获得单一年数据 + List dataList = yearKeyMap.get(yearKey); + for (DictModel dictModel : dictModels) { + BigDecimal bigDecimal = new BigDecimal("0.00"); + String value = dictModel.getValue(); + if (dataList != null){ + for (CompanyComeMoneyClassificationList list2 : dataList) { + if (list2.getChargeUse().equals(value)) { + String allMoney = list2.getAllMoney(); + bigDecimal = bigDecimal.add(new BigDecimal(allMoney)); + } + } + } + String key = yearKey + "_" + value; + String allStr = allMap.get(key); + BigDecimal all = new BigDecimal(allStr).add(bigDecimal); + allMap.put(key,all.toString()); + } + } map.put("allMap", allMap); + + map.put("page", page.setRecords(null)); return Result.OK(map); }/** @@ -353,14 +400,11 @@ public class CompanyComeMoneyStatisticsController { public void classificationExcel(CompanyComeMoneySearch companyComeMoneySearch, HttpServletResponse response) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); - List chargeCompanyIds; + List chargeCompanyIds = new ArrayList<>(); + CompanyComeMoneySearch allSearch = new CompanyComeMoneySearch(); if (StringUtils.isNotBlank(chargeCompanyId)){ chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); - }else { - List list = payCompanyManagementService.list(); - chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); - companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); + allSearch.setChargeCompanyIds(chargeCompanyIds); } String year_begin = companyComeMoneySearch.getYear_begin(); @@ -370,10 +414,11 @@ public class CompanyComeMoneyStatisticsController { int i = integer2 - integer1; List years = new LinkedList<>(); years.add(year_begin); - for (int i1 = 0; i1 < i; i1++) { + for (int i1 = 1; i1 <= i; i1++) { years.add(String.valueOf(integer1+i1)); } companyComeMoneySearch.setYears(years); + allSearch.setYears(years); Map map = new HashMap<>(); //获取表头 List dictModels = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); @@ -397,7 +442,7 @@ public class CompanyComeMoneyStatisticsController { } map.put("titleList", titleList); //获取数据 - List list = payWorkingGroupService.queryPageListForCompanyClassification(companyComeMoneySearch); + List list = payWorkingGroupService.queryPageListForCompanyClassification(allSearch); List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); @@ -458,7 +503,7 @@ public class CompanyComeMoneyStatisticsController { response.setContentType("application/x-download"); response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Disposition", - "attachment;filename=".concat(String.valueOf(URLEncoder.encode("征集问题.xls", "UTF-8")))); + "attachment;filename=".concat(String.valueOf(URLEncoder.encode("企业来款分类统计.xlsx", "UTF-8")))); ServletOutputStream outputStream = response.getOutputStream(); workbook.write(outputStream); workbook.close(); From 11b622ae5f0df8e3d69bce8f2db22f9024cee40b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 24 Jul 2024 14:05:36 +0800 Subject: [PATCH 040/111] =?UTF-8?q?add=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 16 +- .../AnnualDataLockingController.java | 158 ++++++++++++++++++ .../project/entity/AnnualDataLocking.java | 62 +++++++ .../mapper/AnnualDataLockingMapper.java | 12 ++ .../mapper/xml/AnnualDataLockingMapper.xml | 18 ++ .../service/AnnualDataLockingService.java | 38 +++++ 6 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/entity/AnnualDataLocking.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index b0fce904..f5f52807 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -190,7 +190,7 @@ SET FOREIGN_KEY_CHECKS = 1; INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1811666066341814274', '1469221945005338626', '导入到标协会员', NULL, NULL, NULL, NULL, 2, 'council:exportToMember', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-12 15:37:04', NULL, NULL, 0, 0, '1', 0, 1); -- 20240715 会议汇总-会议酒店推荐按钮 -INSERT INTO `income_payments_prod`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1812785413516914690', '1626061755230580738', '会议酒店推荐', NULL, NULL, NULL, NULL, 2, 'allmeeting:recommendHotel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-15 17:44:57', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1812785413516914690', '1626061755230580738', '会议酒店推荐', NULL, NULL, NULL, NULL, 2, 'allmeeting:recommendHotel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-15 17:44:57', NULL, NULL, 0, 0, '1', 0, 1); -- 20240716 处理工作组成员历史数据中的是否确认凭证字段 UPDATE pay_working_group_subitem SET confirm_voucher = 0 WHERE confirm_voucher IS NULL; @@ -198,3 +198,17 @@ UPDATE pay_working_group_subitem SET confirm_voucher = 0 WHERE confirm_voucher I -- 20240716 处理工作组成员历史数据中的是否审核字段 UPDATE pay_working_group_subitem SET check_payment_status = 0; UPDATE pay_working_group_subitem SET check_payment_status = 1 WHERE payment_status = 'completed' OR payment_status = 'rejected'; + +-- auto-generated definition +create table pay_annual_data_locking +( + id varchar(32) not null comment '主键' + primary key, + year varchar(32) null comment '年份', + create_by varchar(32) null comment '创建人', + create_time datetime null comment '创建时间', + update_by varchar(32) null comment '更新人', + update_time datetime null comment '更新时间' +) + comment '年度数据锁定表'; + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java new file mode 100644 index 00000000..d4361631 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/AnnualDataLockingController.java @@ -0,0 +1,158 @@ +package com.jero.project.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.IdsMapBody; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.project.entity.AnnualDataLocking; +import com.jero.project.service.AnnualDataLockingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 年度数据锁定表(pay_annual_data_locking)表控制层 + * + * @author xxxxx + */ +@Slf4j +@Api(tags = "年度数据锁定表") +@RestController +@RequestMapping("annualDataLocking") +public class AnnualDataLockingController extends JeroController { + /** + * 服务对象 + */ + @Resource + private AnnualDataLockingService annualDataLockingService; + + /** + * 分页列表查询 + */ + @ApiOperation(value = "年度数据锁定表-分页列表查询", notes = "年度数据锁定表-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(AnnualDataLocking annualDataLocking, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualDataLocking, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = annualDataLockingService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + */ + @ApiOperation(value = "年度数据锁定表-列表查询", notes = "年度数据锁定表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(AnnualDataLocking annualDataLocking, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualDataLocking, req.getParameterMap()); + List list = annualDataLockingService.list(queryWrapper); + return Result.OK(list); + } + + /** + * 添加 + */ + @AutoLog(value = "年度数据锁定表-添加") + @ApiOperation(value = "年度数据锁定表-添加", notes = "年度数据锁定表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody AnnualDataLocking annualDataLocking) { + annualDataLockingService.add(annualDataLocking); + return Result.OK(Result.ADD_SUCCESS); + } + + /** + * 编辑 + */ + @AutoLog(value = "年度数据锁定表-编辑") + @ApiOperation(value = "年度数据锁定表-编辑", notes = "年度数据锁定表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody AnnualDataLocking annualDataLocking) { + annualDataLockingService.editById(annualDataLocking); + return Result.OK(Result.EDIT_SUCCESS); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "年度数据锁定表-通过id删除") + @ApiOperation(value = "年度数据锁定表-通过id删除", notes = "年度数据锁定表-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody IdsMapBody map) { + String id = map.getId(); + if (StringUtils.isBlank(id)) { + return Result.error(Result.NULL_ID); + } + annualDataLockingService.deleteById(id); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 批量删除 + */ + @AutoLog(value = "年度数据锁定表-批量删除") + @ApiOperation(value = "年度数据锁定表-批量删除", notes = "年度数据锁定表-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody IdsMapBody map) { + String ids = map.getIds(); + if (StringUtils.isBlank(ids)) { + return Result.error(Result.NULL_ID); + } + List idList = Arrays.asList(map.getIds().split(",")); + this.annualDataLockingService.deleteByIds(idList); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 通过id查询 + */ + @AutoLog(value = "年度数据锁定表-通过id查询") + @ApiOperation(value = "年度数据锁定表-通过id查询", notes = "年度数据锁定表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + AnnualDataLocking annualDataLocking = annualDataLockingService.queryById(id); + if (annualDataLocking == null) { + throw new JeroBootException(Result.NULL_DATA); + } + return Result.OK(annualDataLocking); + } + + /** + * 导出excel + */ + @ApiOperation(value = "年度数据锁定表-导出excel") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, AnnualDataLocking annualDataLocking) { + return super.exportXls(request, annualDataLocking, AnnualDataLocking.class, "年度数据锁定表"); + } + + /** + * 通过excel导入数据 + */ + @ApiOperation(value = "年度数据锁定表-通过excel导入数据") + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, AnnualDataLocking.class); + } + + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/AnnualDataLocking.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/AnnualDataLocking.java new file mode 100644 index 00000000..eacfc389 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/AnnualDataLocking.java @@ -0,0 +1,62 @@ +package com.jero.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + *年度数据锁定表 + *@author liJiaRao + *@date 2024-07-24 13:51 + */ +@ApiModel(description="年度数据锁定表") +@Data +@TableName(value = "pay_annual_data_locking") +public class AnnualDataLocking { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="主键") + private String id; + + /** + * 年份 + */ + @TableField(value = "`year`") + @ApiModelProperty(value="年份") + private String year; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java new file mode 100644 index 00000000..9a0a1bad --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java @@ -0,0 +1,12 @@ +package com.jero.project.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.project.entity.AnnualDataLocking; + +/** + * + *@author liJiaRao + *@date 2024-07-24 13:51 + */ +public interface AnnualDataLockingMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml new file mode 100644 index 00000000..34965b4f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + id, `year`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java new file mode 100644 index 00000000..dfa8411a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -0,0 +1,38 @@ +package com.jero.project.service; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.project.mapper.AnnualDataLockingMapper; +import com.jero.project.entity.AnnualDataLocking; +/** + * + *@author liJiaRao + *@date 2024-07-24 13:51 + */ +@Service +public class AnnualDataLockingService extends ServiceImpl { + public void add(AnnualDataLocking annualDataLocking) { + this.save(annualDataLocking); + } + + public void editById(AnnualDataLocking annualDataLocking) { + this.updateById(annualDataLocking); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public AnnualDataLocking queryById(String id) { + AnnualDataLocking annualDataLocking = this.getById(id); + return annualDataLocking; + } +} From 2b1af1e44bd3422474f843b1a2e525006d7f3231 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 24 Jul 2024 18:00:38 +0800 Subject: [PATCH 041/111] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE=E9=94=81?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/meeting/mapper/PayMeetingMapper.java | 2 +- .../mapper/PayMeetingSituationMapper.java | 7 ++ .../mapper/xml/PayMeetingSituationMapper.xml | 57 +++++++++ .../impl/PayMeetingSituationServiceImpl.java | 7 +- .../mapper/AnnualDataLockingMapper.java | 4 + .../mapper/xml/AnnualDataLockingMapper.xml | 11 ++ .../service/AnnualDataLockingService.java | 109 +++++++++++++++++- 7 files changed, 193 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index 0ff0c727..1746586c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -35,7 +35,7 @@ public interface PayMeetingMapper extends BaseMapper { IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - IPage draftGroupPage(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage draftGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java index c4ac1763..bdc956de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java @@ -38,4 +38,11 @@ public interface PayMeetingSituationMapper extends BaseMapper getMeetingPackStatistics(@Param(Constants.WRAPPER) QueryWrapper query); MeetingPackStatistics getMeetingPackStatisticsCount(@Param(Constants.WRAPPER) QueryWrapper query); + + /** + * 根据年份获取参会人 + * @param year 年份 + */ + List listByYear(@Param("year")String year); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index cdd5a5b0..f87edeed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -1,6 +1,53 @@ + + id, + create_by, + create_time, + update_by, + update_time, + meeting_id, + company_id, + company_name, + company_contact_id, + company_contact_name, + post, + phone, + email, + `identity`, + guest_type, + speech_topic, + speech_ppt, + photo, + profile, + have_meals, + hui_people, + check_in_hotel, + in_hotel_time, + out_hotel_time, + room_layout, + arrival_time, + destination, + arrival_shift, + delivery_station, + departure_time, + departure_station, + departure_shift, + remark, + check_in, + pick_up, + post_contact_id, + post_contact_address, + pay_mode, + need_invoice, + payment_record, + `status`, + pack, + in_account, + make_invoice, + mail + @@ -202,4 +249,14 @@ from v_meeting_pack_statistical ${ew.customSqlSegment} + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 90be29c2..d33359f3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -77,6 +77,7 @@ import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.service.AnnualDataLockingService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; @@ -173,7 +174,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl { + Integer countByYear(@Param("year")String year); + + } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml index 34965b4f..84f8ae78 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml @@ -15,4 +15,15 @@ id, `year`, create_by, create_time, update_by, update_time + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index dfa8411a..713b155d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -1,11 +1,41 @@ package com.jero.project.service; +import com.jero.common.common.RoleCommon; +import com.jero.common.constant.CacheConstant; +import com.jero.common.service.ProjectDetailService; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.LoginUser; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.mapper.PayMeetingMapper; +import com.jero.meeting.mapper.PayMeetingSituationMapper; +import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.member.mapper.PayMemberProjectSubitemMapper; +import com.jero.member.mapper.TbCertificatePaymentMapper; +import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.member.service.IPayMemberProjectService; +import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.modules.system.service.ISysUserService; +import com.jero.project.mapper.PayCommonProjectMapper; +import com.jero.project.mapper.PayWorkingGroupMapper; +import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; +import org.apache.shiro.SecurityUtils; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.project.mapper.AnnualDataLockingMapper; import com.jero.project.entity.AnnualDataLocking; + +import javax.annotation.Resource; + /** * *@author liJiaRao @@ -13,16 +43,91 @@ import com.jero.project.entity.AnnualDataLocking; */ @Service public class AnnualDataLockingService extends ServiceImpl { + @Resource + private ISysUserService sysUserService; + @Resource + private ProjectDetailService projectDetailService; + @Resource + private PayCommonProjectMapper payCommonProjectMapper; + @Resource + private PayWorkingGroupSubItemMapper payWorkingGroupSubItemMapper; + @Resource + private PayWorkingGroupMapper payWorkingGroupMapper; + @Resource + private PayMeetingSituationMapper meetingSituationMapper; + @Resource + private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper; + @Resource + private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper; + @Resource + private TbCertificatePaymentMapper certificatePaymentMapper; + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private IPayMemberProjectService payMemberProjectService; + @Resource + private ITbMemberProjectSubitemService tbMemberProjectSubitemService; + @Resource + private PayMeetingMapper meetingMapper; + @Resource + private IPayMeetingSituationService meetingSituationService; + @Resource + private IPayCompanyManagementTemporaryService companyTemporaryService; + @Resource + private IPayContactsManagementTemporaryService contactsTemporaryService; + public void add(AnnualDataLocking annualDataLocking) { this.save(annualDataLocking); + String year = annualDataLocking.getYear(); + //会议项目 + List meetingSituations = meetingSituationMapper.listByYear(year); + for (PayMeetingSituation meetingSituation : meetingSituations) { + String companyId = meetingSituation.getCompanyId(); + String companyContactId = meetingSituation.getCompanyContactId(); + String postContactId = meetingSituation.getPostContactId(); + //获得临时表id + PayCompanyManagementTemporary companyTemporary = companyTemporaryService.insertCompanyManagementTemporary(companyId); + PayContactsManagementTemporary contactsTemporary = contactsTemporaryService.insertContactsManagementTemporary(companyContactId); + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryService.insertContactsManagementTemporary(postContactId); + //更新临时表id + PayMeetingSituation update = new PayMeetingSituation(); + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + update.setPostContactTemporaryId(contactsTemporary1.getId()); + meetingSituationMapper.updateById(update); + } + + } + + /** + * 查询年份是否存在 + */ + @Cacheable(cacheNames= "annualDataLocking", key="#year") + public boolean checkYear(String year){ + return baseMapper.countByYear(year) > 0; } public void editById(AnnualDataLocking annualDataLocking) { this.updateById(annualDataLocking); } - + @CacheEvict(value="annualDataLocking", allEntries=true) public void deleteById(String id) { + AnnualDataLocking annualDataLocking = this.getById(id); this.removeById(id); + String year = annualDataLocking.getYear(); + //会议项目 + List meetingSituations = meetingSituationMapper.listByYear(year); + for (PayMeetingSituation meetingSituation : meetingSituations) { + String companyId = meetingSituation.getCompanyId(); + String companyContactId = meetingSituation.getCompanyContactId(); + String postContactId = meetingSituation.getPostContactId(); + //更新临时表id + PayMeetingSituation update = new PayMeetingSituation(); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); + meetingSituationMapper.updateById(update); + } } public void deleteByIds(List idList) { From f25475ccddad7512dc7edd3cbc2e9e747e124191 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 25 Jul 2024 15:24:32 +0800 Subject: [PATCH 042/111] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=BE=85?= =?UTF-8?q?=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D=20=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/mail/service/impl/PayMailBillServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 3bd64c2b..4b089794 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -833,6 +833,9 @@ public class PayMailBillServiceImpl extends ServiceImpl Date: Thu, 25 Jul 2024 15:25:34 +0800 Subject: [PATCH 043/111] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=BE=85?= =?UTF-8?q?=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D=20=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/payment/controller/PayPaymentRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 808a3de3..3c44ec04 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -201,7 +201,7 @@ public class PayPaymentRecordController extends JeroController Date: Thu, 25 Jul 2024 15:43:10 +0800 Subject: [PATCH 044/111] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE=E9=94=81?= =?UTF-8?q?=E5=AE=9A=20=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 7 + .../common/mapper/ProjectDetailMapper.java | 17 +- .../common/mapper/xml/ProjectDetailMapper.xml | 430 ++++++++++++++---- .../impl/ProjectDetailServiceImpl.java | 300 ++++++------ .../AnnualDataLockingController.java | 2 +- .../service/AnnualDataLockingService.java | 47 +- .../entity/PayCompanyManagementTemporary.java | 7 + .../PayContactsManagementTemporary.java | 3 + ...IPayCompanyManagementTemporaryService.java | 6 + ...PayContactsManagementTemporaryService.java | 6 + ...CompanyManagementTemporaryServiceImpl.java | 44 ++ ...ontactsManagementTemporaryServiceImpl.java | 40 +- 12 files changed, 627 insertions(+), 282 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index f5f52807..baf69ca8 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -212,3 +212,10 @@ create table pay_annual_data_locking ) comment '年度数据锁定表'; +alter table pay_company_management_temporary comment '企业管理临时表'; +alter table pay_contacts_management_temporary comment '联系人管理临时表'; + +alter table pay_company_management_temporary + add year varchar(4) null comment '数据锁定年份'; +alter table pay_contacts_management_temporary + add year varchar(4) null comment '数据锁定年份'; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java index 24a8f721..2fc9c567 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java @@ -1,18 +1,19 @@ package com.jero.common.mapper; import com.jero.project.entity.PayCommonProject; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface ProjectDetailMapper { /** - * @Description 查询项目信息 - * @Author lqt - * @Date 2021/9/14 - * @Param projectId 项目id - * @Return - * @Exception - */ - PayCommonProject queryProject(String projectId); + * @Description 查询项目信息 + * @Author lqt + * @Date 2021/9/14 + * @Param projectId 项目id + * @Return + * @Exception + */ + PayCommonProject queryProject(@Param("projectId") String projectId); /** * @Description 查询项目列表信息 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index 67261834..bca65204 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -4,8 +4,41 @@ SELECT chargeUse, ifnull(SUM(${column}),0) as money - FROM v_statistical_pack v + FROM v_revenue_analysis v year like concat('%',#{year},'%') From ed2e01bb30016cb3e357ce90a1b83a504afb1fab Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 26 Jul 2024 14:46:47 +0800 Subject: [PATCH 058/111] =?UTF-8?q?rollback=20update=20=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=BA=BA=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 5977296c..a17ab065 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -248,7 +248,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 26 Jul 2024 17:01:17 +0800 Subject: [PATCH 059/111] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompanyComeMoneyStatisticsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 68937b93..7fe33b42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -450,7 +450,7 @@ public class CompanyComeMoneyStatisticsController { Map lm = new HashMap<>(); //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (companyDateList.isEmpty()) { + if (CollectionUtil.isEmpty(companyDateList)) { continue; }else { String companyName = companyDateList.get(0).getCompanyName(); From c7e9a9b231684231b48ad16684ff27e76c4320ee Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 26 Jul 2024 17:55:28 +0800 Subject: [PATCH 060/111] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PayMemberProjectSubitemMapper.java | 3 + .../mapper/TbMemberProjectSubitemMapper.java | 2 + .../xml/PayMemberProjectSubitemMapper.xml | 7 ++ .../xml/TbMemberProjectSubitemMapper.xml | 7 ++ .../mapper/PayCommonProjectMapper.java | 23 +++++-- .../mapper/PayWorkingGroupSubItemMapper.java | 2 + .../xml/PayWorkingGroupSubItemMapper.xml | 6 ++ .../service/AnnualDataLockingService.java | 69 ++++++++++++++++--- 8 files changed, 104 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java index d6df6678..0927ec31 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java @@ -23,4 +23,7 @@ public interface PayMemberProjectSubitemMapper extends BaseMapper queryPageListCompany(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage getPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + + List listByYear(@Param("year") String year); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java index bf897d6b..45899468 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java @@ -61,4 +61,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper pageAllMemberName(Page page); List getAllYearInfoByCompanyId(@Param("companyId") String companyId); + + List listByYear(@Param("year") String year); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index 34fdee29..ec332f24 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -90,4 +90,11 @@ + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index 86f74404..b586385a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -169,4 +169,11 @@ tmps.company_id = #{companyId} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java index d757e234..8b672386 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayCommonProjectMapper.java @@ -1,4 +1,7 @@ package com.jero.project.mapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,14 +16,14 @@ import java.util.List; /** * @Description: pay_common_project * @Author: jeecg-boot - * @Date: 2021-08-27 + * @Date: 2021-08-27 * @Version: V1.0 */ public interface PayCommonProjectMapper extends BaseMapper { /** * @Description 分页查询 - * @Author lqt - * @Date 2021/8/27 + * @Author lqt + * @Date 2021/8/27 * @Param paymentDate 来款年份 * @Return * @Exception @@ -31,16 +34,22 @@ public interface PayCommonProjectMapper extends BaseMapper { /** * @Description 收入合同-列表 - * @Author lqt - * @Date 2021/10/18 - * @Param queryWrapper + * @Author lqt + * @Date 2021/10/18 + * @Param queryWrapper * @Param projectType 项目类型 * @Param pack 打包状态 * @Param packYear 打包年份 * @Return * @Exception */ - List queryListByCompany(@Param(Constants.WRAPPER) QueryWrapper queryWrapper,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear); + List queryListByCompany(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("projectType") String projectType, @Param("pack") Integer pack, @Param("packYear") String packYear); + + default List listByYear(String year) { + LambdaQueryWrapper myQuery = Wrappers.lambdaQuery(PayCommonProject.class); + myQuery.eq(PayCommonProject::getYear, year); + return selectList(myQuery); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java index 1bada09c..b9addf05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java @@ -64,4 +64,6 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper publishReminderList(Page page, @Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem); List queryList(@Param(Constants.WRAPPER) QueryWrapper queryPayWorkingGroupSubItem); + + List listByYear(@Param("year") String year); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index acdf652f..52b0aa5b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -389,4 +389,10 @@ left join pay_working_group pwg ON pwgs.working_group_id = pwg.id ${ew.customSqlSegment} + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 263b53d4..5ea468b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -12,12 +12,16 @@ import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingMapper; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.service.ISysUserService; +import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; @@ -27,6 +31,7 @@ import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -69,8 +74,6 @@ public class AnnualDataLockingService extends ServiceImpl meetingSituations = meetingSituationMapper.listByYear(year); - List meetingSituationsCompanyIdList = meetingSituations.stream().map(PayMeetingSituation::getCompanyId).distinct().collect(Collectors.toList()); - List meetingSituationsContactIdList = meetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).distinct().collect(Collectors.toList()); - List meetingSituationsPostContactIdList = meetingSituations.stream().map(PayMeetingSituation::getPostContactId).distinct().collect(Collectors.toList()); - meetingSituationsContactIdList.addAll(meetingSituationsPostContactIdList); - ArrayList distinctContactIdList = CollectionUtil.distinct(meetingSituationsContactIdList); + List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); + List payCommonProjects = payCommonProjectMapper.listByYear(year); + List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); + List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); + //获得去重后的所有企业和联系人（联系人和邮寄联系人） + ArrayList distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems); + ArrayList distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems); //生成企业和联系人临时数据 - List companyTemporaryList = companyTemporaryService.insertList(meetingSituationsCompanyIdList,year); + List companyTemporaryList = companyTemporaryService.insertList(distinctCompanyIdList,year); Map companyTemporaryMap = CollStreamUtil.toIdentityMap(companyTemporaryList, PayCompanyManagementTemporary::getCompanyId); List contactsTemporaryList = contactsTemporaryService.insertList(distinctContactIdList,year); Map contactsTemporaryMap = CollStreamUtil.toIdentityMap(contactsTemporaryList, PayContactsManagementTemporary::getContactId); @@ -131,6 +136,54 @@ public class AnnualDataLockingService extends ServiceImpl getDistinctContactIdList(List meetingSituations, List workingGroupSubItems, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems) { + //获得所有联系人id + List contactIdList1 = meetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).distinct().collect(Collectors.toList()); + List contactIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getContactsIdOne).distinct().collect(Collectors.toList()); + List contactIdList3 = payCommonProjects.stream().map(PayCommonProject::getContactsId).distinct().collect(Collectors.toList()); + List contactIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyContactId).distinct().collect(Collectors.toList()); + List contactIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getLiaisonManId).distinct().collect(Collectors.toList()); + contactIdList1.addAll(contactIdList2); + contactIdList1.addAll(contactIdList3); + contactIdList1.addAll(contactIdList4); + contactIdList1.addAll(contactIdList5); + //获得所有邮寄联系人id + List postContactIdList1 = meetingSituations.stream().map(PayMeetingSituation::getPostContactId).distinct().collect(Collectors.toList()); + List postContactIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getMailContactsId).distinct().collect(Collectors.toList()); + List postContactIdList3 = payCommonProjects.stream().map(PayCommonProject::getMailContactsId).distinct().collect(Collectors.toList()); + List postContactIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getPostContactId).distinct().collect(Collectors.toList()); + List postContactIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getPostContactId).distinct().collect(Collectors.toList()); + contactIdList1.addAll(postContactIdList1); + contactIdList1.addAll(postContactIdList2); + contactIdList1.addAll(postContactIdList3); + contactIdList1.addAll(postContactIdList4); + contactIdList1.addAll(postContactIdList5); + //联系人和邮寄联系人合并后去重 + return CollectionUtil.distinct(contactIdList1); + } + + @NotNull + private ArrayList getDistinctCompanyIdList(List meetingSituations, List workingGroupSubItems, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems) { + //获取所有企业id + List companyIdList1 = meetingSituations.stream().map(PayMeetingSituation::getCompanyId).distinct().collect(Collectors.toList()); + List companyIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getChargeCompanyId).distinct().collect(Collectors.toList()); + List companyIdList3 = payCommonProjects.stream().map(PayCommonProject::getChargeCompanyId).distinct().collect(Collectors.toList()); + List companyIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyId).distinct().collect(Collectors.toList()); + List companyIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyId).distinct().collect(Collectors.toList()); + companyIdList1.addAll(companyIdList2); + companyIdList1.addAll(companyIdList3); + companyIdList1.addAll(companyIdList4); + companyIdList1.addAll(companyIdList5); + //去重 + return CollectionUtil.distinct(companyIdList1); } /** From bf9793bc4dd1699a20ba7254e1f5145e3a61b211 Mon Sep 17 00:00:00 2001 From: lijiarao <136157943@qq.com> Date: Sat, 27 Jul 2024 17:14:05 +0800 Subject: [PATCH 061/111] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月变更.sql | 10 +- .../common/mapper/xml/ProjectDetailMapper.xml | 6 +- .../impl/ProjectDetailServiceImpl.java | 13 +- .../member/entity/TbMemberProjectSubitem.java | 14 + .../pack/mapper/PayPackCompanyMapper.java | 2 + .../pack/mapper/xml/PayPackCompanyMapper.xml | 5 +- .../PayWorkingGroupSubItemContactsMapper.java | 18 +- .../service/AnnualDataLockingService.java | 325 +++++++++++++++++- ...IPayCompanyManagementTemporaryService.java | 3 + ...CompanyManagementTemporaryServiceImpl.java | 22 +- ...ontactsManagementTemporaryServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 2 +- 12 files changed, 389 insertions(+), 35 deletions(-) diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index baf69ca8..903fe03b 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -218,4 +218,12 @@ alter table pay_contacts_management_temporary comment '联系人管理临时表' alter table pay_company_management_temporary add year varchar(4) null comment '数据锁定年份'; alter table pay_contacts_management_temporary - add year varchar(4) null comment '数据锁定年份'; \ No newline at end of file + add year varchar(4) null comment '数据锁定年份'; +# 标协会员项目增加临时id +alter table tb_member_project_subitem + add company_temporary_id varchar(50) null comment '企业临时id' after company_id, + add company_contact_temporary_id varchar(50) null comment '企业联系人临时id' after liaison_man_id, + add post_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after post_contact_id; +# 标协会员项目增加临时id +alter table pay_pack_company + add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index bca65204..e8c81344 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -102,7 +102,7 @@ c.company_contact_temporary_id as contacts_temporary_id, c.company_contact_name as contacts_temporary_name, c.company_id as charge_company_id, - c.company_id as charge_company_temporary_id, + c.company_temporary_id as charge_company_temporary_id, c.company_name as charge_company_temporary_name, c.amount_receivable as receivable_amount, c.paid_amount as paid_amount, @@ -189,10 +189,10 @@ tmember.director_id as principal_id, su.realname as principal_name, c.liaison_man_id as contacts_id, - c.liaison_man_id as contacts_temporary_id, + c.company_contact_temporary_id as contacts_temporary_id, c.liaison_man as contacts_temporary_name, c.company_id as charge_company_id, - c.company_id as charge_company_temporary_id, + c.company_temporary_id as charge_company_temporary_id, c.company_name as charge_company_temporary_name, c.amount_receivable as receivable_amount, c.paid_amount as paid_amount, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index efb5475e..3dac76e0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -274,15 +274,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { queryPayWorkingGroupSubItemContacts.orderByAsc(PayWorkingGroupSubItemContacts::getOrderNum); List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ - List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - List payContactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(listIds); - if(!CollectionUtils.isEmpty(payContactsManagementTemporaryList)){ + //List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + //List payContactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(listIds); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ listPayWorkingGroupSubItemContacts.forEach(p->{ - List listNew = payContactsManagementTemporaryList.stream().filter(o->Objects.equals(o.getId(),p.getContactsTemporaryId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listNew)){ - return; + PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getByAllTable(p.getContactsId(),p.getContactsTemporaryId()); + if(Objects.isNull(payContactsManagementTemporary)){ + throw new JeroBootException("联系人不存在！"); } - PayContactsManagementTemporary payContactsManagementTemporary = listNew.get(0); p.setGender(payContactsManagementTemporary.getGender()); if(!Objects.isNull(payContactsManagementTemporary.getGender())){ p.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender()))); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 4d51a800..f8eb3f8f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -78,6 +78,10 @@ public class TbMemberProjectSubitem implements Serializable { @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; + /** + * 企业临时id + */ + private String companyTemporaryId; /**会员单位*/ @ApiModelProperty(value = "会员单位") @@ -100,6 +104,11 @@ public class TbMemberProjectSubitem implements Serializable { @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String liaisonManId; + /** + * 企业联系人临时id + */ + private String companyContactTemporaryId; + /**联系人*/ @ApiModelProperty(value = "联系人") private String liaisonMan; @@ -111,6 +120,11 @@ public class TbMemberProjectSubitem implements Serializable { @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String postContactId; + /** + * 邮寄联系人临时id + */ + private String postContactTemporaryId; + /**邮箱*/ @Excel(name = "邮箱", width = 20,exportConvert = true) @ApiModelProperty(value = "邮箱") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java index 83dc2410..44cb16d9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java @@ -56,4 +56,6 @@ public interface PayPackCompanyMapper extends BaseMapper { String getConfirmAmountMoney(@Param("payPackCompany") PayPackCompany payPackCompany); String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany); + + List listByYear(@Param("year") String year); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index a6980d04..92871515 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -109,5 +109,8 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java index c08ad170..3b26f3bc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemContactsMapper.java @@ -1,5 +1,11 @@ package com.jero.project.mapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import java.util.Collection; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import org.apache.ibatis.annotations.Param; + import java.util.List; @@ -9,16 +15,22 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts; /** * @Description: pay_working_group_subitem_contacts * @Author: jeecg-boot - * @Date: 2022-04-19 + * @Date: 2022-04-19 * @Version: V1.0 */ public interface PayWorkingGroupSubItemContactsMapper extends BaseMapper { /** * 根据成员id获得主联系人 */ - String getMasterContactsId(@Param("workingGroupSubId")String workingGroupSubId); + String getMasterContactsId(@Param("workingGroupSubId") String workingGroupSubId); - List getSubItemContacts(@Param("workingGroupSubId")String workingGroupSubId); + List getSubItemContacts(@Param("workingGroupSubId") String workingGroupSubId); + + default List listByWorkingGroupSubIdIn(Collection workingGroupSubIdCollection) { + LambdaQueryWrapper myQuery = Wrappers.lambdaQuery(PayWorkingGroupSubItemContacts.class); + myQuery.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, workingGroupSubIdCollection); + return selectList(myQuery); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 5ea468b9..787a3178 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -3,7 +3,6 @@ package com.jero.project.service; import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.collection.CollectionUtil; import com.jero.common.common.RoleCommon; -import com.jero.common.constant.CacheConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; import com.jero.common.system.api.ISysBaseAPI; @@ -15,16 +14,19 @@ import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; -import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.member.service.IPayMemberProjectService; +import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.service.ISysUserService; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.mapper.PayPackCompanyMapper; +import com.jero.pack.service.IPayPackCompanyProjectService; +import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; -import com.jero.project.mapper.PayCommonProjectMapper; -import com.jero.project.mapper.PayWorkingGroupMapper; -import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.mapper.*; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -37,13 +39,11 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.project.mapper.AnnualDataLockingMapper; import com.jero.project.entity.AnnualDataLocking; import org.springframework.transaction.annotation.Transactional; @@ -64,9 +64,16 @@ public class AnnualDataLockingService extends ServiceImpl meetingSituations = meetingSituationMapper.listByYear(year); List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); + List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); + List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); List payCommonProjects = payCommonProjectMapper.listByYear(year); List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); + List packCompanyList = packCompanyMapper.listByYear(year); //获得去重后的所有企业和联系人（联系人和邮寄联系人） - ArrayList distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems); - ArrayList distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems); + ArrayList distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); + ArrayList distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, workingGroupSubItemContacts, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); //生成企业和联系人临时数据 List companyTemporaryList = companyTemporaryService.insertList(distinctCompanyIdList,year); Map companyTemporaryMap = CollStreamUtil.toIdentityMap(companyTemporaryList, PayCompanyManagementTemporary::getCompanyId); @@ -136,52 +154,221 @@ public class AnnualDataLockingService extends ServiceImpl updateWorkingGroupSubItemList = new ArrayList<>(); for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { + String companyId = workingGroupSubItem.getChargeCompanyId(); + String postContactId = workingGroupSubItem.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + //更新临时表id + PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); + update.setId(workingGroupSubItem.getId()); + update.setChargeCompanyTemporaryId(companyTemporary.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsTemporaryId(contactsTemporary1.getId()); + } + } + updateWorkingGroupSubItemList.add(update); } + workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); + //工作组成员联系人 + List updateWorkingGroupSubItemContacts = new ArrayList<>(); + for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { + String contactsId = contacts.getContactsId(); + + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(contactsId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); + update.setId(contacts.getId()); + update.setContactsTemporaryId(contactsTemporary.getId()); + updateWorkingGroupSubItemContacts.add(update); + } + workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); + + //普通项目 + List updatePayCommonProjects = new ArrayList<>(); + for (PayCommonProject commonProject : payCommonProjects) { + String companyId = commonProject.getChargeCompanyId(); + String companyContactId = commonProject.getContactsId(); + String postContactId = commonProject.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayCommonProject update = new PayCommonProject(); + update.setId(commonProject.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsId(contactsTemporary1.getId()); + } + } + update.setChargeCompanyTemporaryId(companyTemporary.getId()); + update.setContactsTemporaryId(contactsTemporary.getId()); + updatePayCommonProjects.add(update); + } + commonProjectService.updateBatchById(updatePayCommonProjects); + + //会员项目 + List updateMemberProjectSubitems = new ArrayList<>(); + for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { + String companyId = memberProjectSubitem.getCompanyId(); + String companyContactId = memberProjectSubitem.getCompanyContactId(); + String postContactId = memberProjectSubitem.getPostContactId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayMemberProjectSubitem update = new PayMemberProjectSubitem(); + update.setId(memberProjectSubitem.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setPostContactTemporaryId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updateMemberProjectSubitems.add(update); + } + memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); + + //标协会员项目 + List updateTbMemberProjectSubitems = new ArrayList<>(); + for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { + String companyId = tbMemberProjectSubitem.getCompanyId(); + String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); + String postContactId = tbMemberProjectSubitem.getPostContactId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + TbMemberProjectSubitem update = new TbMemberProjectSubitem(); + update.setId(tbMemberProjectSubitem.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setPostContactTemporaryId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updateTbMemberProjectSubitems.add(update); + } + tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); + + //打包项目 + List updatePackCompanyList = new ArrayList<>(); + for (PayPackCompany packCompany : packCompanyList) { + String companyId = packCompany.getCompanyId(); + String companyContactId = packCompany.getCompanyContactId(); + String postContactId = packCompany.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayPackCompany update = new PayPackCompany(); + update.setId(packCompany.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updatePackCompanyList.add(update); + } + packCompanyService.updateBatchById(updatePackCompanyList); } @NotNull - private ArrayList getDistinctContactIdList(List meetingSituations, List workingGroupSubItems, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems) { + private ArrayList getDistinctContactIdList(List meetingSituations, List workingGroupSubItems, List workingGroupSubItemContacts, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems, List packCompanys) { //获得所有联系人id List contactIdList1 = meetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).distinct().collect(Collectors.toList()); - List contactIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getContactsIdOne).distinct().collect(Collectors.toList()); + List contactIdList2 = workingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsId).distinct().collect(Collectors.toList()); List contactIdList3 = payCommonProjects.stream().map(PayCommonProject::getContactsId).distinct().collect(Collectors.toList()); List contactIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyContactId).distinct().collect(Collectors.toList()); List contactIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getLiaisonManId).distinct().collect(Collectors.toList()); + List contactIdList6 = packCompanys.stream().map(PayPackCompany::getCompanyContactId).distinct().collect(Collectors.toList()); contactIdList1.addAll(contactIdList2); contactIdList1.addAll(contactIdList3); contactIdList1.addAll(contactIdList4); contactIdList1.addAll(contactIdList5); + contactIdList1.addAll(contactIdList6); //获得所有邮寄联系人id List postContactIdList1 = meetingSituations.stream().map(PayMeetingSituation::getPostContactId).distinct().collect(Collectors.toList()); List postContactIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getMailContactsId).distinct().collect(Collectors.toList()); List postContactIdList3 = payCommonProjects.stream().map(PayCommonProject::getMailContactsId).distinct().collect(Collectors.toList()); List postContactIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getPostContactId).distinct().collect(Collectors.toList()); List postContactIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getPostContactId).distinct().collect(Collectors.toList()); + List postContactIdList6 = packCompanys.stream().map(PayPackCompany::getMailContactsId).distinct().collect(Collectors.toList()); contactIdList1.addAll(postContactIdList1); contactIdList1.addAll(postContactIdList2); contactIdList1.addAll(postContactIdList3); contactIdList1.addAll(postContactIdList4); contactIdList1.addAll(postContactIdList5); + contactIdList1.addAll(postContactIdList6); //联系人和邮寄联系人合并后去重 return CollectionUtil.distinct(contactIdList1); } @NotNull - private ArrayList getDistinctCompanyIdList(List meetingSituations, List workingGroupSubItems, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems) { + private ArrayList getDistinctCompanyIdList(List meetingSituations, List workingGroupSubItems, List payCommonProjects, List memberProjectSubitems, List tbMemberProjectSubitems, List packCompanys) { //获取所有企业id List companyIdList1 = meetingSituations.stream().map(PayMeetingSituation::getCompanyId).distinct().collect(Collectors.toList()); List companyIdList2 = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getChargeCompanyId).distinct().collect(Collectors.toList()); List companyIdList3 = payCommonProjects.stream().map(PayCommonProject::getChargeCompanyId).distinct().collect(Collectors.toList()); List companyIdList4 = memberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyId).distinct().collect(Collectors.toList()); List companyIdList5 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyId).distinct().collect(Collectors.toList()); + List companyIdList6 = packCompanys.stream().map(PayPackCompany::getCompanyId).distinct().collect(Collectors.toList()); + companyIdList1.addAll(companyIdList2); companyIdList1.addAll(companyIdList3); companyIdList1.addAll(companyIdList4); companyIdList1.addAll(companyIdList5); + companyIdList1.addAll(companyIdList6); //去重 return CollectionUtil.distinct(companyIdList1); } @@ -210,12 +397,14 @@ public class AnnualDataLockingService extends ServiceImpl updateMeetingSituationList = new ArrayList<>(); List meetingSituations = meetingSituationMapper.listByYear(year); for (PayMeetingSituation meetingSituation : meetingSituations) { String companyId = meetingSituation.getCompanyId(); @@ -223,11 +412,119 @@ public class AnnualDataLockingService extends ServiceImpl updateWorkingGroupSubItemList = new ArrayList<>(); + List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); + for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { + String companyId = workingGroupSubItem.getChargeCompanyId(); + String postContactId = workingGroupSubItem.getMailContactsId(); + //更新临时表id + PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); + update.setId(workingGroupSubItem.getId()); + update.setChargeCompanyTemporaryId(companyId); + update.setMailContactsTemporaryId(postContactId); + + updateWorkingGroupSubItemList.add(update); + } + workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); + + //工作组成员联系人 + List updateWorkingGroupSubItemContacts = new ArrayList<>(); + List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); + List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); + for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { + String contactsId = contacts.getContactsId(); + + //更新临时表id + PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); + update.setId(contacts.getId()); + update.setContactsTemporaryId(contactsId); + updateWorkingGroupSubItemContacts.add(update); + } + workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); + + //普通项目 + List updatePayCommonProjects = new ArrayList<>(); + List payCommonProjects = payCommonProjectMapper.listByYear(year); + for (PayCommonProject commonProject : payCommonProjects) { + String companyId = commonProject.getChargeCompanyId(); + String companyContactId = commonProject.getContactsId(); + String postContactId = commonProject.getMailContactsId(); + + //更新临时表id + PayCommonProject update = new PayCommonProject(); + update.setId(commonProject.getId()); + update.setChargeCompanyTemporaryId(companyId); + update.setContactsTemporaryId(companyContactId); + update.setMailContactsTemporaryId(postContactId); + + updatePayCommonProjects.add(update); + } + commonProjectService.updateBatchById(updatePayCommonProjects); + + //会员项目 + List updateMemberProjectSubitems = new ArrayList<>(); + List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); + for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { + String companyId = memberProjectSubitem.getCompanyId(); + String companyContactId = memberProjectSubitem.getCompanyContactId(); + String postContactId = memberProjectSubitem.getPostContactId(); + + //更新临时表id + PayMemberProjectSubitem update = new PayMemberProjectSubitem(); + update.setId(memberProjectSubitem.getId()); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); + + updateMemberProjectSubitems.add(update); + } + memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); + + //标协会员项目 + List updateTbMemberProjectSubitems = new ArrayList<>(); + List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); + for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { + String companyId = tbMemberProjectSubitem.getCompanyId(); + String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); + String postContactId = tbMemberProjectSubitem.getPostContactId(); + //更新临时表id + TbMemberProjectSubitem update = new TbMemberProjectSubitem(); + update.setId(tbMemberProjectSubitem.getId()); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); + + updateTbMemberProjectSubitems.add(update); + } + tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); + + //打包项目 + List updatePackCompanyList = new ArrayList<>(); + List packCompanyList = packCompanyMapper.listByYear(year); + for (PayPackCompany packCompany : packCompanyList) { + String companyId = packCompany.getCompanyId(); + String companyContactId = packCompany.getCompanyContactId(); + String postContactId = packCompany.getMailContactsId(); + + //更新临时表id + PayPackCompany update = new PayPackCompany(); + update.setId(packCompany.getId()); + update.setMailContactsId(postContactId); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + updatePackCompanyList.add(update); + } + packCompanyService.updateBatchById(updatePackCompanyList); + } public void deleteByIds(List idList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java index c572139c..b9b15aba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayCompanyManagementTemporaryService.java @@ -4,6 +4,7 @@ package com.jero.temporary.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.temporary.entity.PayCompanyManagementTemporary; +import java.io.Serializable; import java.util.List; /** @@ -27,4 +28,6 @@ public interface IPayCompanyManagementTemporaryService extends IService insertList(List companyIdList, String year); PayCompanyManagementTemporary getByAllTable(String companyId, String companyTemporaryId); + + PayCompanyManagementTemporary getById(String id); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java index ff8cc2c6..9bf3dd62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -12,7 +12,6 @@ import com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -60,8 +59,8 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl Date: Sat, 27 Jul 2024 18:05:34 +0800 Subject: [PATCH 062/111] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 4 +++- .../TbMemberProjectSubitemController.java | 18 ++++++++++++++++-- .../member/entity/TbMemberProjectSubitem.java | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index a17ab065..2814c208 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -83,6 +83,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; import com.jero.statistics.entity.MeetingPackStatistics; import com.jero.statistics.entity.MeetingPackStatisticsSearch; +import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.util.ObjRecordUtil; @@ -1762,7 +1763,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Sun, 28 Jul 2024 19:54:43 +0800 Subject: [PATCH 063/111] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 9 +- .../impl/PayDraftingGroupServiceImpl.java | 5 +- .../PayDraftingGroupSubItemServiceImpl.java | 8 +- .../service/impl/PayMeetingServiceImpl.java | 7 +- .../impl/PayMeetingSituationServiceImpl.java | 43 +++++---- .../service/IPayMemberProjectService.java | 11 ++- .../IPayMemberProjectSubitemService.java | 96 ++++--------------- .../service/ITbMemberProjectService.java | 9 +- .../ITbMemberProjectSubitemService.java | 13 +-- .../PayPackCompanyProjectServiceImpl.java | 5 +- .../impl/PayPackCompanyServiceImpl.java | 36 +++---- .../impl/PayPaymentRecordServiceImpl.java | 2 +- .../controller/PayWorkingGroupController.java | 5 +- .../PayWorkingGroupSubItemController.java | 4 +- .../mapper/AnnualDataLockingMapper.java | 2 +- .../mapper/xml/AnnualDataLockingMapper.xml | 4 +- .../service/AnnualDataLockingService.java | 15 +-- .../impl/PayCommonProjectServiceImpl.java | 29 +++--- .../impl/PayWorkingGroupServiceImpl.java | 12 +-- .../PayWorkingGroupSubItemServiceImpl.java | 40 ++++---- ...IPayCompanyManagementTemporaryService.java | 6 +- ...PayContactsManagementTemporaryService.java | 3 +- ...CompanyManagementTemporaryServiceImpl.java | 19 +++- ...ontactsManagementTemporaryServiceImpl.java | 13 +-- .../system/service/impl/SysBaseApiImpl.java | 20 +++- 25 files changed, 201 insertions(+), 215 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 089359ea..deb9f6b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -50,7 +50,6 @@ import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -321,7 +320,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingHotelContacts::getMeetingId, id); @@ -699,7 +700,7 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException(meetingList + "会议下有参会人，无法删除"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 2814c208..71a94f72 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -76,6 +76,7 @@ import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.AnnualDataLocking; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.AnnualDataLockingService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; @@ -83,6 +84,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; import com.jero.statistics.entity.MeetingPackStatistics; import com.jero.statistics.entity.MeetingPackStatisticsSearch; +import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; @@ -201,15 +203,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl payMeetings = meetingService.listByIds(meetingIds); for (PayMeeting payMeeting : payMeetings) { //判断用户是否能操作所选年份数据 - annualDataLockingService.judgeUserYear(payMeeting.getParticularYear()); + AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(payMeeting.getParticularYear()); } for (String id : ids) { removeSituationPack(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java index ef4df466..467c94d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java @@ -17,6 +17,7 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.AnnualDataLocking; import com.jero.project.entity.PayCommonProject; import com.jero.project.service.AnnualDataLockingService; import org.apache.commons.collections.CollectionUtils; @@ -71,7 +72,7 @@ public class IPayMemberProjectService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayMemberProjectSubitem::getProjectId, id); @@ -134,7 +135,7 @@ public class IPayMemberProjectService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.in(PayMemberProjectSubitem::getProjectId, ids); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index e8c24c38..f2eeb707 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -25,11 +25,10 @@ import com.jero.member.entity.PayMemberProject; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectMapper; import com.jero.member.mapper.PayMemberProjectSubitemMapper; -import com.jero.member.service.IPayMemberProjectService; -import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.AnnualDataLocking; import com.jero.project.service.AnnualDataLockingService; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -94,7 +93,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMemberProjectSubitem::getProjectId,projectId); @@ -103,8 +102,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl0){ throw new JeroBootException("会员单位已经存在"); } -// validMemberProjectSubitem(payMemberProjectSubitem); - validMemberProjectSubitemAdd(payMemberProjectSubitem); + validMemberProjectSubitemAdd(payMemberProjectSubitem,annualDataLocking); //实收金额 payMemberProjectSubitem.setPaidAmount(new BigDecimal("0.00")); //到账 @@ -174,7 +172,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl errors = new ArrayList<>(); // 企业 try { - PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId()); + PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId(), annualDataLocking); if (Objects.isNull(chargeCompanyName)) { throw new JeroBootException("企业名称为空！"); } @@ -286,7 +271,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(TbMemberProjectSubitem::getProjectId, id); @@ -134,7 +135,7 @@ public class ITbMemberProjectService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.in(TbMemberProjectSubitem::getProjectId, ids); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 8badfc76..7d6e1ee1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -49,6 +49,7 @@ import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.AnnualDataLocking; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.AnnualDataLockingService; @@ -125,7 +126,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl insertList = new ArrayList<>(); List errorMessage = new ArrayList<>(); @@ -438,7 +439,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(PayPaymentRecord::getProjectId,id); @@ -719,7 +720,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayPackCompany::getCompanyId,payPackCompany.getCompanyId()); @@ -90,7 +82,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl errInfoList = new ArrayList<>(); for (String workingGroupId : workingGroupIdsArr) { PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workingGroupId); - String year = payWorkingGroup.getYear(); - //判断用户是否能操作所选年份数据 - annualDataLockingService.judgeUserYear(year); BigDecimal yearChargeA = payWorkingGroup.getYearChargeA(); BigDecimal taxRate = new BigDecimal("0.06"); payWorkingGroupSubItem.setTaxRate(taxRate); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java index 70761a1b..1147feb7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java @@ -10,7 +10,7 @@ import com.jero.project.entity.AnnualDataLocking; *@date 2024-07-24 13:51 */ public interface AnnualDataLockingMapper extends BaseMapper { - Integer countByYear(@Param("year")String year); + AnnualDataLocking countByYear(@Param("year")String year); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml index 84f8ae78..34b4a4bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml @@ -17,8 +17,8 @@ - + select * from pay_annual_data_locking diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 787a3178..f8537af4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -41,6 +41,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -377,20 +378,22 @@ public class AnnualDataLockingService extends ServiceImpl 0; + public AnnualDataLocking checkYear(String year){ + return baseMapper.countByYear(year); } /** - * 判断用户是否能操作所选年份数据 + * 判断用户是否能操作所选年份数据，返回年份是否是锁定的 * @param year */ - public void judgeUserYear(String year){ - boolean b = checkYear(year); + public AnnualDataLocking judgeUserYear(String year){ + AnnualDataLocking b = checkYear(year); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (user.getRoleCode().equals(RoleCommon.XMFZR) && b){ + //如果是项目负责人，就抛出异常 + if (Objects.equals(user.getRoleCode(),RoleCommon.XMFZR) && b != null){ throw new JeroBootException(year+"年数据已经锁定"); } + return b; } public void editById(AnnualDataLocking annualDataLocking) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 86db25df..309f63f7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -22,13 +22,13 @@ import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.mail.service.IPayMailBillService; -import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.AnnualDataLocking; import com.jero.project.service.AnnualDataLockingService; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.entity.PayCommonProject; @@ -112,10 +112,11 @@ public class PayCommonProjectServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id); List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); @@ -173,7 +173,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p); List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); @@ -295,7 +295,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -233,7 +234,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0) { payWorkingGroupSubItem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS); } - setPayWorkingGroupSubItemAdd(payWorkingGroupSubItem); + setPayWorkingGroupSubItemAdd(payWorkingGroupSubItem, annualDataLocking); payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING0); payWorkingGroupSubItem.setInAccount(PayProjectCommon.IN_ACCOUNT0); payWorkingGroupSubItem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0); @@ -339,7 +340,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); // 添加联系人表 if (!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContactsNew)) { @@ -593,7 +594,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); // 添加联系人表 if (!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContactsNew)) { @@ -900,8 +903,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl { @@ -1385,7 +1393,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl insertList(List companyIdList, String year); PayCompanyManagementTemporary getByAllTable(String companyId, String companyTemporaryId); PayCompanyManagementTemporary getById(String id); + + boolean removeById(String id); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java index f5520c3b..40a6c7b3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/IPayContactsManagementTemporaryService.java @@ -2,6 +2,7 @@ package com.jero.temporary.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.project.entity.AnnualDataLocking; import com.jero.temporary.entity.PayContactsManagementTemporary; import java.util.List; @@ -22,7 +23,7 @@ public interface IPayContactsManagementTemporaryService extends IService insertList(List contactsIdList, String year); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java index 9bf3dd62..0c87c941 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayCompanyManagementTemporaryServiceImpl.java @@ -2,10 +2,12 @@ package com.jero.temporary.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.service.IPayCompanyManagementService; +import com.jero.project.entity.AnnualDataLocking; import com.jero.temporary.common.PayCompanyManagementTemporaryCommon; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.mapper.PayCompanyManagementTemporaryMapper; @@ -33,7 +35,7 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCompanyManagementTemporary::getId, id) + .isNotNull(PayCompanyManagementTemporary::getYear); + return baseMapper.delete(wrapper) > 0; + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java index 9c4f00d8..5638e93b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java @@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; -import com.jero.temporary.common.PayCompanyManagementTemporaryCommon; -import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.project.entity.AnnualDataLocking; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.mapper.PayContactsManagementTemporaryMapper; import com.jero.temporary.service.IPayContactsManagementTemporaryService; @@ -36,7 +34,7 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl dictModels = sysDictService.queryTableDictItemsByCode(table, text, code); + if ("pay_company_management_temporary".equals(table)){ + dictModels.addAll(sysDictService.queryTableDictItemsByCode("pay_company_management", text, code)); + }else if ("pay_contacts_management_temporary".equals(table)){ + dictModels.addAll(sysDictService.queryTableDictItemsByCode("pay_contacts_management", text, code)); + } + return dictModels; } @Override From 34e7031de47e2b0de15cca6dd1bce568412fcbcd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 29 Jul 2024 10:11:58 +0800 Subject: [PATCH 064/111] =?UTF-8?q?fix=20=E6=96=B0=E5=A2=9E=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E9=A1=B9=E7=9B=AE=E5=90=8E=E6=9D=A5=E6=AC=BE=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayCommonProjectMapper.xml | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index 65ffed1a..3891b0dc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -11,16 +11,15 @@ su.realname as principal_name, pcp.charge_company_id, pcp.charge_company_temporary_id, -# if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as charge_company_temporary_name, IF( - pcp.charge_company_temporary_name = - IF( - pcp.charge_company_temporary_name LIKE '%（未审核）', - CONCAT(pcm.company_name, '（未审核）'), - pcm.company_name - ), - pcp.charge_company_temporary_name, - CONCAT(pcp.charge_company_temporary_name, '（更名为', pcm.company_name, '）') + pcp.charge_company_temporary_name = + IF( + pcp.charge_company_temporary_name LIKE '%（未审核）', + CONCAT(pcm.company_name, '（未审核）'), + pcm.company_name + ), + pcp.charge_company_temporary_name, + CONCAT(pcp.charge_company_temporary_name, '（更名为', pcm.company_name, '）') ) AS chargeCompanyTemporaryName, pcp.charge_use, pcp.contacts_id, @@ -57,8 +56,7 @@ FROM pay_common_project pcp left join sys_user su on pcp.principal_id = su.id LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id - left join pay_company_management_temporary pcmt on pcp.charge_company_temporary_id = pcmt.id - left join pay_company_management pcm on pcmt.company_id = pcm.id + left join pay_company_management pcm on pcp.charge_company_id = pcm.id AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%')) From 0a8258de241376b44c73741c065e342555d2dcde Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 29 Jul 2024 13:59:04 +0800 Subject: [PATCH 065/111] =?UTF-8?q?fix=2087663=20=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98--=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE--?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=95=E4=BD=8D=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index ec332f24..20742432 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -62,7 +62,6 @@ - select DATE_FORMAT(paymentDate, '%Y-%m') as paymentDate,sum(estimatedArrivalMoney) as estimatedArrivalMoney from ( - select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate - from pay_common_project - where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear} - and pack = 0 - union all - select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate - from pay_working_group_subitem - where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear} - and pack = 0 - union all - select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate - from pay_meeting_situation - where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear} - and pack = 0 - union all - select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate - from pay_member_project_subitem - where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear} - and pack = 0 - ) dataAll group by DATE_FORMAT(paymentDate, '%Y-%m') order by paymentDate + select DATE_FORMAT(estimatedArrivalDate, '%Y-%m') as paymentDate, + sum(allMoney) as estimatedArrivalMoney + from v_statistical_pack + where DATE_FORMAT(estimatedArrivalDate, '%Y') = #{paymentYear} + group by DATE_FORMAT(estimatedArrivalDate, '%Y-%m') order by paymentDate \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index 057da062..eb6c1425 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -128,4 +128,6 @@ public interface IPayCompanyManagementService extends IService pageSafetyCenter(Page page, QueryWrapper queryWrapper); Page pageHaveMoney(Page page, List chargeCompanyIds); + + List pageHaveMoney(List chargeCompanyIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 004fb430..4576dcc5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -703,6 +703,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl pageHaveMoney(List chargeCompanyIds) { + return payCompanyManagementMapper.pageHaveMoney(chargeCompanyIds); + } + /** * 校验企业名称和信用代码是否匹配 * @param payCompanyManagement diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 9a64c914..832fa9c9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2691,7 +2691,7 @@ from v_statistical v - + #{item} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 7fe33b42..99ef860b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -252,7 +252,8 @@ public class CompanyComeMoneyStatisticsController { //获取分页后需要统计的企业 Page page = new Page<>(pageNo, pageSize); Page companyManagementPage = payCompanyManagementService.pageHaveMoney(page,chargeCompanyIds); - chargeCompanyIds = companyManagementPage.getRecords().stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); + List companyManagementList = companyManagementPage.getRecords(); + chargeCompanyIds = companyManagementList.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); String year_begin = companyComeMoneySearch.getYear_begin(); @@ -302,16 +303,15 @@ public class CompanyComeMoneyStatisticsController { List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); - for (String companyId : chargeCompanyIds) { + for (PayCompanyManagement companyManagement : companyManagementList) { + String companyId = companyManagement.getId(); Map lm = new HashMap<>(); + + String companyName = companyManagement.getCompanyName(); + lm.put("name", companyName); + //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (CollectionUtil.isEmpty(companyDateList)) { - continue; - }else { - String companyName = companyDateList.get(0).getCompanyName(); - lm.put("name", companyName); - } //按年份分组 Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); for (String yearKey : years) { @@ -406,7 +406,7 @@ public class CompanyComeMoneyStatisticsController { chargeCompanyIds = StrUtil.split(chargeCompanyId, ','); allSearch.setChargeCompanyIds(chargeCompanyIds); } - + List companyManagementList = payCompanyManagementService.pageHaveMoney(chargeCompanyIds); String year_begin = companyComeMoneySearch.getYear_begin(); String year_end = companyComeMoneySearch.getYear_end(); int integer1 = Integer.parseInt(year_begin); @@ -446,16 +446,14 @@ public class CompanyComeMoneyStatisticsController { List> valList = new ArrayList<>(); //先按企业id分组 Map> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId); - for (String companyId : chargeCompanyIds) { + for (PayCompanyManagement companyManagement : companyManagementList) { + String companyId = companyManagement.getId(); Map lm = new HashMap<>(); + + String companyName = companyManagement.getCompanyName(); + lm.put("name", companyName); //获取单一企业数据 List companyDateList = companyIdKeyMap.get(companyId); - if (CollectionUtil.isEmpty(companyDateList)) { - continue; - }else { - String companyName = companyDateList.get(0).getCompanyName(); - lm.put("name", companyName); - } //按年份分组 Map> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear); for (String yearKey : years) { From 3ae98f5d00f2919647a18eaf380e992cdeef7983 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 30 Jul 2024 14:28:09 +0800 Subject: [PATCH 080/111] =?UTF-8?q?fix=2087786=20=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE-=E9=94=81=E5=AE=9A=E5=90=8E-=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=B9=B4=E4=BB=BD=E6=B2=A1=E6=9C=89=E6=8A=A5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 349e13d7..eace24db 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -343,6 +343,7 @@ public class PayMeetingServiceImpl extends ServiceImpl upPayMeetingSituation = new LambdaUpdateWrapper<>(); upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId, meetingId); @@ -459,9 +460,15 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException("会议名称不能重复"); } @@ -494,9 +501,7 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Wed, 31 Jul 2024 09:35:54 +0800 Subject: [PATCH 081/111] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA1=E7=9A=84id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/PayWorkingGroupSubItemServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 09051891..930df447 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -166,6 +166,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl pwg = payWorkingGroupSubItemContactsList.stream().filter(p -> Objects.equals(p.getWorkingGroupSubId(), workingGroupSubItem.getId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(pwg)) { pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + workingGroupSubItem.setContactsIdOne(pwg.get(0).getContactsId()); + workingGroupSubItem.setContactsTemporaryIdOne(pwg.get(0).getContactsTemporaryId()); workingGroupSubItem.setContactsTemporaryNameOne(pwg.get(0).getContactsTemporaryName()); workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg); } else { From d5f4eca6bfccaf7da66e62c9957f92efaffcb3b1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 09:49:59 +0800 Subject: [PATCH 082/111] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=81=E5=AE=9A=20=E4=B8=8D=E8=83=BD=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E5=BD=93=E5=89=8D=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/service/AnnualDataLockingService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 6f4d2c85..05e6d181 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -2,6 +2,7 @@ package com.jero.project.service; import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import com.jero.common.common.RoleCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; @@ -106,7 +107,9 @@ public class AnnualDataLockingService extends ServiceImpl Date: Wed, 31 Jul 2024 11:20:35 +0800 Subject: [PATCH 083/111] =?UTF-8?q?fix=20=E6=89=93=E5=8C=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=B0=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index ca99ebe3..884ca6b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -244,7 +244,6 @@ left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id - sit.check_result = 1 AND sit.id = #{projectId} From cffc28078b91345db874d2f83009e1a204ba1d00 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 11:33:15 +0800 Subject: [PATCH 084/111] =?UTF-8?q?rollback=20fix=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E5=B0=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index 884ca6b0..ca99ebe3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -244,6 +244,7 @@ left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id + sit.check_result = 1 AND sit.id = #{projectId} From 38b16159952b11017a69e7eac01b55286d32aada Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 13:52:56 +0800 Subject: [PATCH 085/111] =?UTF-8?q?fix=2087830=20=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=B4=E6=8A=A4-=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF-=E6=9C=AA=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BC=81=E4=B8=9A=E5=8D=95=E4=BD=8D=E5=81=9A?= =?UTF-8?q?=E4=BA=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=97=E8=A1=A8=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=9B=9E=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/TbMemberProjectSubitemMapper.xml | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index b586385a..e687f393 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -70,6 +70,7 @@ + - + select tmps.id,tmps.create_by,tmps.create_time,tmps.update_by,tmps.update_time,tmps.project_id,tmps.member_no, + tmps.company_id, + tmps.company_temporary_id, + ifnull( IF( + tmps.company_name = + IF( + tmps.company_name LIKE '%（未审核）', + CONCAT(pcm.company_name, '（未审核）'), + pcm.company_name + ), + tmps.company_name, + CONCAT(tmps.company_name, '（更名为', pcm.company_name, '）') + ), tmps.company_name) AS company_name, + tmps.member_nature, + tmps.member_type,tmps.liaison_man_id,tmps.company_contact_temporary_id, + tmps.liaison_man,tmps.post_company_id,tmps.post_contact_id,tmps.post_contact_temporary_id,tmps.email,tmps.mobile, + tmps.member_status,tmps.register_time,tmps.amount_receivable,tmps.tax_rate, + tmps.tax,tmps.no_tax_amount,tmps.paid_amount,tmps.confirm_amount,tmps.estimated_arrival_date, + tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.affirm_income, + tmps.mail,tmps.ticket_collection,tmps.charge_use,tmps.payment_method,tmps.tb_payment_id,tmps.invoice_amount, + tmps.payment_status,tmps.bill_number,tmps.member_id,tmps.payment_record, + tmps.submission_time,tmps.header_name,tmps.tax_number,tmps.invoice_address,tmps.invoice_phone,tmps.deposit_bank, + tmps.bank_account,tmps.link_bank_number,tmps.confirm_tax,tmps.confirm_no_tax_amount,tmps.paid_tax,tmps.paid_no_tax_amount, + tmps.invoice_tax,tmps.invoice_no_tax_amount,tmps.member_payment_amount,tmps.certificate_payment_amount,tmps.other_payment_amount, + tmps.admin_add_flag,tmps.charge_notice_no,tmps.charge_notice_id,tmps.contract_num,tmps.remark,tmps.effective_date, + tmps.invalidation_date + from tb_member_project_subitem tmps LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id + left join pay_company_management pcm on tmps.company_id = pcm.id ${ew.customSqlSegment} From 56f8b0912506349118e9b145e1926f6f4d62f07f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 14:01:19 +0800 Subject: [PATCH 086/111] =?UTF-8?q?fix=2087854=20=E9=A6=96=E9=A1=B5--?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1--?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=88=86=E6=9E=90--=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=E6=98=AF=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E7=BB=8F=E8=B4=B9=E9=80=89=E6=8B=A9=E5=90=88=E5=90=8C?= =?UTF-8?q?--=E6=B2=A1=E6=9C=89=E5=88=92=E5=88=86=E5=88=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E4=BD=9C=E7=BB=8F=E8=B4=B9=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图（新）.sql | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/db/统计视图（新）.sql b/db/统计视图（新）.sql index 33bf936f..dd6a619e 100644 --- a/db/统计视图（新）.sql +++ b/db/统计视图（新）.sql @@ -1568,6 +1568,40 @@ from ( and (pack = 0 or year < 2024) group by pwgs.id union all + SELECT pcp.id, + pcp.id as superId, + pcp.charge_project AS projectName, + pcp.principal_name as principalName, + pcp.charge_company_id AS chargeCompanyId, + pcp.charge_company_temporary_id as chargeCompanyTemporaryId, + pcp.charge_company_temporary_name AS chargeCompanyTemporaryName, + pcp.no_tax_amount as allMoney, + pcp.paid_amount as comeAllMoney, + 16 as chargeUse, + sd.depart_name as depart, + pcp.pack as pack, + pcp.year as year, + pcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pcp.principal_id as principalNameId, + 1 as type, + pcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + contacts_temporary_name as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pcp.create_time as createTime + FROM pay_common_project pcp + left JOIN sys_user su on (pcp.principal_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id + where (pack = 0 or year < 2024) + and charge_way = 2 + group by pcp.id + union all SELECT pcp.id, pcp.id as superId, pcp.charge_project AS projectName, @@ -1599,6 +1633,7 @@ from ( left join sys_depart sd on (su.depart_ids = sd.id) left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id where (pack = 0 or year < 2024) + and charge_way != 2 group by pcp.id union all SELECT pmps.id, From d350140fd64597cdb8054f85c3797f0110f570ce Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 15:52:28 +0800 Subject: [PATCH 087/111] =?UTF-8?q?fix=2087835=20=E5=88=B0=E8=B4=A6?= =?UTF-8?q?=E5=BC=80=E7=A5=A8-=E4=BF=AE=E6=94=B9=E7=A1=AE=E6=94=B6?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=90=8E=EF=BC=8C=E5=86=8D=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=A0=B8=E5=90=8E=E7=8A=B6=E6=80=81=E5=92=8C?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/payment/service/impl/PayPaymentCheckServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index b0d39608..092d640b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -769,7 +769,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl Date: Wed, 31 Jul 2024 16:36:16 +0800 Subject: [PATCH 088/111] =?UTF-8?q?fix=2087782=20=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98--=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE--?= =?UTF-8?q?=E5=B0=81=E9=94=81=E5=90=8E=E4=BC=9A=E5=91=98=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF=E8=BF=98=E6=98=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayCompanyManagementServiceImpl.java | 109 +++++++----------- .../mapper/TbMemberProjectSubitemMapper.java | 2 + .../xml/TbMemberProjectSubitemMapper.xml | 7 ++ .../mapper/AnnualDataLockingMapper.java | 5 + .../mapper/xml/AnnualDataLockingMapper.xml | 6 + .../service/AnnualDataLockingService.java | 8 ++ 6 files changed, 70 insertions(+), 67 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index 4576dcc5..b4d082d1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -33,13 +33,17 @@ import com.jero.company.vo.UpdateInvoicePram; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.member.service.IPayMemberProjectSubitemService; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.AnnualDataLockingService; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.temporary.entity.PayCompanyManagementTemporary; @@ -93,6 +97,12 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl allYear = annualDataLockingService.getAllYear(); //需要更新的临时企业id List companyTemporaryIdList = new ArrayList<>(); // 更新普通项目 LambdaQueryWrapper quaryPayCommonProject = new LambdaQueryWrapper<>(); quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId()); - quaryPayCommonProject.eq(PayCommonProject::getYear,thisYear); - quaryPayCommonProject.and( - a -> { - a.eq(PayCommonProject::getPaidAmount, BigDecimal.ZERO) - .or() - .isNull(PayCommonProject::getPaidAmount); - }); - quaryPayCommonProject.and( - a -> { - a.eq(PayCommonProject::getInvoiceAmount, BigDecimal.ZERO) - .or() - .isNull(PayCommonProject::getInvoiceAmount); - }); - quaryPayCommonProject.and( - a -> { - a.eq(PayCommonProject::getConfirmAmount, BigDecimal.ZERO) - .or() - .isNull(PayCommonProject::getConfirmAmount); - }); + quaryPayCommonProject.notIn(PayCommonProject::getYear,allYear); + List list = payCommonProjectService.list(quaryPayCommonProject); List collect = list.stream().map(PayCommonProject::getChargeCompanyTemporaryId).collect(Collectors.toList()); + List idList = list.stream().map(PayCommonProject::getId).collect(Collectors.toList()); companyTemporaryIdList.addAll(collect); - if (!collect.isEmpty()){ + if (!idList.isEmpty()){ LambdaUpdateWrapper updatePayCommonProject = new LambdaUpdateWrapper<>(); - updatePayCommonProject.in(PayCommonProject::getChargeCompanyTemporaryId,collect); + updatePayCommonProject.in(PayCommonProject::getId,idList); updatePayCommonProject.set(PayCommonProject::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); payCommonProjectService.update(updatePayCommonProject); } // 更新工作组 QueryWrapper queryPayWorkingGroupSubItem = new QueryWrapper<>(); - queryPayWorkingGroupSubItem.eq("pwg.year",thisYear); - queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()) - .and( - a -> { - a.eq(PayWorkingGroupSubItem::getPaidAmount, BigDecimal.ZERO) - .or() - .isNull(PayWorkingGroupSubItem::getPaidAmount); - }) - .and( - a -> { - a.eq(PayWorkingGroupSubItem::getInvoiceAmount, BigDecimal.ZERO) - .or() - .isNull(PayWorkingGroupSubItem::getInvoiceAmount); - }) - .and( - a -> { - a.eq(PayWorkingGroupSubItem::getConfirmAmount, BigDecimal.ZERO) - .or() - .isNull(PayWorkingGroupSubItem::getConfirmAmount); - }); + queryPayWorkingGroupSubItem.notIn("pwg.year",allYear); + queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()); + List workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem); List collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList()); + List idList1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); companyTemporaryIdList.addAll(collect1); - if (!collect1.isEmpty()){ + if (!idList1.isEmpty()){ LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getChargeCompanyId,collect1); + updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getId,idList1); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); } // 更新会员 QueryWrapper queryPayMemberProjectSubitem = new QueryWrapper<>(); - queryPayMemberProjectSubitem.eq("pmp.particular_year",thisYear); - queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()) - .and( - a -> { - a.eq(PayMemberProjectSubitem::getPaidAmount, BigDecimal.ZERO) - .or() - .isNull(PayMemberProjectSubitem::getPaidAmount); - }) - .and( - a -> { - a.eq(PayMemberProjectSubitem::getInvoiceAmount, BigDecimal.ZERO) - .or() - .isNull(PayMemberProjectSubitem::getInvoiceAmount); - }) - .and( - a -> { - a.eq(PayMemberProjectSubitem::getConfirmAmount, BigDecimal.ZERO) - .or() - .isNull(PayMemberProjectSubitem::getConfirmAmount); - }); + queryPayMemberProjectSubitem.notIn("pmp.particular_year",allYear) ; + queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + List payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem); List collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); + List idList2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getId).collect(Collectors.toList()); companyTemporaryIdList.addAll(collect2); - if (!collect2.isEmpty()){ + if (!idList2.isEmpty()){ LambdaUpdateWrapper updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>(); - updatePayMemberProjectSubitem.in(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + updatePayMemberProjectSubitem.in(PayMemberProjectSubitem::getId,idList2); updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName()); memberProjectSubitemService.update(updatePayMemberProjectSubitem); } + // 更新标协会员 + QueryWrapper queryTbMemberProjectSubitem = new QueryWrapper<>(); + queryTbMemberProjectSubitem.notIn("tmp.year",allYear); + queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); - + List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.queryListCompanyYear(queryTbMemberProjectSubitem); + List collect3 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); + List idList3 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect3); + if (!idList3.isEmpty()){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(TbMemberProjectSubitem::getId,idList3); + updateWrapper.set(TbMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName()); + tbMemberProjectSubitemService.update(updateWrapper); + } // 更新临时数据 if (!companyTemporaryIdList.isEmpty()) { LambdaUpdateWrapper updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java index 45899468..563dad3e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java @@ -63,4 +63,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper getAllYearInfoByCompanyId(@Param("companyId") String companyId); List listByYear(@Param("year") String year); + + List queryListCompanyYear(@Param(Constants.WRAPPER) QueryWrapper queryTbMemberProjectSubitem); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index e687f393..5801f0c9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -204,4 +204,11 @@ LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id where tmp.year = #{year} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java index 1147feb7..bbf03d88 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/AnnualDataLockingMapper.java @@ -1,9 +1,12 @@ package com.jero.project.mapper; +import java.util.List; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.project.entity.AnnualDataLocking; +import java.time.Year; + /** * *@author liJiaRao @@ -12,5 +15,7 @@ import com.jero.project.entity.AnnualDataLocking; public interface AnnualDataLockingMapper extends BaseMapper { AnnualDataLocking countByYear(@Param("year")String year); + List getYear(); + } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml index 34b4a4bd..f903e833 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/AnnualDataLockingMapper.xml @@ -26,4 +26,10 @@ + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 05e6d181..7724d9bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -386,6 +386,14 @@ public class AnnualDataLockingService extends ServiceImpl getAllYear(){ + return baseMapper.getYear(); + } + /** * 查询年份是否存在 */ From 511dcaa46c9fb6fea03f50e54514257ebd95d403 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 16:54:23 +0800 Subject: [PATCH 089/111] =?UTF-8?q?fix=2087894=20=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=81=E5=AE=9A--=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=80=A7=E8=83=BD=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AnnualDataLockingService.java | 636 +++++++++--------- 1 file changed, 322 insertions(+), 314 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 7724d9bb..49b04f84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -115,225 +116,229 @@ public class AnnualDataLockingService extends ServiceImpl meetingSituations = meetingSituationMapper.listByYear(year); - List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); - List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); - List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); - List payCommonProjects = payCommonProjectMapper.listByYear(year); - List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); - List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); - List packCompanyList = packCompanyMapper.listByYear(year); - //获得去重后的所有企业和联系人（联系人和邮寄联系人） - ArrayList distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); - ArrayList distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, workingGroupSubItemContacts, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); - //如果企业或联系人为空那么直接返回 - if (CollectionUtil.isEmpty(distinctCompanyIdList)||CollectionUtil.isEmpty(distinctContactIdList)){ - return; - } - //生成企业和联系人临时数据 - List companyTemporaryList = companyTemporaryService.insertList(distinctCompanyIdList,year); - Map companyTemporaryMap = CollStreamUtil.toIdentityMap(companyTemporaryList, PayCompanyManagementTemporary::getCompanyId); - List contactsTemporaryList = contactsTemporaryService.insertList(distinctContactIdList,year); - Map contactsTemporaryMap = CollStreamUtil.toIdentityMap(contactsTemporaryList, PayContactsManagementTemporary::getContactId); + CompletableFuture.supplyAsync(() -> { + //第一步先获取所有企业和联系人 + List meetingSituations = meetingSituationMapper.listByYear(year); + List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); + List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); + List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); + List payCommonProjects = payCommonProjectMapper.listByYear(year); + List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); + List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); + List packCompanyList = packCompanyMapper.listByYear(year); + //获得去重后的所有企业和联系人（联系人和邮寄联系人） + ArrayList distinctCompanyIdList = getDistinctCompanyIdList(meetingSituations, workingGroupSubItems, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); + ArrayList distinctContactIdList = getDistinctContactIdList(meetingSituations, workingGroupSubItems, workingGroupSubItemContacts, payCommonProjects, memberProjectSubitems, tbMemberProjectSubitems,packCompanyList); + //如果企业或联系人为空那么直接返回 + if (CollectionUtil.isEmpty(distinctCompanyIdList)||CollectionUtil.isEmpty(distinctContactIdList)){ + return ""; + } + //生成企业和联系人临时数据 + List companyTemporaryList = companyTemporaryService.insertList(distinctCompanyIdList,year); + Map companyTemporaryMap = CollStreamUtil.toIdentityMap(companyTemporaryList, PayCompanyManagementTemporary::getCompanyId); + List contactsTemporaryList = contactsTemporaryService.insertList(distinctContactIdList,year); + Map contactsTemporaryMap = CollStreamUtil.toIdentityMap(contactsTemporaryList, PayContactsManagementTemporary::getContactId); - //会议项目 - List updateMeetingSituationList = new ArrayList<>(); - for (PayMeetingSituation meetingSituation : meetingSituations) { - String companyId = meetingSituation.getCompanyId(); - String companyContactId = meetingSituation.getCompanyContactId(); - String postContactId = meetingSituation.getPostContactId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; - } - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - PayMeetingSituation update = new PayMeetingSituation(); - update.setId(meetingSituation.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setPostContactTemporaryId(contactsTemporary1.getId()); + //会议项目 + List updateMeetingSituationList = new ArrayList<>(); + for (PayMeetingSituation meetingSituation : meetingSituations) { + String companyId = meetingSituation.getCompanyId(); + String companyContactId = meetingSituation.getCompanyContactId(); + String postContactId = meetingSituation.getPostContactId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; } - } - update.setCompanyTemporaryId(companyTemporary.getId()); - update.setCompanyContactTemporaryId(contactsTemporary.getId()); - updateMeetingSituationList.add(update); - } - meetingSituationService.updateBatchById(updateMeetingSituationList); - - //工作组项目 - List updateWorkingGroupSubItemList = new ArrayList<>(); - for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { - String companyId = workingGroupSubItem.getChargeCompanyId(); - String postContactId = workingGroupSubItem.getMailContactsId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; - } - //更新临时表id - PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); - update.setId(workingGroupSubItem.getId()); - update.setChargeCompanyTemporaryId(companyTemporary.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setMailContactsTemporaryId(contactsTemporary1.getId()); + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; } - } - - updateWorkingGroupSubItemList.add(update); - } - workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); - - //工作组成员联系人 - List updateWorkingGroupSubItemContacts = new ArrayList<>(); - for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { - String contactsId = contacts.getContactsId(); - - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(contactsId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); - update.setId(contacts.getId()); - update.setContactsTemporaryId(contactsTemporary.getId()); - updateWorkingGroupSubItemContacts.add(update); - } - workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); - - //普通项目 - List updatePayCommonProjects = new ArrayList<>(); - for (PayCommonProject commonProject : payCommonProjects) { - String companyId = commonProject.getChargeCompanyId(); - String companyContactId = commonProject.getContactsId(); - String postContactId = commonProject.getMailContactsId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; - } - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - PayCommonProject update = new PayCommonProject(); - update.setId(commonProject.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setMailContactsId(contactsTemporary1.getId()); + //更新临时表id + PayMeetingSituation update = new PayMeetingSituation(); + update.setId(meetingSituation.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setPostContactTemporaryId(contactsTemporary1.getId()); + } } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updateMeetingSituationList.add(update); } - update.setChargeCompanyTemporaryId(companyTemporary.getId()); - update.setContactsTemporaryId(contactsTemporary.getId()); - updatePayCommonProjects.add(update); - } - commonProjectService.updateBatchById(updatePayCommonProjects); + meetingSituationService.updateBatchById(updateMeetingSituationList); - //会员项目 - List updateMemberProjectSubitems = new ArrayList<>(); - for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { - String companyId = memberProjectSubitem.getCompanyId(); - String companyContactId = memberProjectSubitem.getCompanyContactId(); - String postContactId = memberProjectSubitem.getPostContactId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; - } - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - PayMemberProjectSubitem update = new PayMemberProjectSubitem(); - update.setId(memberProjectSubitem.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setPostContactTemporaryId(contactsTemporary1.getId()); + //工作组项目 + List updateWorkingGroupSubItemList = new ArrayList<>(); + for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { + String companyId = workingGroupSubItem.getChargeCompanyId(); + String postContactId = workingGroupSubItem.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + //更新临时表id + PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); + update.setId(workingGroupSubItem.getId()); + update.setChargeCompanyTemporaryId(companyTemporary.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsTemporaryId(contactsTemporary1.getId()); + } } - } - update.setCompanyTemporaryId(companyTemporary.getId()); - update.setCompanyContactTemporaryId(contactsTemporary.getId()); - updateMemberProjectSubitems.add(update); - } - memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); - //标协会员项目 - List updateTbMemberProjectSubitems = new ArrayList<>(); - for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { - String companyId = tbMemberProjectSubitem.getCompanyId(); - String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); - String postContactId = tbMemberProjectSubitem.getPostContactId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; + updateWorkingGroupSubItemList.add(update); } - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - TbMemberProjectSubitem update = new TbMemberProjectSubitem(); - update.setId(tbMemberProjectSubitem.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setPostContactTemporaryId(contactsTemporary1.getId()); - } - } - update.setCompanyTemporaryId(companyTemporary.getId()); - update.setCompanyContactTemporaryId(contactsTemporary.getId()); - updateTbMemberProjectSubitems.add(update); - } - tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); + workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); - //打包项目 - List updatePackCompanyList = new ArrayList<>(); - for (PayPackCompany packCompany : packCompanyList) { - String companyId = packCompany.getCompanyId(); - String companyContactId = packCompany.getCompanyContactId(); - String postContactId = packCompany.getMailContactsId(); - //获得临时表id - companyTemporaryMap.get(companyId); - PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); - if (companyTemporary == null){ - continue; - } - PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); - if (contactsTemporary == null){ - continue; - } - //更新临时表id - PayPackCompany update = new PayPackCompany(); - update.setId(packCompany.getId()); - if (StringUtils.isNotBlank(postContactId)){ - PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); - if (contactsTemporary1 != null){ - update.setMailContactsId(contactsTemporary1.getId()); + //工作组成员联系人 + List updateWorkingGroupSubItemContacts = new ArrayList<>(); + for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { + String contactsId = contacts.getContactsId(); + + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(contactsId); + if (contactsTemporary == null){ + continue; } + //更新临时表id + PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); + update.setId(contacts.getId()); + update.setContactsTemporaryId(contactsTemporary.getId()); + updateWorkingGroupSubItemContacts.add(update); } - update.setCompanyTemporaryId(companyTemporary.getId()); - update.setCompanyContactTemporaryId(contactsTemporary.getId()); - updatePackCompanyList.add(update); - } - packCompanyService.updateBatchById(updatePackCompanyList); + workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); + + //普通项目 + List updatePayCommonProjects = new ArrayList<>(); + for (PayCommonProject commonProject : payCommonProjects) { + String companyId = commonProject.getChargeCompanyId(); + String companyContactId = commonProject.getContactsId(); + String postContactId = commonProject.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayCommonProject update = new PayCommonProject(); + update.setId(commonProject.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsId(contactsTemporary1.getId()); + } + } + update.setChargeCompanyTemporaryId(companyTemporary.getId()); + update.setContactsTemporaryId(contactsTemporary.getId()); + updatePayCommonProjects.add(update); + } + commonProjectService.updateBatchById(updatePayCommonProjects); + + //会员项目 + List updateMemberProjectSubitems = new ArrayList<>(); + for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { + String companyId = memberProjectSubitem.getCompanyId(); + String companyContactId = memberProjectSubitem.getCompanyContactId(); + String postContactId = memberProjectSubitem.getPostContactId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayMemberProjectSubitem update = new PayMemberProjectSubitem(); + update.setId(memberProjectSubitem.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setPostContactTemporaryId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updateMemberProjectSubitems.add(update); + } + memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); + + //标协会员项目 + List updateTbMemberProjectSubitems = new ArrayList<>(); + for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { + String companyId = tbMemberProjectSubitem.getCompanyId(); + String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); + String postContactId = tbMemberProjectSubitem.getPostContactId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + TbMemberProjectSubitem update = new TbMemberProjectSubitem(); + update.setId(tbMemberProjectSubitem.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setPostContactTemporaryId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updateTbMemberProjectSubitems.add(update); + } + tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); + + //打包项目 + List updatePackCompanyList = new ArrayList<>(); + for (PayPackCompany packCompany : packCompanyList) { + String companyId = packCompany.getCompanyId(); + String companyContactId = packCompany.getCompanyContactId(); + String postContactId = packCompany.getMailContactsId(); + //获得临时表id + companyTemporaryMap.get(companyId); + PayCompanyManagementTemporary companyTemporary = companyTemporaryMap.get(companyId); + if (companyTemporary == null){ + continue; + } + PayContactsManagementTemporary contactsTemporary = contactsTemporaryMap.get(companyContactId); + if (contactsTemporary == null){ + continue; + } + //更新临时表id + PayPackCompany update = new PayPackCompany(); + update.setId(packCompany.getId()); + if (StringUtils.isNotBlank(postContactId)){ + PayContactsManagementTemporary contactsTemporary1 = contactsTemporaryMap.get(postContactId); + if (contactsTemporary1 != null){ + update.setMailContactsId(contactsTemporary1.getId()); + } + } + update.setCompanyTemporaryId(companyTemporary.getId()); + update.setCompanyContactTemporaryId(contactsTemporary.getId()); + updatePackCompanyList.add(update); + } + packCompanyService.updateBatchById(updatePackCompanyList); + return ""; + }); + } @NotNull @@ -426,127 +431,130 @@ public class AnnualDataLockingService extends ServiceImpl updateMeetingSituationList = new ArrayList<>(); - List meetingSituations = meetingSituationMapper.listByYear(year); - for (PayMeetingSituation meetingSituation : meetingSituations) { - String companyId = meetingSituation.getCompanyId(); - String companyContactId = meetingSituation.getCompanyContactId(); - String postContactId = meetingSituation.getPostContactId(); - //更新临时表id - PayMeetingSituation update = new PayMeetingSituation(); - update.setId(meetingSituation.getId()); - update.setCompanyTemporaryId(companyId); - update.setCompanyContactTemporaryId(companyContactId); - update.setPostContactTemporaryId(postContactId); - updateMeetingSituationList.add(update); - } - meetingSituationService.updateBatchById(updateMeetingSituationList); + CompletableFuture.supplyAsync(() -> { + //会议项目 + List updateMeetingSituationList = new ArrayList<>(); + List meetingSituations = meetingSituationMapper.listByYear(year); + for (PayMeetingSituation meetingSituation : meetingSituations) { + String companyId = meetingSituation.getCompanyId(); + String companyContactId = meetingSituation.getCompanyContactId(); + String postContactId = meetingSituation.getPostContactId(); + //更新临时表id + PayMeetingSituation update = new PayMeetingSituation(); + update.setId(meetingSituation.getId()); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); + updateMeetingSituationList.add(update); + } + meetingSituationService.updateBatchById(updateMeetingSituationList); - //工作组项目 - List updateWorkingGroupSubItemList = new ArrayList<>(); - List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); - for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { - String companyId = workingGroupSubItem.getChargeCompanyId(); - String postContactId = workingGroupSubItem.getMailContactsId(); - //更新临时表id - PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); - update.setId(workingGroupSubItem.getId()); - update.setChargeCompanyTemporaryId(companyId); - update.setMailContactsTemporaryId(postContactId); + //工作组项目 + List updateWorkingGroupSubItemList = new ArrayList<>(); + List workingGroupSubItems = payWorkingGroupSubItemMapper.listByYear(year); + for (PayWorkingGroupSubItem workingGroupSubItem : workingGroupSubItems) { + String companyId = workingGroupSubItem.getChargeCompanyId(); + String postContactId = workingGroupSubItem.getMailContactsId(); + //更新临时表id + PayWorkingGroupSubItem update = new PayWorkingGroupSubItem(); + update.setId(workingGroupSubItem.getId()); + update.setChargeCompanyTemporaryId(companyId); + update.setMailContactsTemporaryId(postContactId); - updateWorkingGroupSubItemList.add(update); - } - workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); + updateWorkingGroupSubItemList.add(update); + } + workingGroupSubItemService.updateBatchById(updateWorkingGroupSubItemList); - //工作组成员联系人 - List updateWorkingGroupSubItemContacts = new ArrayList<>(); - List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); - List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); - for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { - String contactsId = contacts.getContactsId(); + //工作组成员联系人 + List updateWorkingGroupSubItemContacts = new ArrayList<>(); + List workingGroupSubIdList = workingGroupSubItems.stream().map(PayWorkingGroupSubItem::getId).distinct().collect(Collectors.toList()); + List workingGroupSubItemContacts = workingGroupSubItemContactsMapper.listByWorkingGroupSubIdIn(workingGroupSubIdList); + for (PayWorkingGroupSubItemContacts contacts : workingGroupSubItemContacts) { + String contactsId = contacts.getContactsId(); - //更新临时表id - PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); - update.setId(contacts.getId()); - update.setContactsTemporaryId(contactsId); - updateWorkingGroupSubItemContacts.add(update); - } - workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); + //更新临时表id + PayWorkingGroupSubItemContacts update = new PayWorkingGroupSubItemContacts(); + update.setId(contacts.getId()); + update.setContactsTemporaryId(contactsId); + updateWorkingGroupSubItemContacts.add(update); + } + workingGroupSubItemContactsService.updateBatchById(updateWorkingGroupSubItemContacts); - //普通项目 - List updatePayCommonProjects = new ArrayList<>(); - List payCommonProjects = payCommonProjectMapper.listByYear(year); - for (PayCommonProject commonProject : payCommonProjects) { - String companyId = commonProject.getChargeCompanyId(); - String companyContactId = commonProject.getContactsId(); - String postContactId = commonProject.getMailContactsId(); + //普通项目 + List updatePayCommonProjects = new ArrayList<>(); + List payCommonProjects = payCommonProjectMapper.listByYear(year); + for (PayCommonProject commonProject : payCommonProjects) { + String companyId = commonProject.getChargeCompanyId(); + String companyContactId = commonProject.getContactsId(); + String postContactId = commonProject.getMailContactsId(); - //更新临时表id - PayCommonProject update = new PayCommonProject(); - update.setId(commonProject.getId()); - update.setChargeCompanyTemporaryId(companyId); - update.setContactsTemporaryId(companyContactId); - update.setMailContactsTemporaryId(postContactId); + //更新临时表id + PayCommonProject update = new PayCommonProject(); + update.setId(commonProject.getId()); + update.setChargeCompanyTemporaryId(companyId); + update.setContactsTemporaryId(companyContactId); + update.setMailContactsTemporaryId(postContactId); - updatePayCommonProjects.add(update); - } - commonProjectService.updateBatchById(updatePayCommonProjects); + updatePayCommonProjects.add(update); + } + commonProjectService.updateBatchById(updatePayCommonProjects); - //会员项目 - List updateMemberProjectSubitems = new ArrayList<>(); - List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); - for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { - String companyId = memberProjectSubitem.getCompanyId(); - String companyContactId = memberProjectSubitem.getCompanyContactId(); - String postContactId = memberProjectSubitem.getPostContactId(); + //会员项目 + List updateMemberProjectSubitems = new ArrayList<>(); + List memberProjectSubitems = payMemberProjectSubitemMapper.listByYear(year); + for (PayMemberProjectSubitem memberProjectSubitem : memberProjectSubitems) { + String companyId = memberProjectSubitem.getCompanyId(); + String companyContactId = memberProjectSubitem.getCompanyContactId(); + String postContactId = memberProjectSubitem.getPostContactId(); - //更新临时表id - PayMemberProjectSubitem update = new PayMemberProjectSubitem(); - update.setId(memberProjectSubitem.getId()); - update.setCompanyTemporaryId(companyId); - update.setCompanyContactTemporaryId(companyContactId); - update.setPostContactTemporaryId(postContactId); + //更新临时表id + PayMemberProjectSubitem update = new PayMemberProjectSubitem(); + update.setId(memberProjectSubitem.getId()); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); - updateMemberProjectSubitems.add(update); - } - memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); + updateMemberProjectSubitems.add(update); + } + memberProjectSubitemService.updateBatchById(updateMemberProjectSubitems); - //标协会员项目 - List updateTbMemberProjectSubitems = new ArrayList<>(); - List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); - for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { - String companyId = tbMemberProjectSubitem.getCompanyId(); - String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); - String postContactId = tbMemberProjectSubitem.getPostContactId(); - //更新临时表id - TbMemberProjectSubitem update = new TbMemberProjectSubitem(); - update.setId(tbMemberProjectSubitem.getId()); - update.setCompanyTemporaryId(companyId); - update.setCompanyContactTemporaryId(companyContactId); - update.setPostContactTemporaryId(postContactId); + //标协会员项目 + List updateTbMemberProjectSubitems = new ArrayList<>(); + List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.listByYear(year); + for (TbMemberProjectSubitem tbMemberProjectSubitem : tbMemberProjectSubitems) { + String companyId = tbMemberProjectSubitem.getCompanyId(); + String companyContactId = tbMemberProjectSubitem.getLiaisonManId(); + String postContactId = tbMemberProjectSubitem.getPostContactId(); + //更新临时表id + TbMemberProjectSubitem update = new TbMemberProjectSubitem(); + update.setId(tbMemberProjectSubitem.getId()); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + update.setPostContactTemporaryId(postContactId); - updateTbMemberProjectSubitems.add(update); - } - tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); + updateTbMemberProjectSubitems.add(update); + } + tbMemberProjectSubitemService.updateBatchById(updateTbMemberProjectSubitems); - //打包项目 - List updatePackCompanyList = new ArrayList<>(); - List packCompanyList = packCompanyMapper.listByYear(year); - for (PayPackCompany packCompany : packCompanyList) { - String companyId = packCompany.getCompanyId(); - String companyContactId = packCompany.getCompanyContactId(); - String postContactId = packCompany.getMailContactsId(); + //打包项目 + List updatePackCompanyList = new ArrayList<>(); + List packCompanyList = packCompanyMapper.listByYear(year); + for (PayPackCompany packCompany : packCompanyList) { + String companyId = packCompany.getCompanyId(); + String companyContactId = packCompany.getCompanyContactId(); + String postContactId = packCompany.getMailContactsId(); - //更新临时表id - PayPackCompany update = new PayPackCompany(); - update.setId(packCompany.getId()); - update.setMailContactsId(postContactId); - update.setCompanyTemporaryId(companyId); - update.setCompanyContactTemporaryId(companyContactId); - updatePackCompanyList.add(update); - } - packCompanyService.updateBatchById(updatePackCompanyList); + //更新临时表id + PayPackCompany update = new PayPackCompany(); + update.setId(packCompany.getId()); + update.setMailContactsId(postContactId); + update.setCompanyTemporaryId(companyId); + update.setCompanyContactTemporaryId(companyContactId); + updatePackCompanyList.add(update); + } + packCompanyService.updateBatchById(updatePackCompanyList); + return ""; + }); } From 55ebacca4aa4491dec5a92609190e0d32f23cf43 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 18:14:44 +0800 Subject: [PATCH 090/111] =?UTF-8?q?fix=2087908=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE--=E6=9C=AA=E5=B0=81=E9=94=81=E7=9A=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E4=BC=81=E4=B8=9A=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=B2=A1=E6=9B=B4=E6=96=B0=2087913=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B0=81=E9=94=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=81=9A=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayCompanyManagementServiceImpl.java | 57 +++++++++++++------ .../mapper/PayMeetingSituationMapper.java | 8 +++ .../mapper/xml/PayMeetingSituationMapper.xml | 15 +++++ .../pack/mapper/PayPackCompanyMapper.java | 3 +- .../pack/mapper/xml/PayPackCompanyMapper.xml | 10 ++++ 5 files changed, 76 insertions(+), 17 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index b4d082d1..5d64fd0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -32,6 +32,9 @@ import com.jero.company.vo.CompanyOrContactsCount; import com.jero.company.vo.UpdateInvoicePram; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.mapper.PayMeetingSituationMapper; +import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.TbMemberProjectSubitemMapper; @@ -40,6 +43,7 @@ import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.mapper.PayPackCompanyMapper; import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -103,7 +107,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updatePayContactsManagement = new LambdaUpdateWrapper<>(); - updatePayContactsManagement.eq(PayContactsManagement::getCompanyId,payCompanyManagement.getId()); + updatePayContactsManagement.eq(PayContactsManagement::getCompanyId, companyManagementId); updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payCompanyManagement.getCompanyName()); payContactsManagementService.update(updatePayContactsManagement); List allYear = annualDataLockingService.getAllYear(); @@ -763,7 +775,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl companyTemporaryIdList = new ArrayList<>(); // 更新普通项目 LambdaQueryWrapper quaryPayCommonProject = new LambdaQueryWrapper<>(); - quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId()); + quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId, companyManagementId); quaryPayCommonProject.notIn(PayCommonProject::getYear,allYear); @@ -781,7 +793,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryPayWorkingGroupSubItem = new QueryWrapper<>(); queryPayWorkingGroupSubItem.notIn("pwg.year",allYear); - queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()); + queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId, companyManagementId); List workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem); List collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList()); @@ -793,11 +805,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl meetingSituations = meetingSituationMapper.listByYearNotIn(allYear,companyManagementId); + List collect4 = meetingSituations.stream().map(PayMeetingSituation::getCompanyTemporaryId).collect(Collectors.toList()); + List idList4 = meetingSituations.stream().map(PayMeetingSituation::getId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect4); + if (!idList4.isEmpty()){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayMeetingSituation::getId,idList4); + updateWrapper.set(PayMeetingSituation::getCompanyName,payCompanyManagement.getCompanyName()); + meetingSituationService.update(updateWrapper); + } // 更新会员 QueryWrapper queryPayMemberProjectSubitem = new QueryWrapper<>(); queryPayMemberProjectSubitem.notIn("pmp.particular_year",allYear) ; - queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId, companyManagementId); List payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem); List collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); @@ -812,7 +834,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryTbMemberProjectSubitem = new QueryWrapper<>(); queryTbMemberProjectSubitem.notIn("tmp.year",allYear); - queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId, companyManagementId); List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.queryListCompanyYear(queryTbMemberProjectSubitem); List collect3 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); @@ -824,6 +846,17 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl packCompanyList = packCompanyMapper.listByYearNotIn(allYear,companyManagementId); + List collect5 = packCompanyList.stream().map(PayPackCompany::getCompanyTemporaryId).collect(Collectors.toList()); + List idList6 = packCompanyList.stream().map(PayPackCompany::getId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect5); + if (!idList6.isEmpty()){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayPackCompany::getId,idList6); + updateWrapper.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName()); + packCompanyService.update(updateWrapper); + } // 更新临时数据 if (!companyTemporaryIdList.isEmpty()) { LambdaUpdateWrapper updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>(); @@ -846,19 +879,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updatePayIncomeContract = new LambdaUpdateWrapper<>(); - updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId()); + updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId, companyManagementId); //updatePayIncomeContract.ge(PayIncomeContract::getCreateTime,payCompanyManagement.getEditTime()); updatePayIncomeContract.exists(" select 1 from pay_company_management_temporary where " + "pay_income_contract.signed_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); updatePayIncomeContract.set(PayIncomeContract::getSignedCompanyTemporaryName,payCompanyManagement.getCompanyName()); payIncomeContractService.update(updatePayIncomeContract); - // 更新打包 - LambdaUpdateWrapper updatePayPackCompany = new LambdaUpdateWrapper<>(); - updatePayPackCompany.eq(PayPackCompany::getCompanyId,payCompanyManagement.getId()); - //updatePayPackCompany.ge(PayPackCompany::getCreateTime,payCompanyManagement.getEditTime()); - updatePayPackCompany.exists(" select 1 from pay_company_management_temporary where " + - "pay_pack_company.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); - updatePayPackCompany.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName()); - payPackCompanyService.update(updatePayPackCompany); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java index bdc956de..3dafee03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java @@ -45,4 +45,12 @@ public interface PayMeetingSituationMapper extends BaseMapper listByYear(@Param("year")String year); + /** + * 根据年份获取参会人 + * + * @param yearList 年份 + * @param companyManagementId + */ + List listByYearNotIn(@Param("yearList") List yearList, @Param("companyManagementId") String companyManagementId); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index f87edeed..c010b4d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -259,4 +259,19 @@ meeting_id in (select id from pay_meeting where particular_year = #{year}) + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java index 44cb16d9..61b2f578 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.pack.entity.PayPackCompany; -import com.jero.pack.vo.PayPackCompanyProjectInput; import com.jero.project.entity.PayCommonProject; import org.apache.ibatis.annotations.Param; @@ -58,4 +57,6 @@ public interface PayPackCompanyMapper extends BaseMapper { String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany); List listByYear(@Param("year") String year); + + List listByYearNotIn(@Param("yearList") List yearList, @Param("companyManagementId") String companyManagementId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index 92871515..91006f04 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -113,4 +113,14 @@ select * from pay_pack_company where pack_year = #{year} + + \ No newline at end of file From 1a7781f42c841692e63be90ed377fa25a47916e8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 18:30:52 +0800 Subject: [PATCH 091/111] =?UTF-8?q?fix=2087907=20=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E9=A1=B9=E7=9B=AE-=E6=88=90=E5=91=98-=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E5=90=8E=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5--=E4=BC=81=E4=B8=9A=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=BA=94=E8=AF=A5=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=2087910=20=E6=89=80=E6=9C=89=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE-=E5=B7=B2=E5=B0=81=E9=94=81=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8D=B4=E6=9B=B4=E6=96=B0=E4=BA=86=2087912=20?= =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98&=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=B4=E6=8A=A4-=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5--=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 2 +- .../PayDraftingGroupSubItemServiceImpl.java | 8 +++--- .../IPayMemberProjectSubitemService.java | 18 ++++++------- .../impl/PayPackCompanyServiceImpl.java | 6 ++--- .../impl/PayCommonProjectServiceImpl.java | 10 +++---- .../PayWorkingGroupSubItemServiceImpl.java | 10 +++---- ...yCompanyManagementTemporaryController.java | 26 +------------------ ...ContactsManagementTemporaryController.java | 26 ------------------- 8 files changed, 28 insertions(+), 78 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index deb9f6b7..4ce2e099 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -982,7 +982,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl subItemContacts = payDraftingGroupSubItemContactsMapper.getSubItemContacts(id); List temporaryIds = subItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(temporaryIds); + // paycontactsManagementTemporaryService.removeByIds(temporaryIds); } /** @@ -445,7 +445,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl list = payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList().stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(list); + // paycontactsManagementTemporaryService.removeByIds(list); } // 删除联系人记录 LambdaUpdateWrapper updatePayDraftingGroupSubItemContacts = new LambdaUpdateWrapper<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index f2eeb707..e59fbb62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -323,7 +323,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl update = new LambdaUpdateWrapper<>(); update.eq(PayPackCompanyProject::getProjectId,payMemberProjectSubitem.getId()); - payPackCompanyProjectService.remove(update); + //payPackCompanyProjectService.remove(update); // 删除企业联系人临时数据 - companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId()); - contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId())); + //companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId()); + // contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId())); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index 8c0ff914..64a81c7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -206,7 +206,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl subItemContacts = payWorkingGroupSubItemContactsMapper.getSubItemContacts(id); List temporaryIds = subItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(temporaryIds); + // paycontactsManagementTemporaryService.removeByIds(temporaryIds); } /** @@ -1466,7 +1466,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl list = payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList().stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - payContactsManagementTemporaryService.removeByIds(list); + // paycontactsManagementTemporaryService.removeByIds(list); } // 删除联系人记录 LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); @@ -1501,7 +1501,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl delete(@RequestParam(name="id",required=true) String id) { - payCompanyManagementTemporaryService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @ApiOperation(value="pay_company_management_temporary-批量删除", notes="pay_company_management_temporary-批量删除") -// @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + /** * 通过id查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java index e9cb68c7..78541d1d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java @@ -80,32 +80,6 @@ public class PayContactsManagementTemporaryController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - payContactsManagementTemporaryService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @ApiOperation(value="pay_contacts_management_temporary-批量删除", notes="pay_contacts_management_temporary-批量删除") -// @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - /** * 通过id查询 * From a656925b2c1bba3a33584a808744414967d5d311 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 09:42:05 +0800 Subject: [PATCH 092/111] =?UTF-8?q?fix=2087900=20=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1--=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE--=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/PayWorkingGroupMapper.java | 1 + .../mapper/xml/PayWorkingGroupMapper.xml | 136 ++++++++++++++++++ .../service/IPayWorkingGroupService.java | 2 + .../impl/PayWorkingGroupServiceImpl.java | 7 + .../AllProjectStatisticsController.java | 2 +- 5 files changed, 147 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 15f2390b..80ec6de9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -278,4 +278,5 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListForCompanyClassification(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch); + List queryPageListExcelForProject(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 832fa9c9..649182ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2706,4 +2706,140 @@ group by chargeCompanyId,year,chargeUse + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 85a1d341..872ff7bc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -269,4 +269,6 @@ public interface IPayWorkingGroupService extends IService { void exportAllFile(HttpServletRequest request, HttpServletResponse response, PayWorkingGroup payWorkingGroup); List queryPageListForCompanyClassification(CompanyComeMoneySearch companyComeMoneySearch); + + List queryPageListExcelForProject(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 0322ab55..302f7fbf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -609,6 +609,13 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl idList) { return payWorkingGroupMapper.queryPageListProjectTotal(allProjectStatisticsSearch, idList); } + /** + * 科室统计excel + */ + @Override + public List queryPageListExcelForProject(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList) { + return payWorkingGroupMapper.queryPageListExcelForProject(allProjectStatisticsSearch, idList); + } @Override public AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch,List idList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 1259acd4..f92744f6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -239,7 +239,7 @@ public class AllProjectStatisticsController { return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "科室统计"); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); + List pageList = payWorkingGroupService.queryPageListExcelForProject(allProjectStatisticsSearch, idList); if (pageList != null) { for (AllProjectStatistics s : pageList) { String key = String.valueOf(s.getChargeUse()); From 021843e983e56a6ded22bb73bdd4b6c69307b508 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 09:56:19 +0800 Subject: [PATCH 093/111] =?UTF-8?q?fix=2087891=20=E5=85=A8=E6=89=80?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1--=E4=B8=AA=E5=88=AB=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=B4=9F=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllProjectStatisticsController.java | 5 +++-- .../com/jero/modules/system/mapper/SysUserMapper.java | 9 +++++++++ .../com/jero/modules/system/mapper/xml/SysUserMapper.xml | 8 ++++++++ .../com/jero/modules/system/service/ISysUserService.java | 2 ++ .../modules/system/service/impl/SysUserServiceImpl.java | 7 +++++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index f92744f6..88422acb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -12,6 +12,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.mail.commont.constant; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; import com.jero.project.service.IPayWorkingGroupService; @@ -264,8 +265,8 @@ public class AllProjectStatisticsController { queryWrapper.eq("org_code", departCode); queryWrapper.eq("del_flag", 0); queryWrapper.eq("status", 1); - List pageList = sysUserService.list(queryWrapper); - return Result.OK(pageList); + List sysUserSysDepartModels = sysUserService.listUserByOrgCode(departCode); + return Result.OK(sysUserSysDepartModels); } /** diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 0b3dd6b8..4f5d78bd 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -102,6 +102,14 @@ public interface SysUserMapper extends BaseMapper { * @return */ List getUserByOrgCode(IPage page, @Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); +/** + * 根据 orgCode 查询用户，包括子部门下的用户 + * + * @param orgCode + * @param userParams 用户查询条件，可为空 + * @return + */ + List getUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); /** @@ -171,4 +179,5 @@ public interface SysUserMapper extends BaseMapper { void forgetPassword(@Param("user") SysUser user); + List listUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 79e6adee..69b32cd9 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -217,4 +217,12 @@ select * from pay_manager_management where phone = #{username} and del_flag = 0; + + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 1b214713..c1b5f17b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -140,6 +140,8 @@ public interface ISysUserService extends IService { */ IPage queryUserByOrgCode(String orgCode, SysUser userParams, IPage page); + List listUserByOrgCode(String orgCode); + /** * 根据角色Id查询 * @param diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 3e445400..ab7e8e66 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -331,6 +331,13 @@ public class SysUserServiceImpl extends ServiceImpl impl return result; } + @Override + public List listUserByOrgCode(String orgCode) { + List list = baseMapper.listUserByOrgCode(orgCode, null); + + return list; + } + // 根据角色Id查询 @Override public IPage getUserByRoleId(Page page, String roleId, String username) { From 98d92596e7c4b2ce2b68cbf73602296a1b9bcb62 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 11:53:05 +0800 Subject: [PATCH 094/111] =?UTF-8?q?fix=2087901=20=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1--=E4=B8=AA=E5=88=AB=E4=B8=BA0=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE--=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/CommonConstant.java | 2 + .../mapper/xml/PayWorkingGroupMapper.xml | 2 +- .../AllProjectStatisticsController.java | 84 ++++++++++++++----- .../CompanyComeMoneyStatisticsController.java | 47 +++++++---- .../PayWorkingGroupStatisticsController.java | 45 +++++++--- .../PrincipalPeopleStatisticsController.java | 40 +++++++-- 6 files changed, 163 insertions(+), 57 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index a5879845..9770c289 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -309,4 +309,6 @@ public interface CommonConstant { * 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用 */ public final static String THIRD_LOGIN_CODE = "third_login_code"; + + public final static String ZERO = "0.00"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 649182ca..916556c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2354,7 +2354,7 @@ order by bill_date - + - SELECT + select * from + (SELECT principalNameId as principalId, principalName, chargeCompanyTemporaryName, @@ -202,17 +203,37 @@ - AND pack = #{payWorkingGroupSubletSearch.pack} - group by id + group by id) p + + + order by allMoney desc + + + order by comeAllMoney desc + + + order by billMoney desc + + + order by confirmAmount desc + + + order by confirmAmount + + + order by allMoney + + + order by comeAllMoney + + + order by billMoney + + From 3dd1bf8e05ea49e0c96a5ade3734806816dc3004 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 14:47:57 +0800 Subject: [PATCH 105/111] =?UTF-8?q?fix=2087992=20=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E7=BB=9F=E8=AE=A1-=E5=AF=BC=E5=87=BA-?= =?UTF-8?q?=E6=9C=89=E4=BB=A5=E4=B8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/statistics/entity/PrincipalPeopleList.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java index 8f508430..076888a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java @@ -14,6 +14,10 @@ public class PrincipalPeopleList { @ApiModelProperty(value = "项目负责人id") private String principalId; + @Excel(name = "项目负责人", width = 15) + @ApiModelProperty(value = "项目负责人") + private String principalName; + @Excel(name = "年度待确收金额", width = 15) @DecimalMax(value = "9999999999.99",message = "合同金额（元）格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) @@ -38,7 +42,4 @@ public class PrincipalPeopleList { @ApiModelProperty(value = "个人完成率") private String finishRate; - @Excel(name = "项目负责人", width = 15) - @ApiModelProperty(value = "项目负责人") - private String principalName; } From a7cc8e3f542631b4c198461d5a904db9e2dcf58b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 14:49:59 +0800 Subject: [PATCH 106/111] =?UTF-8?q?fix=2087993=20=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E7=BB=9F=E8=AE=A1=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA-=E6=9C=89=E4=BB=A5=E4=B8=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PrincipalPeopleDetail.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java index 3f5ebb4b..1005528f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java @@ -16,13 +16,20 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "项目id") private String id; + @Excel(name = "来款项目", width = 15) + @ApiModelProperty(value = "来款项目") + private String projectName; + @Excel(name = "来款企业", width = 15) @ApiModelProperty(value = "来款企业") private String chargeCompanyTemporaryName; - @Excel(name = "来款项目", width = 15) - @ApiModelProperty(value = "来款项目") - private String projectName; + @ApiModelProperty(value = "打包") + private Integer pack; + + @Excel(name = "是否打包", width = 15) + @ApiModelProperty(value = "打包") + private String packText; @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") @@ -40,13 +47,6 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "到账金额") private String comeAllMoney; - @ApiModelProperty(value = "打包") - private Integer pack; - - @Excel(name = "打包", width = 15) - @ApiModelProperty(value = "打包") - private String packText; - @ApiModelProperty(value = "来款用途编码") private String chargeUse; From 2080423a2926dd790c71d04594d2f098cf1cac54 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 14:53:38 +0800 Subject: [PATCH 107/111] =?UTF-8?q?fix=2088024=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9D=A5=E6=AC=BE=E3=80=81=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E3=80=81=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E9=83=BD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=90=8E--=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index 91006f04..e6601c7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -29,7 +29,6 @@ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java index 6d6e83be..01f8931b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetailSearch.java @@ -52,4 +52,7 @@ public class CompanyComeMoneyDetailSearch { @ApiModelProperty(value = "排序规则") private String order; + + @ApiModelProperty(value = "打包") + private String pack; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java index 9b310b31..dac48b9d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetailSearch.java @@ -53,4 +53,7 @@ public class PrincipalPeopleDetailSearch { @ApiModelProperty(value = "排序规则") private String order; + @ApiModelProperty(value = "打包") + private String pack; + } From 2cb8f2d239bbc1f6fbc8928f61575fa14d271041 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 16:51:21 +0800 Subject: [PATCH 109/111] =?UTF-8?q?update=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=88=90=E5=91=98=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/entity/TbMemberProjectSubitem.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 2c05e828..e3aac268 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -113,6 +113,27 @@ public class TbMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "联系人") private String liaisonMan; + /**邮箱*/ + @Excel(name = "联系人邮箱", width = 20,exportConvert = true) + @ApiModelProperty(value = "邮箱") + private String email; + + /**手机*/ + @Excel(name = "联系人手机", width = 15,exportConvert = true) + @ApiModelProperty(value = "手机") + private String mobile; + + /**通讯地址*/ + @Excel(name = "联系人通讯地址", width = 15) + @ApiModelProperty(value = "通讯地址") + @TableField(exist = false) + private String contactAddress; + /**邮政编码*/ + @Excel(name = "联系人邮政编码", width = 15) + @ApiModelProperty(value = "邮政编码") + @TableField(exist = false) + private String postalCode; + @ApiModelProperty(value = "邮寄企业id") private String postCompanyId; @@ -125,27 +146,6 @@ public class TbMemberProjectSubitem implements Serializable { */ private String postContactTemporaryId; - /**邮箱*/ - @Excel(name = "邮箱", width = 20,exportConvert = true) - @ApiModelProperty(value = "邮箱") - private String email; - - /**手机*/ - @Excel(name = "手机", width = 15,exportConvert = true) - @ApiModelProperty(value = "手机") - private String mobile; - - /**通讯地址*/ - @Excel(name = "通讯地址", width = 15) - @ApiModelProperty(value = "通讯地址") - @TableField(exist = false) - private String contactAddress; - /**邮政编码*/ - @Excel(name = "邮政编码", width = 15) - @ApiModelProperty(value = "邮政编码") - @TableField(exist = false) - private String postalCode; - /**会员状态*/ //@Excel(name = "会员状态", width = 15, dicCode = "member_status") @ApiModelProperty(value = "会员状态") From a2ed63a37ca3edf592e883a353d65cc641291e14 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 18:04:41 +0800 Subject: [PATCH 110/111] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/service/AnnualDataLockingService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java index 49b04f84..de3eed62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/AnnualDataLockingService.java @@ -414,6 +414,9 @@ public class AnnualDataLockingService extends ServiceImpl Date: Mon, 5 Aug 2024 09:24:45 +0800 Subject: [PATCH 111/111] =?UTF-8?q?fix=20=E6=A0=87=E5=8D=8F=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/ITbMemberProjectSubitemService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index ee6572f3..2774ad6e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -613,11 +613,18 @@ public class ITbMemberProjectSubitemService extends ServiceImpl generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){ - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); + Map parameterMap = request.getParameterMap(); + String[] strings = parameterMap.get("companyName"); + parameterMap.remove("companyName"); + tbMemberProjectSubitem.setCompanyName(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, parameterMap); String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); String estimatedArrivalDateBegin = tbMemberProjectSubitem.getEstimatedArrivalDate_begin(); String estimatedArrivalDateEnd = tbMemberProjectSubitem.getEstimatedArrivalDate_end(); + if (strings != null){ + queryWrapper.like("pcm.company_name",strings[0]); + } if (StringUtils.isNotBlank(invalidationDateStr)){ DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); queryWrapper.eq("year(invalidation_date)",invalidationDate.year());