From 85a05181556d62b653122c3be9cf95aedb9d6851 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Mon, 31 Mar 2025 16:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=9B=9E=E5=BD=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectStatistics/peasantWorkers/index.vue      | 4 ++--
 .../service/BsSgcJsjdBuiSalaryStatisticsService.java          | 2 +-
 .../mapper/earlyStage/SpecialProjectBidInfoMapper.xml         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
index 9dd5e7ef..101c9cec 100644
--- a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
@@ -396,8 +396,8 @@ export default {
         { lab: "农民工总数（个）", key: "worksTotal", val: 0 },
         { lab: "农民工在场数（个）", key: "enterNum", val: 0 },
         { lab: "农民工退场数（个）", key: "exitNum", val: 0 },
-        { lab: "发放工资总数（万元）", key: "payTotal", val: 0 },
-        { lab: "总拖欠工资（万元）", key: "unPayTotal", val: 0 },
+        { lab: "发放工资总数（元）", key: "payTotal", val: 0 },
+        { lab: "总拖欠工资（元）", key: "unPayTotal", val: 0 },
       ],
     };
   },
diff --git a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
index f688fa09..75441ba2 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
@@ -65,7 +65,7 @@ public class BsSgcJsjdBuiSalaryStatisticsService extends BaseService<BsSgcJsjdBu
         for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){
             String date= DateUtil.format(bsSgcJsjdBuiSalaryPayable.getSalaryTime(),"yyyy-MM");
             for (BsSgcJsjdBuiSalaryStatistics item:bsSgcJsjdBuiSalaryStatistics){
-                if (ObjectUtil.isNotEmpty(date)){
+                if (ObjectUtil.isNotEmpty(date)&&StringUtils.isNotEmpty(item.getStatisticsDate())){
                     if (item.getStatisticsDate().equals(date)){
                         if (ObjectUtil.isNotEmpty(item.getCurrentPayable())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())) {
                             item.setCurrentPayable(String.valueOf(Integer.parseInt(item.getCurrentPayable()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())));
diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml
index cd46a70a..e7dcaa47 100644
--- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml
@@ -42,8 +42,8 @@
             <if test="proNo!=null and proNo!=''">
                 and bi.pro_no=#{proNo}
             </if>
-            <if test="projectCode != null and projectCode != ''">
-                and bi.PROJECT_CODE=#{projectCode}
+            <if test="proCode != null and proCode != ''">
+                and bi.PROJECT_CODE=#{proCode}
             </if>
             <if test="isConsolidatedBidding!=null and isConsolidatedBidding!=''">
                 and IS_CONSOLIDATED_BIDDING=#{isConsolidatedBidding}