fix:统计变更

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java

@@ -189,7 +189,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     List<PrincipalPeopleDetail> queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList<String> ids);
 
-    AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
+    AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
 
     AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList);
 

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -781,7 +781,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                pwg.principal_id_a in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pwg.working_group_project LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -840,7 +845,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                pcp.principal_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pcp.charge_project LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -900,7 +910,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                pmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pmp.project_name LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -959,7 +974,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                pm.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND pm.meeting_name LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -1018,7 +1038,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                tmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND tmp.project_name LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -1077,7 +1102,12 @@
         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)
         <where>
-
+            <if test="idList != null and idList != ''">
+                tmp.director_id in
+                <foreach item="item" open="(" separator="," close=")" collection="idList">
+                    #{item}
+                </foreach>
+            </if>
             <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
                 AND tmp.project_name LIKE
                 concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java

@@ -220,7 +220,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      */
     IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
-    AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch);
+    AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
     AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
 

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -565,8 +565,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
     }
 
     @Override
-    public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch) {
-        return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch);
+    public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList);
     }
 
     @Override

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -121,7 +121,7 @@ public class AllProjectStatisticsController {
                 }
 
             }
-        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);
+        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,null);
 
         hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney());
         hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney());
@@ -148,7 +148,7 @@ public class AllProjectStatisticsController {
         allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
-            //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
+            //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
             LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
             String roleCode = sysUser.getRoleCode();
              List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -164,13 +164,10 @@ public class AllProjectStatisticsController {
                 idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
                 idList.addAll(allDepartIds);//项目负责人
-            } else if (roleCodes.contains(constant.XMFZR)) {
-                String userId = sysUser.getId();
-                idList.add(userId);
             } else {
                 return Result.OK();
             }
-                Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
+            Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
             HashMap<String, Object> hashMap = new HashMap<>();
 //            double sum=0;
@@ -197,7 +194,7 @@ public class AllProjectStatisticsController {
                 }
 
             }
-        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch);
+        AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,idList);
 
         hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney());
         hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney());
@@ -351,15 +348,12 @@ public class AllProjectStatisticsController {
                 idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
 
                 idList.addAll(allDepartIds);
-            } else if (roleCodes.contains(constant.XMFZR)) {
-                String userId = sysUser.getId();
-                idList.add(userId);
             } else {
                 ArrayList<AllProjectStatistics> objects = new ArrayList<>();
                 return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
             }
 
-            List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null);
+            List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
             if (pageList != null) {
                 for (AllProjectStatistics s : pageList) {
                     String key = String.valueOf(s.getChargeUse());