Merge remote-tracking branch 'origin/master'

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 },
       ],
     };
   },

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())));

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}