开票

2021-09-22 15:45:33 +08:00
parent 4d5d29a050
commit 0b0410442f
3 changed files with 49 additions and 33 deletions
@@ -80,14 +80,18 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "快递单号", width = 15)
    @ApiModelProperty(value = "快递单号")
    private java.lang.String postNo;
-	/**联系人*/
-	@Excel(name = "联系人", width = 15)
-    @ApiModelProperty(value = "联系人")
-    private java.lang.String liaisonMan;
+	/**联系人id*/
+	@Excel(name = "联系人id", width = 15)
+    @ApiModelProperty(value = "联系人id")
+    private java.lang.String contactId;
+	/**联系人名字*/
+	@Excel(name = "联系人名字", width = 15)
+    @ApiModelProperty(value = "联系人名字")
+    private java.lang.String contactName;
 	/**联系人手机号*/
 	@Excel(name = "联系人手机号", width = 15)
    @ApiModelProperty(value = "联系人手机号")
-    private java.lang.String mobile;
+    private java.lang.String contactMobile;
 	/**开票时间*/
 	@Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -129,5 +133,14 @@ public class PayMailBill implements Serializable {
    @NotNull(message = "项目负责人id不能为空")
    @ApiModelProperty(value = "项目负责人id")
    private java.lang.String principalId;
-
+    /**邮政编码*/
+    @Excel(name = "邮政编码", width = 15)
+    @ApiModelProperty(value = "邮政编码")
+    @NotNull(message = "邮政编码")
+    private java.lang.String postalCode;
+    /**通讯地址*/
+    @Excel(name = "通讯地址", width = 15)
+    @ApiModelProperty(value = "通讯地址")
+    @NotNull(message = "通讯地址")
+    private java.lang.String contactAddress;
 }
@@ -8,6 +8,8 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
+import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.mapper.PayContactsManagementMapper;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.BillingInfo;
@@ -66,9 +68,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
    @Resource
    private TbMemberProjectMapper tbMemberProjectMapper;
    @Resource
-    private PayMailBillMapper payMailBillMapper;
-    @Resource
-    private PayMailBillProjectMapper payMailBillProjectMapper;
+    private PayContactsManagementMapper payContactsManagementMapper;

    @Override
    public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -122,22 +122,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
            }

        }
-
        //新增票据邮寄表
-        payMailBillService.save(payMailBill);
-
-//        for (int i = 0; i < bmpList.size(); i++) {
-//            //新增票据关联项目表
-//            PayMailBillProject payMailBillProject = new PayMailBillProject();
-//            payMailBillProject.setBillId(payMailBill.getId());
-//            payMailBillProject.setProjectId(bmpList.get(i).getId());
-//            payMailBillProject.setProjectType(bmpList.get(i).getProjectType());
-//            payMailBillProject.setInvoiceAmount(bmpList.get(i).getInvoiceAmount());
-//            payMailBillProjectService.save(payMailBillProject);
-//
-////            更新项目表开票状态
-//            getMakeInvoice(payMailBillProject);
-//        }
+        payMailBillInsert(payMailBill);

        for(PayMailBillProject bmp : bmpList){
            bmp.setBillId(payMailBill.getId());
@@ -207,7 +193,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
        payMailBill.setChargeCompanyName(tbMember.getCompanyName());
        payMailBill.setInvoiceAmount(amountReceivable);
        payMailBill.setPostStatus(1);
-        payMailBill.setMobile(PasswordUtil.decrypt(payMailBill.getMobile()));
+        payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
        payMailBill.setBillDate(payMailBill.getSendDate());
        payMailBillService.save(payMailBill);
        //添加关联关系
@@ -345,6 +331,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
        return "success";
    }

+    /**
+     * 新增票据邮寄表
+     */
+    private void payMailBillInsert(PayMailBillVO payMailBill){
+
+        PayContactsManagement contact= payContactsManagementMapper.selectById(payMailBill.getContactId());
+        payMailBill.setContactName(contact.getName());
+        payMailBill.setContactMobile(contact.getPhone());
+
+        //邮政编码是空代表单个开票，联系人信息需要自己查
+        if(StringUtils.isBlank(payMailBill.getPostalCode())){
+            payMailBill.setPostalCode(contact.getPostalCode());
+            payMailBill.setContactAddress(contact.getContactAddress());
+        }
+        payMailBillService.save(payMailBill);
+    }
+
    /**
     * 更新项目表开票状态
     * @return
@@ -4,10 +4,10 @@

 <!--    到账开票主列表-->
    <select id="mainList" resultType="com.jero.project.entity.PayCommonProject">
-        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_id,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.invoice_amount
+        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_id,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.invoice_amount,p.mail_contacts_id
        from
        (<!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.charge_company_id,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.invoice_amount
+        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.charge_company_id,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.invoice_amount,c.mail_contacts_id
        from pay_common_project c
        where
        c.receivable_amount <![CDATA[<>]]> 0
@@ -23,9 +23,9 @@
        </if>
        <!--工作组项目-->
        UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.charge_company_id,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,gsub.invoice_amount
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.charge_company_id,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,gsub.invoice_amount,gsub.mail_contacts_id
        from pay_working_group g
-        inner join pay_working_group_subitem gsub on g.id = gsub.charge_company_id
+        inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
        where
        gsub.receivable_amount <![CDATA[<>]]> 0
        and gsub.receivable_amount is not null
@@ -40,7 +40,7 @@
        </if>
        <!-- 会议项目-->
        UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_id,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.invoice_amount
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_id,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.invoice_amount,sit.post_contact_id
        from pay_meeting meeting
        inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
        where
@@ -57,7 +57,7 @@
        </if>
        <!-- 会员项目-->
        UNION ALL
-        select msub.id,member.project_name,msub.charge_use,member.director_id,member.director_name,msub.company_id,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.invoice_amount
+        select msub.id,member.project_name,msub.charge_use,member.director_id,member.director_name,msub.company_id,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.invoice_amount,msub.post_contact_id
        from pay_member_project member
        inner join pay_member_project_subitem msub on member.id=msub.project_id
        where
@@ -74,7 +74,7 @@
        </if>
        <!-- 标协会员项目-->
        UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,'空','空',tmsub.company_id,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.invoice_amount
+        select tmsub.id,tmember.project_name,tmsub.charge_use,'空','空',tmsub.company_id,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.invoice_amount,tmsub.liaison_man_id
        from tb_member_project tmember
        inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
        where
@@ -125,7 +125,7 @@
        UNION ALL
        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,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
        from pay_working_group g
-        inner join pay_working_group_subitem gsub on g.id = gsub.charge_company_id
+        inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
        where
        gsub.receivable_amount <![CDATA[<>]]> 0
        and gsub.receivable_amount is not null