Browse Source

5555555555

zhoulisky 5 months ago
parent
commit
0e8e94cf99

+ 4 - 4
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/AttendanceServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.BufferedInputStream;
 import java.io.OutputStream;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -255,7 +256,7 @@ public class AttendanceServiceImpl extends BaseServiceImpl<AttendanceMapper, Att
 		//第二行:周几行
 		for (int i = 1; i <= daysInMonth; i++) {
 			LocalDate date = LocalDate.of(year, month, i);
-			verticalHeaderRow.add(date.format(weekFormatter).substring(1));
+			verticalHeaderRow.add(" "+date.format(weekFormatter).substring(1) + " ");
 		}
 		verticalHeaderRow.add("本月出勤/小时");
 		verticalHeaderRow.add("本月出勤/天");
@@ -293,11 +294,10 @@ public class AttendanceServiceImpl extends BaseServiceImpl<AttendanceMapper, Att
 
 			// 每日考勤数据
 			Map<String, Double> dailyMap = new HashMap<>();
-			if (attendance.getDailyAttendances() != null) {
 				for (DailyAttendance daily : attendance.getDailyAttendances()) {
-					dailyMap.put(daily.getWorkDate(), daily.getWorkHours());
+					DecimalFormat df = new DecimalFormat("#.0");
+					dailyMap.put(daily.getWorkDate(), Double.parseDouble(df.format(daily.getWorkHours())));
 				}
-			}
 
 			for (int day = 1; day <= daysInMonth; day++) {
 				LocalDate currentDate = LocalDate.of(year, month, day);

+ 0 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/TechnicianServiceImpl.java

@@ -204,7 +204,6 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 			technician.setNumber(Func.isBlank(excel.getNumber()) ? null : technician.getNumber().trim());
 			technician.setIdCard(Func.isBlank(technician.getIdCard()) ? null : technician.getIdCard().trim());
 
-
 			if (Func.isNotBlank(excel.getDepartment())) {
 				List<String> tmpList = Arrays.asList(excel.getDepartment().split("/"));
 				String department = null;

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmTechnicianHoursServiceImpl.java

@@ -399,7 +399,7 @@ public class XmTechnicianHoursServiceImpl extends BaseServiceImpl<XmTechnicianHo
 		//第二行:周几行
 		for (int i = 1; i <= daysInMonth; i++) {
 			LocalDate date = LocalDate.of(year, month, i);
-			verticalHeaderRow.add(date.format(weekFormatter).substring(1));
+			verticalHeaderRow.add(" "+date.format(weekFormatter).substring(1)+" ");
 		}
 		data.add(verticalHeaderRow);