anderx 1 год назад
Родитель
Сommit
a79dbb7b29

+ 8 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/UserClockDataBo.java

@@ -4,9 +4,17 @@ import java.util.List;
 
 public class UserClockDataBo {
     private String username;
+    private String jobNumber;
 
     private List<UserClockDataDetailsBo> list;
 
+    public String getJobNumber() {
+        return jobNumber;
+    }
+
+    public void setJobNumber(String jobNumber) {
+        this.jobNumber = jobNumber;
+    }
 
     public String getUsername() {
         return username;

+ 4 - 12
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -1017,25 +1017,17 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         System.out.println(title);
         String[] split = title.split(" ");
         String date =split[split.length - 1];
-        System.out.println(date);
-
-        //第二号生成信息
-        title2 = list.get(1).get(0);
-        System.out.println(title2);
         //标题
-        List<String> title3 = new ArrayList<>(list.get(3).values());
-        title3 = title3.subList(36, title3.size() - 1);
+        List<String> title3 = new ArrayList<>(list.get(2).values());
         System.out.println(title3);
         //最大标签
         int size = title3.size();
-        for (int i = 4; i < list.size() ; i++) {
+        for (int i = 3; i < list.size() ; i++) {
             Map map = list.get(i);
-            String name = (String) map.get(0);
-            List<String> list1 = new ArrayList<>();
             List list2 = new ArrayList<>(map.values());
-            list2 = list2.subList(36, list2.size() - 1);
             UserClockDataBo userClockDataBo = new UserClockDataBo();
-            userClockDataBo.setUsername(name);
+            userClockDataBo.setJobNumber((String) map.get(0));
+            userClockDataBo.setUsername((String) map.get(1));
             List<UserClockDataDetailsBo> ul = new ArrayList<>();
             int index = 0;
             int day = 0;