LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作组变更

Browse Source
This commit is contained in:
梁琦涛
2022-04-25 14:08:24 +08:00
parent 5130bb8003
commit 7a17217ea3
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/2022-1-4变更.sql
+5
View File
@@ -191,3 +191,8 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com
-- 2022-04-24 收入合同+支出合同查询邮寄详情按钮权限
INSERT INTO `income_payments`.`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`) VALUES ('1518071675121545217', '1433250634957398018', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'revenueContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:37:46', NULL, NULL, 0, 0, '1', 0);
INSERT INTO `income_payments`.`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`) VALUES ('1518071807695106050', '1435135348211298306', '查看邮寄详情', NULL, NULL, NULL, NULL, 2, 'expenditureContract:mailDetail', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-24 11:38:18', NULL, NULL, 0, 0, '1', 0);
-- 2022-04-25 工作组成员单位3个联系人修改成多个联系人变更
insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_one,contacts_temporary_id_one,contacts_temporary_name_one,remarks_one,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_one is not null and contacts_id_one !='');
insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_two,contacts_temporary_id_two,contacts_temporary_name_two,remarks_two,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_two is not null and contacts_id_two !='');
insert into pay_working_group_subitem_contacts(id,working_group_id,working_group_sub_id,contacts_id,contacts_temporary_id,contacts_temporary_name,remarks,order_num,create_by,create_time) (select MD5(UUID()),working_group_id,id,contacts_id_three,contacts_temporary_id_three,contacts_temporary_name_three,remarks_three,1,create_by,create_time FROM pay_working_group_subitem where contacts_id_three is not null and contacts_id_three !='');
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+2 -1
View File
@@ -140,10 +140,11 @@
pwgs.receivable_amount AS receivableAmount,
pwgs.paid_amount AS paidAmount,
su.realname AS principalName,
pwgs.contacts_temporary_name_one AS contactsName,
pwgsc.contacts_temporary_name AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN pay_working_group_subitem pwgs ON pica.project_id = pwgs.id
LEFT JOIN pay_working_group_subitem_contacts pwgsc ON pwgsc.working_group_sub_id = pwgs.id and order_num = 1
LEFT JOIN pay_working_group pwg ON pwgs.working_group_id = pwg.id
left join sys_user su on pwg.principal_id_a = su.id
WHERE pica.contract_id = #{contractId}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+6
View File
@@ -150,7 +150,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum));
workingGroupSubItem.setContactsTemporaryNameOne(pwg.get(0).getContactsTemporaryName());
workingGroupSubItem.setPayWorkingGroupSubItemContactsList(pwg);
}else{
workingGroupSubItem.setContactsTemporaryNameOne("");
workingGroupSubItem.setPayWorkingGroupSubItemContactsList(null);
}
}else{
workingGroupSubItem.setContactsTemporaryNameOne("");
workingGroupSubItem.setPayWorkingGroupSubItemContactsList(null);
}
}
}