|
@@ -14,8 +14,11 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
@Service
|
|
|
@Slf4j
|
|
@@ -99,6 +102,13 @@ public class FImplService implements FService {
|
|
|
// 累计合计金额
|
|
|
formData.put("numberField_m06lmogz", UtilMap.getFloat(formData, "numberField_m06lmogz") + UtilMap.getFloat(data, "numberField_m4qrz685"));
|
|
|
}
|
|
|
+ List<Map> mapList = (List<Map>) formData.get("tableField_m06ij3zd");
|
|
|
+ List<Map> collect = mapList.stream().sorted(Comparator.comparing(m -> UtilMap.getString((Map) m, "textField_m06ij3zh")).reversed()).collect(Collectors.toList());
|
|
|
+// List<Map> collect = mapList.stream().sorted(Comparator.comparing(m -> LocalDate.parse(UtilMap.getString((Map) m, "textField_m06ij3zh")+"-01", DateTimeFormatter.ISO_LOCAL_DATE)).reversed()).collect(Collectors.toList());
|
|
|
+ for (int i = 0; i < collect.size(); i++) {
|
|
|
+ collect.get(i).put("textField_m06ij3ze",i+1);
|
|
|
+ }
|
|
|
+ formData.put("tableField_m06ij3zd", collect);
|
|
|
setMap.put(unique, formData);
|
|
|
}
|
|
|
|