fix 87761 企业来款分类统计-个别企业不显示确认

87754 企业来款分类统计，导出后的顺序与列表顺序建议一致

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java

@@ -35,4 +35,6 @@ public interface PayCompanyManagementMapper extends BaseMapper<PayCompanyManagem
     IPage<PayCompanyManagement> pageSafetyCenter(Page<PayCompanyManagement> page, @Param(Constants.WRAPPER) QueryWrapper<PayCompanyManagement> queryWrapper);
 
     Page<PayCompanyManagement> pageHaveMoney(Page<PayCompanyManagement> page, @Param("chargeCompanyIds") List<String> chargeCompanyIds);
+
+    List<PayCompanyManagement> pageHaveMoney(@Param("chargeCompanyIds") List<String> chargeCompanyIds);
 }

jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml

@@ -48,11 +48,12 @@
     </select>
 
     <select id="pageHaveMoney" resultType="com.jero.company.entity.PayCompanyManagement">
-        select distinct chargeCompanyId as id from v_statistical
+        select * from pay_company_management
         <where>
-            <foreach item="item" index="index" collection="chargeCompanyIds" open="chargeCompanyId in (" separator="," close=")">
+            <foreach item="item" index="index" collection="chargeCompanyIds" open="id in (" separator="," close=")">
                 #{item}
             </foreach>
         </where>
+        order by create_time desc
     </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java

@@ -128,4 +128,6 @@ public interface IPayCompanyManagementService extends IService<PayCompanyManagem
     IPage<PayCompanyManagement> pageSafetyCenter(Page<PayCompanyManagement> page, QueryWrapper<PayCompanyManagement> queryWrapper);
 
     Page<PayCompanyManagement> pageHaveMoney(Page<PayCompanyManagement> page, List<String> chargeCompanyIds);
+
+    List<PayCompanyManagement> pageHaveMoney(List<String> chargeCompanyIds);
 }

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java

@@ -703,6 +703,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         return payCompanyManagementMapper.pageHaveMoney(page, chargeCompanyIds);
     }
 
+    @Override
+    public List<PayCompanyManagement> pageHaveMoney(List<String> chargeCompanyIds) {
+        return payCompanyManagementMapper.pageHaveMoney(chargeCompanyIds);
+    }
+
     /**
      * 校验企业名称和信用代码是否匹配
      * @param payCompanyManagement

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

@@ -2691,7 +2691,7 @@
         from
             v_statistical v
         <where>
-            <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
+            <if test="companyComeMoneySearch.years != null and companyComeMoneySearch.years != ''">
                 <foreach item="item" index="index" collection="companyComeMoneySearch.years"
                          open="AND year in (" separator="," close=")">
                     #{item}

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

@@ -252,7 +252,8 @@ public class CompanyComeMoneyStatisticsController {
         //获取分页后需要统计的企业
         Page<PayCompanyManagement> page = new Page<>(pageNo, pageSize);
         Page<PayCompanyManagement> companyManagementPage = payCompanyManagementService.pageHaveMoney(page,chargeCompanyIds);
-        chargeCompanyIds = companyManagementPage.getRecords().stream().map(PayCompanyManagement::getId).collect(Collectors.toList());
+        List<PayCompanyManagement> companyManagementList = companyManagementPage.getRecords();
+        chargeCompanyIds = companyManagementList.stream().map(PayCompanyManagement::getId).collect(Collectors.toList());
         companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds);
 
         String year_begin = companyComeMoneySearch.getYear_begin();
@@ -302,16 +303,15 @@ public class CompanyComeMoneyStatisticsController {
         List<Map<String, String>> valList = new ArrayList<>();
         //先按企业id分组
         Map<String, List<CompanyComeMoneyClassificationList>> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId);
-        for (String companyId : chargeCompanyIds) {
+        for (PayCompanyManagement companyManagement : companyManagementList) {
+            String companyId = companyManagement.getId();
             Map<String, String> lm = new HashMap<>();
+
+            String companyName = companyManagement.getCompanyName();
+            lm.put("name", companyName);
+
             //获取单一企业数据
             List<CompanyComeMoneyClassificationList> companyDateList = companyIdKeyMap.get(companyId);
-            if (CollectionUtil.isEmpty(companyDateList)) {
-                continue;
-            }else {
-                String companyName = companyDateList.get(0).getCompanyName();
-                lm.put("name", companyName);
-            }
             //按年份分组
             Map<String, List<CompanyComeMoneyClassificationList>> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear);
             for (String yearKey : years) {
@@ -406,7 +406,7 @@ public class CompanyComeMoneyStatisticsController {
             chargeCompanyIds = StrUtil.split(chargeCompanyId, ',');
             allSearch.setChargeCompanyIds(chargeCompanyIds);
         }
-
+        List<PayCompanyManagement> companyManagementList = payCompanyManagementService.pageHaveMoney(chargeCompanyIds);
         String year_begin = companyComeMoneySearch.getYear_begin();
         String year_end = companyComeMoneySearch.getYear_end();
         int integer1 = Integer.parseInt(year_begin);
@@ -446,16 +446,14 @@ public class CompanyComeMoneyStatisticsController {
         List<Map<String, String>> valList = new ArrayList<>();
         //先按企业id分组
         Map<String, List<CompanyComeMoneyClassificationList>> companyIdKeyMap = CollStreamUtil.groupByKey(list, CompanyComeMoneyClassificationList::getCompanyId);
-        for (String companyId : chargeCompanyIds) {
+        for (PayCompanyManagement companyManagement : companyManagementList) {
+            String companyId = companyManagement.getId();
             Map<String, String> lm = new HashMap<>();
+
+            String companyName = companyManagement.getCompanyName();
+            lm.put("name", companyName);
             //获取单一企业数据
             List<CompanyComeMoneyClassificationList> companyDateList = companyIdKeyMap.get(companyId);
-            if (CollectionUtil.isEmpty(companyDateList)) {
-                continue;
-            }else {
-                String companyName = companyDateList.get(0).getCompanyName();
-                lm.put("name", companyName);
-            }
             //按年份分组
             Map<String, List<CompanyComeMoneyClassificationList>> yearKeyMap = CollStreamUtil.groupByKey(companyDateList, CompanyComeMoneyClassificationList::getYear);
             for (String yearKey : years) {