推送工程量问题修复

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/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);
     }