diff --git a/db/统计视图.sql b/db/统计视图.sql new file mode 100644 index 00000000..3b5be872 --- /dev/null +++ b/db/统计视图.sql @@ -0,0 +1,131 @@ +create view v_statistical as +select pp.id as projectId, + pp.projectName, + principalName, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + if(pp.pack = 0, '否', '是') as packText, + year, + payStatue, + departCode, + principalNameId, + pp.pack +from (SELECT pwgs.id, + pwg.working_group_project AS projectName, + pwg.principal_name_a as principalName, + 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, + 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.charge_project AS projectName, + pcp.principal_name as principalName, + 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, + 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.project_name AS projectName, + su.realname as principalName, + 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, + 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.meeting_name AS projectName, + su.realname as principalName, + 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, + 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.project_name AS projectName, + su.realname as principalName, + 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, + 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.project_name AS projectName, + su.realname as principalName, + 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, + 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 \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index adab6256..737b4f02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -16,14 +16,14 @@ import java.util.List; /** * @Description: pay_working_group * @Author: jeecg-boot - * @Date: 2021-08-27 + * @Date: 2021-08-27 * @Version: V1.0 */ public interface PayWorkingGroupMapper extends BaseMapper { /** * @Description 分页查询 - * @Author lqt - * @Date 2021/9/1 + * @Author lqt + * @Date 2021/9/1 * @Param payWorkingGroup * @Return * @Exception @@ -32,20 +32,20 @@ public interface PayWorkingGroupMapper extends BaseMapper { /** * @Description 根据企业查询列表 - * @Author lqt - * @Date 2021/9/5 + * @Author lqt + * @Date 2021/9/5 * @Param * @Return * @Exception */ - List queryListByCompany(@Param("companyId") String companyId,@Param("workingGroupProject") String workingGroupProject, - @Param("year") String year,@Param("projectType") String projectType, - @Param("pack")Integer pack, @Param("packYear") String packYear); + List queryListByCompany(@Param("companyId") String companyId, @Param("workingGroupProject") String workingGroupProject, + @Param("year") String year, @Param("projectType") String projectType, + @Param("pack") Integer pack, @Param("packYear") String packYear); /** * @Description 查询不存在成员单位的列表 - * @Author lqt - * @Date 2021/9/7 + * @Author lqt + * @Date 2021/9/7 * @Param * @Return * @Exception @@ -54,69 +54,71 @@ public interface PayWorkingGroupMapper extends BaseMapper { /** * @Description 工作组统计 - * @Author zql - * @Date 2021/9/13 + * @Author zql + * @Date 2021/9/13 * @Param * @Return * @Exception */ - IPage queryPageListForStatistics(Page page,@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch,@Param("ids")List ids); + IPage queryPageListForStatistics(Page page, @Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch, @Param("ids") List ids); /** * @Description 工作组统计导出 - * @Author zql - * @Date 2021/9/13 + * @Author zql + * @Date 2021/9/13 * @Param * @Return * @Exception */ - List queryPageListForStatistics(@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch,@Param("ids") List ids); + List queryPageListForStatistics(@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch, @Param("ids") List ids); /** * @Description 工作组统计导出ids - * @Author zql - * @Date 2021/9/13 + * @Author zql + * @Date 2021/9/13 * @Param * @Return * @Exception */ - List queryPageListForStatisticsIds(@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch,@Param("ids") List ids,@Param("idss") List idss); + List queryPageListForStatisticsIds(@Param("payWorkingGroupSearch") PayWorkingGroupSearch payWorkingGroupSearch, @Param("ids") List ids, @Param("idss") List idss); List getGroupList(); /** * @Description 全所统计 - * @Author zql - * @Date 2021/9/17 + * @Author zql + * @Date 2021/9/17 * @Param * @Return * @Exception */ - List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); + //List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); /** * @Description 全所统计 - * @Author zql - * @Date 2021/9/17 + * @Author zql + * @Date 2021/9/17 * @Param * @Return * @Exception */ - List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,List idList); + List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); + /** * @Description 企业来款查询和全所统计 - * @Author zql - * @Date 2021/9/17 + * @Author zql + * @Date 2021/9/17 * @Param * @Return * @Exception */ - IPage queryPageList3( Page page,@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,@Param("idList") List idList); - List queryPageListExcel(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,@Param("idList") List idList,@Param("ids") List ids); + IPage queryPageList3(Page page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); + List queryPageListExcel(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList, @Param("ids") List ids); /** * 个人来款统计 + * * @param page * @param principalPeopleSearch * @param idList @@ -126,57 +128,66 @@ public interface PayWorkingGroupMapper extends BaseMapper { /** * 个人来款统计导出excel + * * @param idList * @return */ - List queryPageListForPrincipal(@Param("principalPeopleSearch") PrincipalPeopleSearch principalPeopleSearch,@Param("idList") List idList); + List queryPageListForPrincipal(@Param("principalPeopleSearch") PrincipalPeopleSearch principalPeopleSearch, @Param("idList") List idList); + /** * 个人来款统计详情导出 + * * @param principalPeopleDetailSearch * @return */ List queryPageListForPrincipalDetail(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch); + /** * 个人来款统计详情 + * * @param page * @return */ - IPage queryPageListForPrincipalDetail(Page page,@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch); + IPage queryPageListForPrincipalDetail(Page page, @Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch); /** * 企业来款统计 + * * @param page * @param companyComeMoneySearch * @param idList * @return */ - IPage queryPageListForCompany(Page page,@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch,@Param("idList") List idList); + IPage queryPageListForCompany(Page page, @Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List idList); + /** * 企业来款统计 + * * @param * @param companyComeMoneySearch * @param idList * @return */ - List queryPageListForCompany(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch,@Param("idList") List idList); + List queryPageListForCompany(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List idList); + /** * 企业来款详情 + * * @param page * @param companyComeMoneyDetailSearch * @return */ - IPage queryPageListForCompanyDetail(Page page,@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,@Param("idList") List idList ); + IPage queryPageListForCompanyDetail(Page page, @Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List idList); /** * 企业来款详情导出 + * * @param * @param companyComeMoneyDetailSearch * @return */ - List queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch,@Param("idList") List idList); - - + List queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List idList); List queryPageListForPrincipalFirstPage(); @@ -187,7 +198,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListForDepartFirstPage(); - List queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList ids); + List queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch, @Param("ids") ArrayList ids); AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); 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 078097bd..d4cee790 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 @@ -325,885 +325,114 @@