Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbProjectOtherImportListener.java

@@ -70,8 +70,8 @@ public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjec
             }else{
                 importVo.setDealWithNumber(importVo.getNumber());
             }
-            dataList.add(importVo);
         }
+        dataList.add(importVo);
     }
 
     @Override

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectOtherServiceImpl.java

@@ -226,19 +226,19 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                         String number = importVo.getNumber();
 
                         CbProjectOther cbProjectOther = new CbProjectOther();
+                        BeanUtil.copyProperties(importVo, cbProjectOther);
                         //保存一级节点
                         if (ReUtil.isMatch(firstPattern, number) || ReUtil.isMatch(pattern3, number)) {
-                            BeanUtil.copyProperties(importVo, cbProjectOther);
                             cbProjectOther.setParentId(rootMeasuresId);
                         } else if (ReUtil.isMatch(secondPattern, number)) {
-                            BeanUtil.copyProperties(importVo, cbProjectOther);
                             // 根据no查询父级节点
                             CbProjectOther parentCbCostMeasure = getCbProjectOther(rootMeasuresId, number, projectId, cbStage);
-                            String[] split = number.split("\\.");
                             cbProjectOther.setParentId(parentCbCostMeasure.getId());
                         }
+                        if (ObjectUtil.isNotEmpty(cbProjectOther.getDealWithNumber())) {
                             String newNo = String.valueOf(rootMeasuresId).concat(".").concat(cbProjectOther.getDealWithNumber());
                             cbProjectOther.setDealWithNumber(newNo);
+                        }
                         cbProjectOther.setProjectId(projectId);
                         cbProjectOther.setCbStage(cbStage);
                         this.save(cbProjectOther);

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -473,11 +473,15 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                 }
             }
 
-            //所有文件遍历完后，如果存在解析失败的文件，则项目的解析状态改为解析失败
+            //所有文件遍历完后，如果存在解析失败的文件，则项目的解析状态改为解析失败,否则改为解析成功
             if (failNum > 0) {
                 log.info("项目台账列表:ID为" + projectRecord.getId() + "的项目解析失败");
                 projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
                 baseMapper.updateById(projectRecord);
+            } else {
+                log.info("项目台账列表:ID为" + projectRecord.getId() + "的项目解析成功");
+                projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
+                baseMapper.updateById(projectRecord);
             }
         }
     }

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

@@ -33,7 +33,7 @@
             <el-table-column label="占比" prop="proportion">
               <template slot-scope="scope">{{scope.row.proportion || '--'}}</template>
             </el-table-column>
-            <el-table-column label="本月工作量" prop="quantity">
+            <el-table-column label="本月工程量" prop="quantity">
               <template slot-scope="scope">{{scope.row.quantity || '--'}}</template>
             </el-table-column>
           </el-table>
@@ -169,7 +169,7 @@
             <el-date-picker size="small" style="width: 368px"
               v-model="chooseDate"
               type="month"
-              placeholder="选择月" @change="changeDate"
+              placeholder="请选择所需添加的成本月份" @change="changeDate"
               value-format="yyyy-MM"
               :picker-options="pickerOptions">
               </el-date-picker>

dsk-operate-ui/src/views/projectCostLedger/index.vue

@@ -463,8 +463,10 @@
       checkProjectCodeExist(this.queryParam.ipmProjectNo).then(res=>{
         if(res.code == 200 && res.data == true){
           this.queryParam.isGetProjectDetail = 1
+          this.$message.success(res.msg)
         }else{
           this.queryParam.isGetProjectDetail = 0
+          this.$message.error(res.msg)
         }
       })
     },