[task-2031]子培训管理看板开发/培训管理看板接口

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/TrainObjectDto.java

@@ -1,6 +1,9 @@
 package com.lc.ibps.business.dto;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 在岗培训对象占比
@@ -34,6 +37,17 @@ public class TrainObjectDto {
     }
 
     public void setObjectDtoList(List<TrainRateDto> objectDtoList) {
-        this.objectDtoList = objectDtoList;
+        Set<String> existingTypeNames = new HashSet<>();
+        for (TrainRateDto rate : objectDtoList) {
+            existingTypeNames.add(rate.getTypeName());
+        }
+        List<TrainRateDto> finalList = new ArrayList<>(objectDtoList);
+        for (TrainRateDto predefined : TrainRateDto.OBJECTLIST) {
+            if (!existingTypeNames.contains(predefined.getTypeName())) {
+                finalList.add(predefined);
+            }
+        }
+        this.objectDtoList = finalList;
     }
+
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/TrainRateDto.java

@@ -8,6 +8,28 @@ public class TrainRateDto {
 
     private String rate;
 
+    public static final TrainRateDto[] TYPELIST = {
+            new TrainRateDto("体系文件修订", "0", "0.00"),
+            new TrainRateDto("技术", "0", "0.00"),
+            new TrainRateDto("质量管理", "0", "0.00")
+    };
+
+    public static final TrainRateDto[] OBJECTLIST = {
+            new TrainRateDto("新员工", "0", "0.00"),
+            new TrainRateDto("转岗人员", "0", "0.00"),
+            new TrainRateDto("教学实习人员", "0", "0.00"),
+            new TrainRateDto("在岗人员", "0", "0.00")
+    };
+
+    public TrainRateDto() {
+    }
+
+    public TrainRateDto(String typeName, String typeNum, String rate) {
+        this.typeName = typeName;
+        this.typeNum = typeNum;
+        this.rate = rate;
+    }
+
     public String getTypeName() {
         return typeName;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/TrainTypeDto.java

@@ -1,7 +1,10 @@
 package com.lc.ibps.business.dto;
 
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  *  在刚培训类别占比
@@ -35,6 +38,17 @@ public class TrainTypeDto {
     }
 
     public void setTypeDtoList(List<TrainRateDto> typeDtoList) {
-        this.typeDtoList = typeDtoList;
+        Set<String> existingTypeNames = new HashSet<>();
+        for (TrainRateDto rate : typeDtoList) {
+            existingTypeNames.add(rate.getTypeName());
+        }
+        List<TrainRateDto> finalList = new ArrayList<>(typeDtoList);
+        for (TrainRateDto predefined : TrainRateDto.TYPELIST) {
+            if (!existingTypeNames.contains(predefined.getTypeName())) {
+                finalList.add(predefined);
+            }
+        }
+        this.typeDtoList = finalList;
     }
+
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/TrainYearPreWorkDto.java

@@ -1,6 +1,9 @@
 package com.lc.ibps.business.dto;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  *  年度岗前培训类别占比
@@ -34,6 +37,16 @@ public class TrainYearPreWorkDto {
     }
 
     public void setYearProWorkDtoList(List<TrainRateDto> yearProWorkDtoList) {
-        this.yearProWorkDtoList = yearProWorkDtoList;
+        Set<String> existingTypeNames = new HashSet<>();
+        for (TrainRateDto rate : yearProWorkDtoList) {
+            existingTypeNames.add(rate.getTypeName());
+        }
+        List<TrainRateDto> finalList = new ArrayList<>(yearProWorkDtoList);
+        for (TrainRateDto predefined : TrainRateDto.TYPELIST) {
+            if (!existingTypeNames.contains(predefined.getTypeName())) {
+                finalList.add(predefined);
+            }
+        }
+        this.yearProWorkDtoList = finalList;
     }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/dto/TrainingDashBoardDTO.java

@@ -4,6 +4,7 @@ package com.lc.ibps.business.dto;
 import com.lc.ibps.api.form.sql.util.BeanUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -42,24 +43,8 @@ public class TrainingDashBoardDTO {
 
     public void setYearPreWorkDto(TrainYearPreWorkDto yearPreWorkDto) {
         if (BeanUtils.isEmpty(yearPreWorkDto.getYearProWorkDtoList())){
-            List<TrainRateDto> yearProWorkDtoList = new ArrayList<>();
-            TrainRateDto preWorkDto1 = new TrainRateDto();
-            preWorkDto1.setTypeName("体系文件修订");
-            preWorkDto1.setTypeNum("0");
-            preWorkDto1.setRate("0.00");
-            TrainRateDto preWorkDto2 = new TrainRateDto();
-            preWorkDto2.setTypeName("技术");
-            preWorkDto2.setTypeNum("0");
-            preWorkDto2.setRate("0.00");
-            TrainRateDto preWorkDto3 = new TrainRateDto();
-            preWorkDto3.setTypeName("质量管理");
-            preWorkDto3.setTypeNum("0");
-            preWorkDto3.setRate("0.00");
-            yearProWorkDtoList.add(preWorkDto1);
-            yearProWorkDtoList.add(preWorkDto2);
-            yearProWorkDtoList.add(preWorkDto3);
             yearPreWorkDto.setYearPreWorkTotal(0);
-            yearPreWorkDto.setYearProWorkDtoList(yearProWorkDtoList);
+            yearPreWorkDto.setYearProWorkDtoList(new ArrayList<>(Arrays.asList(TrainRateDto.TYPELIST)));
         }
         this.yearPreWorkDto = yearPreWorkDto;
     }
@@ -70,24 +55,8 @@ public class TrainingDashBoardDTO {
 
     public void setTypeDto(TrainTypeDto typeDto) {
         if (BeanUtils.isEmpty(typeDto.getTypeDtoList())){
-            List<TrainRateDto> typeRatoList = new ArrayList<>();
-            TrainRateDto rateDto1 = new TrainRateDto();
-            rateDto1.setTypeName("体系文件修订");
-            rateDto1.setTypeNum("0");
-            rateDto1.setRate("0.00");
-            TrainRateDto rateDto2 = new TrainRateDto();
-            rateDto2.setTypeName("技术");
-            rateDto2.setTypeNum("0");
-            rateDto2.setRate("0.00");
-            TrainRateDto rateDto3 = new TrainRateDto();
-            rateDto3.setTypeName("质量管理");
-            rateDto3.setTypeNum("0");
-            rateDto3.setRate("0.00");
-            typeRatoList.add(rateDto1);
-            typeRatoList.add(rateDto2);
-            typeRatoList.add(rateDto3);
             typeDto.setTypeTotal(0);
-            typeDto.setTypeDtoList(typeRatoList);
+            typeDto.setTypeDtoList(new ArrayList<>(Arrays.asList(TrainRateDto.TYPELIST)));
         }
         this.typeDto = typeDto;
     }
@@ -98,29 +67,8 @@ public class TrainingDashBoardDTO {
 
     public void setObjectDto(TrainObjectDto objectDto) {
         if (BeanUtils.isEmpty(objectDto.getObjectDtoList())){
-            List<TrainRateDto> objectRateList = new ArrayList<>();
-            TrainRateDto rateDto1 = new TrainRateDto();
-            rateDto1.setTypeName("新员工");
-            rateDto1.setTypeNum("0");
-            rateDto1.setRate("0.00");
-            TrainRateDto rateDto2 = new TrainRateDto();
-            rateDto2.setTypeName("转岗人员");
-            rateDto2.setTypeNum("0");
-            rateDto2.setRate("0.00");
-            TrainRateDto rateDto3 = new TrainRateDto();
-            rateDto3.setTypeName("教学实习人员");
-            rateDto3.setTypeNum("0");
-            rateDto3.setRate("0.00");
-            TrainRateDto rateDto4 = new TrainRateDto();
-            rateDto4.setTypeName("在岗人员");
-            rateDto4.setTypeNum("0");
-            rateDto4.setRate("0.00");
-            objectRateList.add(rateDto1);
-            objectRateList.add(rateDto2);
-            objectRateList.add(rateDto3);
-            objectRateList.add(rateDto4);
             objectDto.setObjectTotal(0);
-            objectDto.setObjectDtoList(objectRateList);
+            objectDto.setObjectDtoList(new ArrayList<>(Arrays.asList(TrainRateDto.OBJECTLIST)));
         }
         this.objectDto = objectDto;
     }