Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java

@@ -5,11 +5,16 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 @Data
 public class BsSgcJsjdNmgStatisticVo {
+    private String id;
+
     private String projectName;
 
+    private String proCode;
+
     private String currentTime;
 
     //总多少农民工数量
@@ -32,4 +37,8 @@ public class BsSgcJsjdNmgStatisticVo {
 
     private List<BsSgcJsjdNmgStatisticVo>children;
 
+    public BsSgcJsjdNmgStatisticVo() {
+        this.id = UUID.randomUUID().toString();
+    }
+
 }

jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

@@ -38,6 +38,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
     @Autowired
     BsSgcJsjdBuiSalaryPayableMapper bsSgcJsjdBuiSalaryPayableMapper;
     public IPage<BsSgcJsjdNmgStatisticVo> selectPage(SearchParam<BsSgcJsjdBuiRealNamePro> sp){
+
+        Integer id=1;
         Page<BsSgcJsjdBuiRealNamePro>page=new Page<>(sp.getPageNum(),sp.getPageSize());
         LambdaQueryWrapper<BsSgcJsjdBuiRealNamePro>lw=new LambdaQueryWrapper<>();
         Page<BsSgcJsjdBuiRealNamePro> bsSgcJsjdBuiRealNameProPage = bsSgcJsjdBuiRealNameProMapper.selectPage(page, null);
@@ -49,13 +51,16 @@ public class BsSgcJsjdBuiNmgStatisticsService {
             List<BsSgcJsjdBuiRealName> bsSgcJsjdBuiRealNames = bsSgcJsjdBuiRealNameMapper.selectList(rnlw.eq(BsSgcJsjdBuiRealName::getProNo, bs.getProNo())
                     .eq(BsSgcJsjdBuiRealName::getProCode, bs.getProCode()));
             bsSgcJsjdNmgStatisticVo.setProjectName(bs.getProjectName());
+            bsSgcJsjdNmgStatisticVo.setProCode(bs.getProCode());
 
             LambdaQueryWrapper<BsSgcJsjdBuiSalaryPayable>splw=new LambdaQueryWrapper<>();
             List<BsSgcJsjdBuiSalaryPayable> bsSgcJsjdBuiSalaryPayables = bsSgcJsjdBuiSalaryPayableMapper.selectList(splw.eq(BsSgcJsjdBuiSalaryPayable::getProNo, bs.getProNo())
                     .eq(BsSgcJsjdBuiSalaryPayable::getProCode, bs.getProCode()));
 
             Map<String,Object>map=new HashMap<>();
+
             Map<String,Object>childrenMap=new HashMap<>();
+
             for (BsSgcJsjdBuiRealName bsSgcJsjdBuiRealName:bsSgcJsjdBuiRealNames){
                 if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
                     LocalDate localDate = bsSgcJsjdBuiRealName.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
@@ -276,21 +281,20 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                     finalList1.add((BsSgcJsjdNmgStatisticVo) value);
                 });
             List<BsSgcJsjdNmgStatisticVo>bsSgcJsjdNmgStatisticVos=new ArrayList<>();
-            childrenMap.forEach((key, value)->{
                    for (BsSgcJsjdNmgStatisticVo bsSgcJsjdNmgStatisticVo1: finalList1){
-                       if (bsSgcJsjdNmgStatisticVo1.getCurrentTime().equals(key.split("-")[0])){
-                           if (CollectionUtil.isEmpty(bsSgcJsjdNmgStatisticVo1.getChildren())){
-                               List<BsSgcJsjdNmgStatisticVo>list3=new ArrayList<>();
+                       childrenMap.forEach((key, value)-> {
+                           if (bsSgcJsjdNmgStatisticVo1.getCurrentTime().equals(key.split("-")[0])) {
+                               if (CollectionUtil.isEmpty(bsSgcJsjdNmgStatisticVo1.getChildren())) {
+                                   List<BsSgcJsjdNmgStatisticVo> list3 = new ArrayList<>();
                                    list3.add((BsSgcJsjdNmgStatisticVo) value);
                                    bsSgcJsjdNmgStatisticVo1.setChildren(list3);
-                           }else {
+                               } else {
                                    bsSgcJsjdNmgStatisticVo1.getChildren().add((BsSgcJsjdNmgStatisticVo) value);
                                }
-                           bsSgcJsjdNmgStatisticVos.add(bsSgcJsjdNmgStatisticVo1);
-                           break;
-                       }
                            }
                          });
+                       bsSgcJsjdNmgStatisticVos.add(bsSgcJsjdNmgStatisticVo1);
+                       };
                 list1=bsSgcJsjdNmgStatisticVos;
                 bsSgcJsjdNmgStatisticVo.setChildren(list1);
                 list.add(bsSgcJsjdNmgStatisticVo);