fix: 82958 打包管理--点击项目--点击打包--所有项目的确收标识都没显示

2024-03-22 16:30:00 +08:00
parent 1450e32063
commit cd2d8f4842
3 changed files with 8 additions and 3 deletions
@@ -164,7 +164,7 @@
    <select id="queryPackListAll" resultType="com.jero.project.entity.PayCommonProject">
        SELECT * FROM (
        <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_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,c.contacts_temporary_name
+        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_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,c.contacts_temporary_name,c.affirm_income
        from pay_common_project c
        left join sys_user su on c.principal_id = su.id
        <where>
@@ -190,6 +190,7 @@
        <!--工作组项目-->
        UNION ALL
        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,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,gsubc.contacts_temporary_name as contacts_temporary_name_one
+        ,gsub.affirm_income
        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
@@ -217,6 +218,7 @@
        <!-- 会议项目-->
        UNION ALL
        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,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,sit.company_contact_name
+        ,sit.affirm_income
        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
@@ -244,6 +246,7 @@
        <!-- 会员项目-->
        UNION ALL
        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id, su.realname,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,msub.company_contact_name
+        ,msub.affirm_income
        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
@@ -270,6 +273,7 @@
        <!-- 标协会员项目-->
        UNION ALL
        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id, su.realname,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,tmsub.liaison_man
+        ,tmsub.affirm_income
        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
@@ -297,6 +301,7 @@
        <!-- 标协会员项目-->
        UNION ALL
        select tcp.id,tmember.project_name,tcp.charge_use,tmember.director_id, su.realname,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,tcp.liaison_man
+        ,tcp.affirm_income
        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
@@ -623,8 +623,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 public Result<?> editAccount(@RequestParam(name = "workGroupId") String workGroupId,
 								  @RequestParam(name = "companyId") String companyId,
 								  @RequestParam(name = "id") String id) {
-		 payWorkingGroupSubItemService.editAccount(workGroupId, companyId);
 		 payWorkingGroupSubItemService.delete(id);
+		 payWorkingGroupSubItemService.editAccount(workGroupId, companyId);
 		 return Result.OK("调账成功!");
 	 }