From 95c825f2b8873d7f55afdd8f0f2f7bb3547e03bb Mon Sep 17 00:00:00 2001
From: mx <1@qq.com>
Date: Tue, 31 Dec 2024 14:34:14 +0800
Subject: [PATCH] bug

---
 .../src/main/resources/application-dev.yml      | 10 +++++-----
 .../impl/ApproverAbstractServiceImpl.java       | 17 ++++++++---------
 .../service/impl/PsContractInfoServiceImpl.java | 10 ++++++++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pusong-admin/src/main/resources/application-dev.yml b/pusong-admin/src/main/resources/application-dev.yml
index a9f4346..1cae2f1 100644
--- a/pusong-admin/src/main/resources/application-dev.yml
+++ b/pusong-admin/src/main/resources/application-dev.yml
@@ -42,9 +42,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.18.119:3308/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://124.236.46.74:9100/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: Ps123456
+          password: rwWhYfCe3Tzhatep
 #          url: jdbc:mysql://47.95.38.123:3306/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
 #          username: root
 #          password: Ps123456@
@@ -94,13 +94,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 192.168.18.119
+    host: 124.236.46.74
     # 端口，默认为6379
-    port: 6378
+    port: 9101
     # 数据库索引
     database: 8
     # 密码(如没有密码请注释掉)
-    password: 12345
+    password: redis_PhRr2K
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
index 2ca74cb..e1b9137 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
@@ -134,17 +134,16 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
         }
         Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay());
 
-        List<String> codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList();
-
-        QueryWrapper<PsCompanyInfoVo> wq = Wrappers.<PsCompanyInfoVo>query()
-                .eq("com.del_flag", "0")
-                .eq("pcc.del_flag","0")
-                .in("pcc.contract_code", codes);
-        List<PsCompanyInfoVo> list = companyInfoMapper.selectContractServiceCompany(wq);
-        Map<String, List<PsCompanyInfoVo>> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode));
-
 
         if(CollectionUtils.isNotEmpty(res.getRecords())){
+            List<String> codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList();
+            QueryWrapper<PsCompanyInfoVo> wq = Wrappers.<PsCompanyInfoVo>query()
+                    .eq("com.del_flag", "0")
+                    .eq("pcc.del_flag","0")
+                    .in("pcc.contract_code", codes);
+            List<PsCompanyInfoVo> list = companyInfoMapper.selectContractServiceCompany(wq);
+            Map<String, List<PsCompanyInfoVo>> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode));
+
             res.getRecords().forEach(item->{
                 if (item.getContractAmount() != null)
                     item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney()));
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
index c25ee98..9108ce4 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
@@ -742,8 +742,14 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
                 detailBos.add(item);
 
                 for (PsContractBusinessDetailBo detailBo : item.getDetailBos()) {
-                    contractType = dictDataService.selectDict("service_project", detailBo.getBusinessProject());
-                    String dictLabel = contractType.getDictLabel();
+                    String dictLabel = "";
+                    if (StringUtils.isEmpty(detailBo.getBusinessProject())){
+                        dictLabel = detailBo.getBusinessProjectLabel();
+                    }else{
+                        contractType = dictDataService.selectDict("service_project", detailBo.getBusinessProject());
+                        dictLabel = contractType.getDictLabel();
+                    }
+
                     String remark = contractType.getRemark();
                     if (!StringUtils.isEmpty(remark)){
                         JSONObject jsonObject = JSONObject.parseObject(remark);