add 全所统计-增加预估到账日期是否为空筛选条件
This commit is contained in:
lijiarao
@@ -27,6 +27,7 @@ select pp.id as projectId,
|
||||
confirmNoTaxAmount,
|
||||
contactsName,
|
||||
confirmDate,
|
||||
estimatedArrivalDate,
|
||||
pp.pack
|
||||
from (SELECT pwgs.id,
|
||||
pwg.id as superId,
|
||||
@@ -54,6 +55,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) as contactsName,
|
||||
GROUP_CONCAT(DISTINCT DATE_FORMAT(vcpr.payment_date,'%Y-%m')) as confirmDate,
|
||||
pwgs.estimated_arrival_date as estimatedArrivalDate,
|
||||
pwgs.create_time as createTime
|
||||
FROM pay_working_group pwg
|
||||
right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id)
|
||||
@@ -91,6 +93,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
contacts_temporary_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pcp.estimated_arrival_date as estimatedArrivalDate,
|
||||
pcp.create_time as createTime
|
||||
FROM pay_common_project pcp
|
||||
left JOIN sys_user su on (pcp.principal_id = su.id)
|
||||
@@ -126,6 +129,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
company_contact_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pmps.estimated_arrival_date as estimatedArrivalDate,
|
||||
pmps.create_time as createTime
|
||||
FROM pay_member_project_subitem pmps
|
||||
left join pay_member_project pmp on (pmp.id = pmps.project_id)
|
||||
@@ -162,6 +166,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
company_contact_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pms.estimated_arrival_date as estimatedArrivalDate,
|
||||
pms.create_time as createTime
|
||||
FROM pay_meeting pm
|
||||
right join pay_meeting_situation pms on (pm.id = pms.meeting_id)
|
||||
@@ -198,6 +203,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
liaison_man as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
null 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)
|
||||
@@ -234,6 +240,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
liaison_man as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
null as estimatedArrivalDate,
|
||||
tcp.create_time as createTime
|
||||
FROM tb_member_project tmp
|
||||
left join tb_certificate_payment tcp on (tmp.id = tcp.project_id)
|
||||
@@ -277,6 +284,7 @@ select pp.id as projectId,
|
||||
confirmNoTaxAmount,
|
||||
contactsName,
|
||||
confirmDate,
|
||||
estimatedArrivalDate,
|
||||
pp.pack
|
||||
from (SELECT pwgs.id,
|
||||
pwg.id as superId,
|
||||
@@ -304,6 +312,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
(select GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) from pay_working_group_subitem_contacts pwgsc where pwgsc.working_group_sub_id = pwgs.id) as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pwgs.estimated_arrival_date as estimatedArrivalDate,
|
||||
pwgs.create_time as createTime
|
||||
FROM pay_working_group pwg
|
||||
right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id)
|
||||
@@ -341,6 +350,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
contacts_temporary_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pcp.estimated_arrival_date as estimatedArrivalDate,
|
||||
pcp.create_time as createTime
|
||||
FROM pay_common_project pcp
|
||||
left JOIN sys_user su on (pcp.principal_id = su.id)
|
||||
@@ -376,6 +386,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
company_contact_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pmps.estimated_arrival_date as estimatedArrivalDate,
|
||||
pmps.create_time as createTime
|
||||
FROM pay_member_project pmp
|
||||
right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id)
|
||||
@@ -412,6 +423,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
company_contact_name as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
pms.estimated_arrival_date as estimatedArrivalDate,
|
||||
pms.create_time as createTime
|
||||
FROM pay_meeting pm
|
||||
right join pay_meeting_situation pms on (pm.id = pms.meeting_id)
|
||||
@@ -448,6 +460,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
liaison_man as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
null 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)
|
||||
@@ -484,6 +497,7 @@ from (SELECT pwgs.id,
|
||||
vcpr.no_tax_amount as confirmNoTaxAmount,
|
||||
liaison_man as contactsName,
|
||||
vcpr.payment_date as confirmDate,
|
||||
null as estimatedArrivalDate,
|
||||
tcp.create_time as createTime
|
||||
FROM tb_member_project tmp
|
||||
left join tb_certificate_payment tcp on (tmp.id = tcp.project_id)
|
||||
|
||||
+13
@@ -163,6 +163,7 @@
|
||||
sum(confirmNoTaxAmount) as confirmNoTaxAmount,
|
||||
contactsName,
|
||||
confirmDate,
|
||||
estimatedArrivalDate,
|
||||
pack
|
||||
</sql>
|
||||
<!-- 工作组统计-->
|
||||
@@ -515,6 +516,12 @@
|
||||
<if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
|
||||
AND pack = #{allProjectStatisticsSearch.pack}
|
||||
</if>
|
||||
<if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '1'.toString()">
|
||||
AND estimatedArrivalDate is null
|
||||
</if>
|
||||
<if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
|
||||
AND estimatedArrivalDate is not null
|
||||
</if>
|
||||
<choose>
|
||||
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
|
||||
AND allMoney >= #{allProjectStatisticsSearch.allMoney}
|
||||
@@ -635,6 +642,12 @@
|
||||
<if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
|
||||
AND pack = #{allProjectStatisticsSearch.pack}
|
||||
</if>
|
||||
<if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '1'.toString()">
|
||||
AND estimatedArrivalDate is null
|
||||
</if>
|
||||
<if test="allProjectStatisticsSearch.estimatedArrivalDateHasFlag != null and allProjectStatisticsSearch.estimatedArrivalDateHasFlag == '0'.toString()">
|
||||
AND estimatedArrivalDate is not null
|
||||
</if>
|
||||
<choose>
|
||||
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
|
||||
AND allMoney >= #{allProjectStatisticsSearch.allMoney}
|
||||
|
||||
+6
@@ -3,6 +3,8 @@ package com.jero.statistics.entity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.validation.constraints.DecimalMax;
|
||||
import javax.validation.constraints.Digits;
|
||||
@@ -61,4 +63,8 @@ public class AllProjectStatisticsSearch {
|
||||
|
||||
@ApiModelProperty(value = "企业联系人")
|
||||
private String companyContactName;
|
||||
|
||||
/**预估到账日期是否为空*/
|
||||
@ApiModelProperty(value = "预估到账日期是否为空")
|
||||
private String estimatedArrivalDateHasFlag;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user