diff --git a/db/统计视图(新).sql b/db/统计视图(新).sql index de0e530d..33bf936f 100644 --- a/db/统计视图(新).sql +++ b/db/统计视图(新).sql @@ -203,7 +203,7 @@ from (SELECT pwgs.id, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, vcpr.payment_date as confirmDate, - null as estimatedArrivalDate, + estimated_arrival_date as estimatedArrivalDate, tmps.create_time as createTime FROM tb_member_project tmp left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) @@ -460,7 +460,7 @@ from (SELECT pwgs.id, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, vcpr.payment_date as confirmDate, - null as estimatedArrivalDate, + estimated_arrival_date as estimatedArrivalDate, tmps.create_time as createTime FROM tb_member_project tmp left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) @@ -1074,7 +1074,7 @@ from (SELECT pwgs.id, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, vcpr.payment_date as confirmDate, - null as estimatedArrivalDate, + estimated_arrival_date as estimatedArrivalDate, tmps.create_time as createTime FROM tb_member_project tmp left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) @@ -1374,7 +1374,7 @@ from (SELECT pwgs.id, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, vcpr.payment_date as confirmDate, - null as estimatedArrivalDate, + estimated_arrival_date as estimatedArrivalDate, tmps.create_time as createTime FROM tb_member_project tmp left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) 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 dd99b2ce..9a64c914 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 @@ -2674,27 +2674,11 @@