全所统计

2021-09-23 17:01:54 +08:00
parent c4b7574ee7
commit 82f9c0b587
5 changed files with 61 additions and 58 deletions
@@ -134,4 +134,12 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
     * @return
     */
    IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page,@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
+
+    /**
+     * 企业来款详情
+     * @param
+     * @param companyComeMoneyDetailSearch
+     * @return
+     */
+    List<CompanyComeMoneyDetail> queryPageListForCompanyDetail(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
 }
@@ -187,9 +187,6 @@
                AND pwgs.charge_company_temporary_name LIKE
                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
            </if>
-            <if test="allProjectStatisticsSearch.inAccountStatue != null and allProjectStatisticsSearch.inAccountStatue != ''">
-                AND pwgs.in_account=#{allProjectStatisticsSearch.inAccountStatue}
-            </if>
            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId}
            </if>
@@ -239,9 +236,6 @@
            <if test="allProjectStatisticsSearch.chargeUse != null and allProjectStatisticsSearch.chargeUse != ''">
                AND pcp.charge_use=#{allProjectStatisticsSearch.chargeUse}
            </if>
-            <if test="allProjectStatisticsSearch.inAccountStatue != null and allProjectStatisticsSearch.inAccountStatue != ''">
-                AND pcp.in_account=#{allProjectStatisticsSearch.inAccountStatue}
-            </if>

            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                AND pcp.principal_id=#{allProjectStatisticsSearch.principalNameId}
@@ -296,9 +290,6 @@
                AND pmps.company_name LIKE
                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
            </if>
-            <if test="allProjectStatisticsSearch.inAccountStatue != null and allProjectStatisticsSearch.inAccountStatue != ''">
-                AND pmps.in_account=#{allProjectStatisticsSearch.inAccountStatue}
-            </if>
            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId}
            </if>
@@ -352,9 +343,6 @@
                AND pms.company_name LIKE
                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
            </if>
-            <if test="allProjectStatisticsSearch.inAccountStatue != null and allProjectStatisticsSearch.inAccountStatue != ''">
-                AND pms.in_account=#{allProjectStatisticsSearch.inAccountStatue}
-            </if>
            <if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
                AND pm.director_id=#{allProjectStatisticsSearch.principalNameId}
            </if>
@@ -408,9 +396,6 @@
                AND tmps.company_name LIKE
                concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
            </if>
-            <if test="allProjectStatisticsSearch.inAccountStatue != null and allProjectStatisticsSearch.inAccountStatue != ''">
-                AND tmps.in_account=#{allProjectStatisticsSearch.inAccountStatue}
-            </if>
            <if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
                AND tmps.pack=#{allProjectStatisticsSearch.pack}
            </if>
@@ -2,7 +2,6 @@ package com.jero.project.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.project.entity.PayWorkGroupSubletStatistics;
 import com.jero.project.entity.PayWorkingGroupSearch;
 import com.jero.project.entity.PayWorkingGroupStatistics;
 import com.jero.project.vo.PayWorkingGroupVO;
@@ -159,4 +158,11 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
     * @return
     */
    IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page, CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
+
+    /**
+     * 企业来款详情统计
+     * @param companyComeMoneyDetailSearch
+     * @return
+     */
+    List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
 }
@@ -11,7 +11,6 @@ import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.project.entity.*;
-import com.jero.project.service.IPayWorkingGroupDataFileService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.project.vo.PayWorkingGroupVO;
 import com.jero.project.service.IPayWorkingGroupService;
@@ -257,6 +256,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
        return payWorkingGroupMapper.queryPageListForCompanyDetail(page,companyComeMoneyDetailSearch);
    }

+    @Override
+    public List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
+        return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch);
+    }
+
    /**
    * @Description 校验是存在关联合同的项目
    * @Author  lqt
@@ -135,56 +135,56 @@ public class CompanyComeMoneyStatisticsController {

    }

-    /**
-     *个人来款统计导出
-     *
-     */
-    @GetMapping(value = "/excel")
-    @ApiOperation(value = "个人来款统计导出-导出统计", notes = "个人来款统计导出-导出统计")
-    public ModelAndView excel(PrincipalPeopleSearch principalPeopleSearch) {
-        if (principalPeopleSearch.getYear() == null || principalPeopleSearch.getYear().equals("")) {
-            Calendar calendar = Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            principalPeopleSearch.setYear(year);
-        }
-        //根据不同角色加载不同列表的参数
-        List<String> idList = new ArrayList<>();
-        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
-        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String roleCode = sysUser.getRoleCode();
-        //科长
-        if(constant.BMFZR.equals(roleCode)) {
-            String orgCode = sysUser.getOrgCode();
-            List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
-            idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
-            //所领导或者超级管理员
-        } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
-            idList=null;
-            //企业职员项目负责人
-        }else if( constant.QYRY.equals(roleCode)){
-            String userId = sysUser.getId();
-            idList.add(userId);
-        }
-        List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList);
-
-        return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "个人来款");
-    }
+//    /**
+//     *企业来款统计
+//     *
+//     */
+//    @GetMapping(value = "/excel")
+//    @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
+//    public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) {
+//        if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) {
+//            Calendar calendar = Calendar.getInstance();
+//            String year = String.valueOf(calendar.get(Calendar.YEAR));
+//            companyComeMoneySearch.setYear(year);
+//        }
+//        //根据不同角色加载不同列表的参数
+//        List<String> idList = new ArrayList<>();
+//        //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+//        LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        String roleCode = sysUser.getRoleCode();
+//        //科长
+//        if(constant.BMFZR.equals(roleCode)) {
+//            String orgCode = sysUser.getOrgCode();
+//            List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
+//            idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+//            //所领导或者超级管理员
+//        } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
+//            idList=null;
+//            //企业职员项目负责人
+//        }else if( constant.QYRY.equals(roleCode)){
+//            String userId = sysUser.getId();
+//            idList.add(userId);
+//        }
+//        List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList);
+//
+//        return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "企业来款统计");
+//    }

    /**
-     *个人来款统详情计导出
+     *企业来款统计
     *
     */
    @GetMapping(value = "/excelDetail")
-    @ApiOperation(value = "个人来款统详情计导出-导出统计", notes = "个人来款统详情计导出-导出统计")
-    public ModelAndView excelDetail( PrincipalPeopleDetailSearch principalPeopleDetailSearch) {
-        if (principalPeopleDetailSearch.getYear() == null || principalPeopleDetailSearch.getYear().equals("")) {
+    @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计")
+    public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
+        if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) {
            Calendar calendar = Calendar.getInstance();
            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            principalPeopleDetailSearch.setYear(year);
+            companyComeMoneyDetailSearch.setYear(year);
        }
-        List<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetailExcel(principalPeopleDetailSearch);
+        List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch);

-        return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "个人来款详情");
+        return AmountUtil.exportListXls(pageList, PrincipalPeopleDetail.class, "企业来款详情统计");
    }

 }