Merge branch 'V20231129-中建一局二公司' of...

Merge branch 'V20231129-中建一局二公司' of https://git-frp.jiansheku.com/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbCostMeasureActualPushBo.java

@@ -18,10 +18,10 @@ public class CbCostMeasureActualPushBo {
     /**
      * 本月实际工程量
      */
-    private BigDecimal costEffective;
+    private BigDecimal projectVolume;
 
     /**
-     * 本月实际工程量
+     * 截止本月实际工程量
      */
     private BigDecimal currentProjectVolume;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbCostMeasureActualSaveBo.java

@@ -31,8 +31,6 @@ public class CbCostMeasureActualSaveBo {
     /**
      * 本月发生成本比例
      */
-    @DecimalMin(value = "-1",message = "数据格式不正确")
-    @DecimalMax(value = "1",message = "数据格式不正确")
     private BigDecimal monthCostRate;
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbCostMeasuresImportVo.java

@@ -23,7 +23,7 @@ public class CbCostMeasuresImportVo {
         @ExcelProperty(value = "清单内容")
         private String itemContent; // 清单内容
 
-        @ExcelProperty(value = "工作内容")
+        @ExcelProperty(value = "工作内容、做法/规格型号/施工现场配置说明")
         private String workContent; // 工作内容、做法/规格型号/施工现场配置说明
 
         @ExcelProperty(value = "单位")

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

@@ -47,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.Collator;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -165,6 +166,15 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
         tWrapper.orderByAsc("id");
         List<Map<String, Object>> mapList = this.listMaps(tWrapper);
 
+        Collator collator = Collator.getInstance(Locale.CHINA);
+        Collections.sort(mapList, new Comparator<Map<String, Object>>() {
+            @Override
+            public int compare(Map<String, Object> m1, Map<String, Object> m2) {
+                String itemContent1 = (String) m1.get("itemContent");
+                String itemContent2 = (String) m2.get("itemContent");
+                return collator.compare(itemContent1, itemContent2);
+            }
+        });
         return mapList;
     }
 
@@ -245,6 +255,7 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
         CbCostMeasureActual cbCostMeasureActual = new CbCostMeasureActual();
         cbCostMeasureActual.setId(pushBo.getId());
         cbCostMeasureActual.setPushTime(new Date());
+        cbCostMeasureActual.setSubmitProjectVolume(pushBo.getSubmitProjectVolume());
         cbCostMeasureActual.setPushDataJson(JsonUtils.toJsonString(pushBo));
         cbCostMeasureActualService.updateById(cbCostMeasureActual);
     }

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -14,8 +14,9 @@ export const getProjectDetailApi = (projectId) => request({
 //校验项目编码是否存在
 export function checkProjectCodeExist(data) {
   return request({
-    url: '/cbProjectRecord/checkProjectCodeExist/' + data,
+    url: '/cbProjectRecord/checkProjectCodeExist',
     method: 'get',
+    params:data,
   });
 }
 //新增项目

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

@@ -53,7 +53,7 @@
           </div>
           <div class="table-item-jf table-item">
             <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                      v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                      v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
                       :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
                       ref="theOwnerListTable" :row-key="'customerKey'"
                       lazy
@@ -464,7 +464,12 @@
     },
     getipmProjectNo(){
       //点击且校验了当前编码有数据才获取
-      checkProjectCodeExist(this.queryParam.ipmProjectNo).then(res=>{
+      console.log(this.queryParam)
+      let pram = {
+        projectId:this.queryParam.id,
+        projectCode:this.queryParam.ipmProjectNo
+      }
+      checkProjectCodeExist(pram).then(res=>{
         if(res.code == 200 && res.data == true){
           this.queryParam.isGetProjectDetail = 1
           this.$message.success(res.msg)