diff --git a/db/统计视图.sql b/db/统计视图.sql index 881f8852..780338f5 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -1,177 +1,186 @@ create view v_statistical as - select pp.id as projectId, - pp.superId, - pp.projectName, - principalName, - chargeCompanyId, - chargeCompanyTemporaryId, - chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - chargeUse, - depart, - createTime, - if(pp.pack = 0, '否', '是') as packText, - year, - payStatue, - departCode, - principalNameId, - type, - billMoney, - confirmAmount, - pp.pack - from (SELECT pwgs.id, - pwg.id as superId, - pwg.working_group_project AS projectName, - pwg.principal_name_a as principalName, - pwgs.charge_company_id AS chargeCompanyId, - pwgs.charge_company_temporary_id as chargeCompanyTemporaryId, - pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, - pwgs.receivable_amount as allMoney, - pwgs.paid_amount as comeAllMoney, - pwgs.charge_use as chargeUse, - sd.depart_name as depart, - pwgs.pack as pack, - pwg.year as year, - pwgs.in_account as payStatue, - su.org_code as departCode, - pwg.principal_id_a as principalNameId, - 2 as type, - pwgs.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - pwgs.create_time as createTime - FROM pay_working_group pwg - right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) - left JOIN sys_user su on (pwg.principal_id_a = su.id) - left join sys_depart sd on (su.org_code = sd.org_code) - 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.receivable_amount as allMoney, - pcp.paid_amount as comeAllMoney, - pcp.charge_use as chargeUse, - sd.depart_name as depart, - pcp.pack as pack, - pcp.year as year, - pcp.in_account as payStatue, - su.org_code as departCode, - pcp.principal_id as principalNameId, - 1 as type, - pcp.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - 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.org_code = sd.org_code) - union all - SELECT pmps.id, - pmp.id as superId, - pmp.project_name AS projectName, - su.realname as principalName, - pmps.company_id AS chargeCompanyId, - pmps.company_id as chargeCompanyTemporaryId, - pmps.company_name AS chargeCompanyTemporaryName, - pmps.amount_receivable as allMoney, - pmps.paid_amount as comeAllMoney, - pmps.charge_use as chargeUse, - sd.depart_name as depart, - pmps.pack as pack, - pmp.particular_year as year, - pmps.in_account as payStatue, - su.org_code as departCode, - pmp.director_id as principalNameId, - 4 as type, - pmps.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - pmps.create_time as createTime - FROM pay_member_project pmp - right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) - left JOIN sys_user su on (pmp.director_id = su.id) - left join sys_depart sd on (su.org_code = sd.org_code) - union all - SELECT pms.id, - pm.id as superId, - pm.meeting_name AS projectName, - su.realname as principalName, - pms.company_id AS chargeCompanyId, - pms.company_id as chargeCompanyTemporaryId, - pms.company_name AS chargeCompanyTemporaryName, - pms.amount_receivable as allMoney, - pms.paid_amount as comeAllMoney, - pms.charge_use as chargeUse, - sd.depart_name as depart, - pms.pack as pack, - pm.particular_year as year, - pms.in_account as payStatue, - su.org_code as departCode, - pm.director_id as principalNameId, - 3 as type, - pms.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - pms.create_time as createTime - FROM pay_meeting pm - right join pay_meeting_situation pms on (pm.id = pms.meeting_id) - left JOIN sys_user su on (pm.director_id = su.id) - left join sys_depart sd on (su.org_code = sd.org_code) - union all - SELECT tmps.id, - tmp.id as superId, - tmp.project_name AS projectName, - su.realname as principalName, - tmps.company_id AS chargeCompanyId, - tmps.company_id as chargeCompanyTemporaryId, - tmps.company_name AS chargeCompanyTemporaryName, - tmps.amount_receivable as allMoney, - tmps.paid_amount as comeAllMoney, - tmps.charge_use as chargeUse, - sd.depart_name as depart, - tmps.pack as pack, - tmp.year as year, - tmps.in_account as payStatue, - su.org_code as departCode, - tmp.director_id as principalNameId, - 5 as type, - tmps.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - tmps.create_time as createTime - FROM tb_member_project tmp - left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) - left JOIN sys_user su on (tmp.director_id = su.id) - left join sys_depart sd on (su.org_code = sd.org_code) - union all - SELECT tcp.id, - tmp.id as superId, - tmp.project_name AS projectName, - su.realname as principalName, - tcp.company_id AS chargeCompanyId, - tcp.company_id as chargeCompanyTemporaryId, - tcp.company_name AS chargeCompanyTemporaryName, - tcp.amount_receivable as allMoney, - tcp.paid_amount as comeAllMoney, - tcp.charge_use as chargeUse, - sd.depart_name as depart, - tcp.pack as pack, - tmp.year as year, - tcp.in_account as payStatue, - su.org_code as departCode, - tmp.director_id as principalNameId, - 6 as type, - tcp.invoice_amount AS billMoney, - confirm_amount as confirmAmount, - tcp.create_time as createTime - FROM tb_member_project tmp - left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) - left JOIN sys_user su on (tmp.director_id = su.id) - left join sys_depart sd on (su.org_code = sd.org_code) - ) pp - where pp.allMoney is not null - and pp.allMoney != 0 - order by pp.createTime; +select pp.id as projectId, + pp.superId, + pp.projectName, + principalName, + chargeCompanyId, + chargeCompanyTemporaryId, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + if(pp.pack = 0, '否', '是') as packText, + year, + payStatue, + departCode, + principalNameId, + type, + if(billMoney is null, 0, billMoney) as billMoney, + confirmAmount, + contactsName, + pp.pack +from (SELECT pwgs.id, + pwg.id as superId, + pwg.working_group_project AS projectName, + pwg.principal_name_a as principalName, + pwgs.charge_company_id AS chargeCompanyId, + pwgs.charge_company_temporary_id as chargeCompanyTemporaryId, + pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, + pwgs.receivable_amount as allMoney, + pwgs.paid_amount as comeAllMoney, + pwgs.charge_use as chargeUse, + sd.depart_name as depart, + pwgs.pack as pack, + pwg.year as year, + pwgs.in_account as payStatue, + su.org_code as departCode, + pwg.principal_id_a as principalNameId, + 2 as type, + pwgs.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + GROUP_CONCAT(pwgsc.contacts_temporary_name) as contactsName, + pwgs.create_time as createTime + FROM pay_working_group pwg + right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) + left JOIN sys_user su on (pwg.principal_id_a = su.id) + left join sys_depart sd on (su.org_code = sd.org_code) + left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id + 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.receivable_amount as allMoney, + pcp.paid_amount as comeAllMoney, + pcp.charge_use as chargeUse, + sd.depart_name as depart, + pcp.pack as pack, + pcp.year as year, + pcp.in_account as payStatue, + su.org_code as departCode, + pcp.principal_id as principalNameId, + 1 as type, + pcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + contacts_temporary_name as contactsName, + 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.org_code = sd.org_code) + union all + SELECT pmps.id, + pmp.id as superId, + pmp.project_name AS projectName, + su.realname as principalName, + pmps.company_id AS chargeCompanyId, + pmps.company_id as chargeCompanyTemporaryId, + pmps.company_name AS chargeCompanyTemporaryName, + pmps.amount_receivable as allMoney, + pmps.paid_amount as comeAllMoney, + pmps.charge_use as chargeUse, + sd.depart_name as depart, + pmps.pack as pack, + pmp.particular_year as year, + pmps.in_account as payStatue, + su.org_code as departCode, + pmp.director_id as principalNameId, + 4 as type, + pmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + company_contact_name as contactsName, + pmps.create_time as createTime + FROM pay_member_project pmp + right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) + left JOIN sys_user su on (pmp.director_id = su.id) + left join sys_depart sd on (su.org_code = sd.org_code) + union all + SELECT pms.id, + pm.id as superId, + pm.meeting_name AS projectName, + su.realname as principalName, + pms.company_id AS chargeCompanyId, + pms.company_id as chargeCompanyTemporaryId, + pms.company_name AS chargeCompanyTemporaryName, + pms.amount_receivable as allMoney, + pms.paid_amount as comeAllMoney, + pms.charge_use as chargeUse, + sd.depart_name as depart, + pms.pack as pack, + pm.particular_year as year, + pms.in_account as payStatue, + su.org_code as departCode, + pm.director_id as principalNameId, + 3 as type, + pms.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + company_contact_name as contactsName, + pms.create_time as createTime + FROM pay_meeting pm + right join pay_meeting_situation pms on (pm.id = pms.meeting_id) + left JOIN sys_user su on (pm.director_id = su.id) + left join sys_depart sd on (su.org_code = sd.org_code) + union all + SELECT tmps.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tmps.company_id AS chargeCompanyId, + tmps.company_id as chargeCompanyTemporaryId, + tmps.company_name AS chargeCompanyTemporaryName, + tmps.amount_receivable as allMoney, + tmps.paid_amount as comeAllMoney, + tmps.charge_use as chargeUse, + sd.depart_name as depart, + tmps.pack as pack, + tmp.year as year, + tmps.in_account as payStatue, + su.org_code as departCode, + tmp.director_id as principalNameId, + 5 as type, + tmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + liaison_man as contactsName, + tmps.create_time as createTime + FROM tb_member_project tmp + left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.org_code = sd.org_code) + union all + SELECT tcp.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tcp.company_id AS chargeCompanyId, + tcp.company_id as chargeCompanyTemporaryId, + tcp.company_name AS chargeCompanyTemporaryName, + tcp.amount_receivable as allMoney, + tcp.paid_amount as comeAllMoney, + tcp.charge_use as chargeUse, + sd.depart_name as depart, + tcp.pack as pack, + tmp.year as year, + tcp.in_account as payStatue, + su.org_code as departCode, + tmp.director_id as principalNameId, + 6 as type, + tcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + liaison_man as contactsName, + tcp.create_time as createTime + FROM tb_member_project tmp + left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.org_code = sd.org_code) + ) pp +where pp.allMoney is not null + and pp.allMoney != 0 +order by pp.createTime; create table pay_confirm_payment_record ( @@ -182,6 +191,7 @@ create table pay_confirm_payment_record update_by varchar(50) null comment '更新人', update_time datetime null comment '更新日期', project_id varchar(50) null comment '项目id', + project_type tinyint(1) null comment '项目类型', amount_received decimal(12, 2) null comment '到账金额', payment_date date null comment '到账日期', remark varchar(200) null comment '备注' diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 67fd85db..3220aec9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -329,6 +329,11 @@ public class PayMeetingSituation implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; + @ApiModelProperty(value = "确认到账金额（元）") + @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmAmount; + /**打包*/ //@Excel(name = "打包", width = 15) @ApiModelProperty(value = "打包") 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 a88edc81..e6442e4e 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 @@ -61,7 +61,6 @@ 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.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 0c854675..55a38be3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -162,6 +162,11 @@ public class PayMemberProjectSubitem implements Serializable { @DecimalMax(value = "9999999999.99",message = "实收金额格式错误") private BigDecimal paidAmount; + @ApiModelProperty(value = "确认到账金额（元）") + @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmAmount; + /** * 来款方式 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index 78c98b78..79263095 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -3,10 +3,13 @@ package com.jero.member.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + +import com.alibaba.fastjson.annotation.JSONField; 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 com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -206,6 +209,11 @@ public class TbCertificatePayment implements Serializable { @DecimalMax(value = "9999999999.99", message = "实收金额格式错误") private BigDecimal paidAmount; + @ApiModelProperty(value = "确认到账金额（元）") + @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmAmount; + /**打包*/ @Excel(name = "打包", width = 15,dicCode = "yn") @ApiModelProperty(value = "打包") 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 cc79a7b1..f3028ea7 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 @@ -145,6 +145,11 @@ public class TbMemberProjectSubitem implements Serializable { @DecimalMax(value = "9999999999.99", message = "实收金额格式错误") private BigDecimal paidAmount; + @ApiModelProperty(value = "确认到账金额（元）") + @DecimalMax(value = "9999999999.99",message = "确认到账金额（元）格式错误") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal confirmAmount; + /**打包*/ @Excel(name = "打包", width = 15,dicCode = "yn") @ApiModelProperty(value = "打包") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index 859580d2..61cace99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -4,9 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.vo.LoginUser; -import com.jero.company.entity.PayContactsManagement; -import com.jero.company.service.IPayContactsManagementService; import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbCertificatePaymentService; @@ -15,16 +12,13 @@ import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.payment.service.IPayPaymentRecordService; -import com.jero.standards.memberinfo.service.IMemberInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java index a7e2d88b..a4c77d25 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java @@ -72,14 +72,12 @@ public class PayConfirmPaymentRecord implements Serializable { /** * 项目id */ - @TableField(value = "project_id") @ApiModelProperty(value="项目id") private String projectId; /** * 项目类型 */ - @TableField(exist = false) @ApiModelProperty(value="项目类型") private String projectType; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java index 1bc93eb9..5cac4227 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/PayPaymentRecordMapper.java @@ -2,7 +2,6 @@ package com.jero.payment.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.home.vo.DataStatisticsVO; import com.jero.payment.entity.PayPaymentRecord; import com.jero.project.entity.PayCommonProject; import com.jero.project.vo.PayCommonProjectOutput; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index 3e227e4c..17c71381 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -5,11 +5,11 @@