From 8cbb4e01b9226b32797a48489c5e1b30da3e2110 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 13 四月 2026 15:01:32 +0800
Subject: [PATCH] 数采调整&人员考勤导出开发
---
inspect-server/src/main/java/com/ruoyi/inspect/task/SyncStaffAttendanceRecordSchedule.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/service/StaffAttendanceTrackingRecordService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/controller/StaffAttendanceController.java | 9
inspect-server/src/main/resources/static/staff_attendance_template.xlsx | 0
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 6
inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/StaffAttendanceHeaderWriteHandler.java | 105 ++++++++
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 6
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/CommentWriteHandler.java | 112 +++++++++
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 6
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderTemplateMapper.java | 2
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 4
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/StaffAttendanceTrackingRecordServiceImpl.java | 279 +++++++++++++++++++++-
inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceAnnotationTextExcelData.java | 34 ++
performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceExcelData.java | 88 +++++++
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 9
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java | 3
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 1
inspect-server/src/main/java/com/ruoyi/inspect/vo/StaffAttendanceVO.java | 4
21 files changed, 647 insertions(+), 35 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index 9a58b5b..04b4cc6 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -147,7 +147,6 @@
return Result.success(deviceService.selectDeviceByCode(id));
}
-
@ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
@PostMapping("/dataCollection")
public Result<?> dataAcquisition(HttpServletRequest request,@RequestBody DeviceCollectionDto dto) {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
index 8109ec0..4588c2a 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
@@ -39,4 +39,7 @@
@ApiModelProperty(value = "鎵规鍙�")
private String lotBatchNo;
+
+
+
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 1794195..65fdff7 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -237,11 +237,13 @@
// 鏁伴噰杩斿洖淇℃伅
Map<String, Object> map = new HashMap<>();
for (Device device : deviceList) {
-
Device device1 = deviceMapper.selectById(device.getId());
dto.setDbUserName(device1.getDbUserName());
dto.setDbPassword(device1.getDbPassword());
- dto.setDbTable(device1.getDbTable());
+ //NS-YL3141:鍝戦搩鐗囧叏鑷姩妫�娴嬪疄楠屽
+ if(!StringUtils.equals(device1.getManagementNumber(),"NS-YL3141")){
+ dto.setDbTable(device1.getDbTable());
+ }
String ip = device.getIp();
// 鏍规嵁妫�楠岄」鑾峰彇config
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 8e600f3..b74fa55 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -82,6 +82,8 @@
String mdbEntrustCode = StringUtils.isNotBlank(device.getEntrustCode())?device.getEntrustCode():"";
String mdbSampleCode = StringUtils.isNotBlank(device.getSampleCode())?device.getSampleCode():"";
String dbFileName = StringUtils.isNotBlank(device.getDbFileName())?device.getDbFileName():"";
+ String colorTag = StringUtils.isNotBlank(cableTag)?cableTag:"";
+ String lotBatchNoStr = StringUtils.isNotBlank(lotBatchNo)?lotBatchNo:"";
String http = HTTP + ip + GETFILE +
"?filePath=" + device.getCollectUrl() +
"&fileExtension=" + device.getFileType() +
@@ -92,8 +94,8 @@
"&dbFileName=" + dbFileName +
"&dbUserName=" + dbUserName +
"&dbPassword=" + dbPassword +
- "&lotBatchNo=" + lotBatchNo +
- "&cableTag=" + cableTag +
+ "&lotBatchNo=" + lotBatchNoStr +
+ "&cableTag=" + colorTag +
"&dbTable=" + dbTable;
System.out.println("璇锋眰鐨� URL: " + http);
String result = null;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/StaffAttendanceController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/StaffAttendanceController.java
index 5ba227c..5a367e6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/StaffAttendanceController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/StaffAttendanceController.java
@@ -9,6 +9,7 @@
import com.ruoyi.inspect.dto.StaffAttendanceDTO;
import com.ruoyi.inspect.pojo.StaffAttendanceTrackingRecord;
import com.ruoyi.inspect.service.StaffAttendanceTrackingRecordService;
+import com.ruoyi.performance.dto.AuxiliaryOriginalHoursLookDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
@@ -16,6 +17,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.Arrays;
@@ -78,4 +80,11 @@
return Result.success(trackingRecordService.updateById(trackingRecord));
}
+
+ @ApiOperation("瀵煎嚭鑰冨嫟璁板綍")
+ @GetMapping("/exportStaffAttendanceRecords")
+ public void exportStaffAttendanceRecords(HttpServletResponse response, StaffAttendanceDTO staffAttendanceDTO){
+ trackingRecordService.exportStaffAttendanceRecords(response,staffAttendanceDTO);
+ }
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceAnnotationTextExcelData.java b/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceAnnotationTextExcelData.java
new file mode 100644
index 0000000..9e8d4eb
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceAnnotationTextExcelData.java
@@ -0,0 +1,34 @@
+package com.ruoyi.inspect.excel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 浜哄憳鑰冨嫟瀵煎嚭锛屾壒娉ㄤ笅鏍囧璞�
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StaffAttendanceAnnotationTextExcelData {
+
+ /**
+ * 鍒椾笅鏍�
+ */
+ @ApiModelProperty("鍒椾笅鏍�")
+ private int rowIndex;
+
+ /**
+ * 鍒椾笅鏍�
+ */
+ @ApiModelProperty("鍒椾笅鏍�")
+ private int cellIndex;
+
+ /**
+ * 鎵规敞鏂囨湰
+ */
+ @ApiModelProperty("鎵规敞鏂囨湰")
+ private String annotationText;
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceExcelData.java b/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceExcelData.java
new file mode 100644
index 0000000..7a418bc
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/excel/StaffAttendanceExcelData.java
@@ -0,0 +1,88 @@
+package com.ruoyi.inspect.excel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浜哄憳鑰冨嫟璁板綍瀵煎嚭灏佽瀵硅薄
+ */
+@Data
+public class StaffAttendanceExcelData {
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty("搴忓彿")
+ private Integer excelIndex;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ private String personName;
+
+
+ /**
+ * 鐝鑰冨嫟鍒楄〃
+ */
+ @ApiModelProperty("鐝鑰冨嫟鍒楄〃")
+ private List<String> shiftList;
+
+ /**
+ * 浼戞伅澶╂暟
+ */
+ @ApiModelProperty("浼戞伅澶╂暟")
+ private Integer holidayCount;
+
+ /**
+ * 浜嬪亣澶╂暟
+ */
+ @ApiModelProperty("浜嬪亣澶╂暟")
+ private Integer personalLeaveCount;
+
+ /**
+ * 骞村亣澶╂暟
+ */
+ @ApiModelProperty("骞村亣澶╂暟")
+ private Integer annualLeaveCount;
+
+ /**
+ * 鍏樊澶╂暟
+ */
+ @ApiModelProperty("鍏樊澶╂暟")
+ private Integer officialTripCount;
+
+ /**
+ * 濠氬亣澶╂暟
+ */
+ @ApiModelProperty("濠氬亣澶╂暟")
+ private Integer marriageLeaveCount;
+
+ /**
+ * 涓у亣澶╂暟
+ */
+ @ApiModelProperty("涓у亣澶╂暟")
+ private Integer bereavementLeaveCount;
+
+ /**
+ * 鐥呭亣澶╂暟
+ */
+ @ApiModelProperty("鐥呭亣澶╂暟")
+ private Integer sickLeaveCount;
+
+ /**
+ * 鍑哄嫟澶╂暟
+ */
+ @ApiModelProperty("鍑哄嫟澶╂暟")
+ private Integer attendanceDayCount;
+
+ /**
+ * 鍑哄嫟鎬绘椂闂�
+ */
+ @ApiModelProperty("鍑哄嫟鎬绘椂闂�")
+ private Double attendanceWorkHourCount;
+
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/CommentWriteHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/CommentWriteHandler.java
new file mode 100644
index 0000000..6a469f5
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/CommentWriteHandler.java
@@ -0,0 +1,112 @@
+package com.ruoyi.inspect.excel.handler;
+
+import com.alibaba.excel.util.BooleanUtils;
+import com.alibaba.excel.write.handler.RowWriteHandler;
+import com.alibaba.excel.write.handler.context.RowWriteHandlerContext;
+import com.ruoyi.inspect.excel.StaffAttendanceAnnotationTextExcelData;
+import com.ruoyi.inspect.excel.StaffAttendanceExcelData;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 浜哄憳鑰冨嫟瀵煎嚭鍐欏叆澶勭悊鍣�
+ * 1. 琛ラ綈妯℃澘涓笉瀛樺湪鐨勭彮娆℃槑缁嗗崟鍏冩牸
+ * 2. 鍦ㄥ搴斿崟鍏冩牸涓婂啓鍏ユ壒娉�
+ */
+public class CommentWriteHandler implements RowWriteHandler {
+
+ /**
+ * 妯℃澘鏁版嵁璧峰琛屼负绗� 5 琛�
+ */
+ private static final int DATA_START_ROW_INDEX = 4;
+
+ /**
+ * 妯℃澘鐝璧峰鍒椾负 C 鍒�
+ */
+ private static final int DATA_START_COLUMN_INDEX = 2;
+
+ private final List<StaffAttendanceExcelData> excelDataList;
+
+ private final Map<String, String> annotationTextMap = new HashMap<>();
+
+ public CommentWriteHandler(List<StaffAttendanceExcelData> excelDataList,
+ List<StaffAttendanceAnnotationTextExcelData> annotationTextList) {
+ this.excelDataList = excelDataList == null ? Collections.emptyList() : excelDataList;
+ if (annotationTextList == null) {
+ return;
+ }
+ annotationTextList.stream()
+ .filter(item -> item != null && StringUtils.isNotBlank(item.getAnnotationText()))
+ .forEach(item -> annotationTextMap.put(buildKey(item.getRowIndex(), item.getCellIndex()),
+ item.getAnnotationText()));
+ }
+
+ @Override
+ public void afterRowDispose(RowWriteHandlerContext context) {
+ if (BooleanUtils.isTrue(context.getHead())) {
+ return;
+ }
+ Row row = context.getRow();
+ if (row == null || row.getRowNum() < DATA_START_ROW_INDEX) {
+ return;
+ }
+ int dataIndex = row.getRowNum() - DATA_START_ROW_INDEX;
+ if (dataIndex < 0 || dataIndex >= excelDataList.size()) {
+ return;
+ }
+ StaffAttendanceExcelData excelData = excelDataList.get(dataIndex);
+ if (excelData == null || excelData.getShiftList() == null) {
+ return;
+ }
+
+ Sheet sheet = row.getSheet();
+ CellStyle cellStyle = sheet.getColumnStyle(DATA_START_COLUMN_INDEX);
+ Drawing<?> drawingPatriarch = null;
+ List<String> shiftList = excelData.getShiftList();
+ for (int i = 0; i < shiftList.size(); i++) {
+ int cellIndex = DATA_START_COLUMN_INDEX + i;
+ Cell cell = row.getCell(cellIndex);
+ if (cell == null) {
+ cell = row.createCell(cellIndex);
+ }
+ if (cellStyle != null) {
+ cell.setCellStyle(cellStyle);
+ }
+ String cellValue = shiftList.get(i);
+ if (StringUtils.isNotBlank(cellValue)) {
+ cell.setCellValue(cellValue);
+ }
+
+ String annotationText = annotationTextMap.get(buildKey(dataIndex, i));
+ if (StringUtils.isBlank(annotationText) || cell.getCellComment() != null) {
+ continue;
+ }
+ if (drawingPatriarch == null) {
+ drawingPatriarch = sheet.createDrawingPatriarch();
+ }
+ Comment comment = drawingPatriarch.createCellComment(new XSSFClientAnchor(
+ 0, 0, 0, 0,
+ cellIndex, row.getRowNum(),
+ cellIndex + 2, row.getRowNum() + 3));
+ comment.setString(new XSSFRichTextString(annotationText));
+ comment.setAuthor("NS-LIMS");
+ cell.setCellComment(comment);
+ }
+ }
+
+ private String buildKey(int rowIndex, int cellIndex) {
+ return rowIndex + "_" + cellIndex;
+ }
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/StaffAttendanceHeaderWriteHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/StaffAttendanceHeaderWriteHandler.java
new file mode 100644
index 0000000..cd086d5
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/excel/handler/StaffAttendanceHeaderWriteHandler.java
@@ -0,0 +1,105 @@
+package com.ruoyi.inspect.excel.handler;
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 浜哄憳鑰冨嫟瀵煎嚭鍔ㄦ�佽〃澶村鐞嗗櫒
+ */
+public class StaffAttendanceHeaderWriteHandler implements SheetWriteHandler {
+
+ private static final int TITLE_ROW_INDEX = 1;
+
+ private static final int WEEK_ROW_INDEX = 2;
+
+ private static final int DAY_ROW_INDEX = 3;
+
+ private static final int START_COLUMN_INDEX = 2;
+
+ private static final int MAX_DATE_COLUMN_COUNT = 31;
+
+ private static final DateTimeFormatter TITLE_FORMATTER = DateTimeFormatter.ofPattern("yyyy骞碝鏈�");
+
+ private final List<LocalDate> attendanceDateList;
+
+ public StaffAttendanceHeaderWriteHandler(List<LocalDate> attendanceDateList) {
+ this.attendanceDateList = attendanceDateList == null ? Collections.emptyList() : attendanceDateList;
+ }
+
+ @Override
+ public void afterSheetCreate(SheetWriteHandlerContext context) {
+ Sheet sheet = context.getWriteSheetHolder().getSheet();
+ if (sheet == null || attendanceDateList.isEmpty()) {
+ return;
+ }
+
+ Row titleRow = sheet.getRow(TITLE_ROW_INDEX);
+ if (titleRow != null) {
+ Cell titleCell = titleRow.getCell(0);
+ if (titleCell != null) {
+ titleCell.setCellValue(attendanceDateList.get(attendanceDateList.size() - 1).format(TITLE_FORMATTER));
+ }
+ }
+
+ Row weekRow = sheet.getRow(WEEK_ROW_INDEX);
+ Row dayRow = sheet.getRow(DAY_ROW_INDEX);
+ if (weekRow == null || dayRow == null) {
+ return;
+ }
+
+ for (int i = 0; i < MAX_DATE_COLUMN_COUNT; i++) {
+ Cell weekCell = getOrCreateCell(weekRow, START_COLUMN_INDEX + i);
+ Cell dayCell = getOrCreateCell(dayRow, START_COLUMN_INDEX + i);
+ if (i < attendanceDateList.size()) {
+ LocalDate currentDate = attendanceDateList.get(i);
+ weekCell.setCellValue(resolveWeekOfYear(currentDate));
+ dayCell.setCellValue(currentDate.getDayOfMonth());
+ } else {
+ weekCell.setBlank();
+ dayCell.setBlank();
+ }
+ }
+ }
+
+ private Cell getOrCreateCell(Row row, int cellIndex) {
+ Cell cell = row.getCell(cellIndex);
+ if (cell != null) {
+ return cell;
+ }
+ Cell templateCell = row.getCell(START_COLUMN_INDEX);
+ cell = row.createCell(cellIndex);
+ if (templateCell != null && templateCell.getCellStyle() != null) {
+ cell.setCellStyle(templateCell.getCellStyle());
+ }
+ return cell;
+ }
+
+ private String resolveWeekOfYear(LocalDate date) {
+ switch (date.getDayOfWeek()) {
+ case MONDAY:
+ return "涓�";
+ case TUESDAY:
+ return "浜�";
+ case WEDNESDAY:
+ return "涓�";
+ case THURSDAY:
+ return "鍥�";
+ case FRIDAY:
+ return "浜�";
+ case SATURDAY:
+ return "鍏�";
+ case SUNDAY:
+ return "鏃�";
+ default:
+ return "";
+ }
+ }
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderTemplateMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderTemplateMapper.java
index 6e064e5..60587f5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderTemplateMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderTemplateMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.inspect.pojo.InsOrderTemplate;
+import org.apache.ibatis.annotations.Mapper;
/**
* @author Administrator
@@ -9,6 +10,7 @@
* @createDate 2024-03-18 14:14:54
* @Entity com.yuanchu.mom.pojo.InsOrderTemplate
*/
+@Mapper
public interface InsOrderTemplateMapper extends BaseMapper<InsOrderTemplate> {
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 6d37b53..3e8dd07 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -224,6 +224,9 @@
@ApiModelProperty("闆朵欢鎻忚堪")
private String partDesc;
+ @ApiModelProperty("闆朵欢鍙�")
+ private String partNo;
+
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/StaffAttendanceTrackingRecordService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/StaffAttendanceTrackingRecordService.java
index 6d7a9cf..0008f3f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/StaffAttendanceTrackingRecordService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/StaffAttendanceTrackingRecordService.java
@@ -8,6 +8,7 @@
import com.ruoyi.inspect.vo.StaffAttendanceVO;
import com.ruoyi.performance.dto.PerformanceShiftMapDto;
+import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.List;
@@ -28,4 +29,5 @@
boolean saveOrUpdateRecord(StaffAttendanceDTO staffAttendanceDTO);
+ void exportStaffAttendanceRecords(HttpServletResponse response, StaffAttendanceDTO staffAttendanceDTO);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 2a87049..19d7e5f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -403,7 +403,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -498,7 +498,7 @@
insOrderMapper.insert(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -636,7 +636,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
return insOrder.getId();
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/StaffAttendanceTrackingRecordServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
index 27a6c78..b46865f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
@@ -2,12 +2,14 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.Result;
+import com.google.common.util.concurrent.AtomicDouble;
import com.ruoyi.common.enums.ClockInState;
import com.ruoyi.common.enums.EnterOrExitType;
import com.ruoyi.common.enums.SyncStatus;
@@ -15,13 +17,15 @@
import com.ruoyi.common.utils.api.icc.model.GetResultPageRequest;
import com.ruoyi.common.utils.api.icc.model.GetResultPageResponse;
import com.ruoyi.inspect.dto.StaffAttendanceDTO;
+import com.ruoyi.inspect.excel.StaffAttendanceAnnotationTextExcelData;
+import com.ruoyi.inspect.excel.StaffAttendanceExcelData;
+import com.ruoyi.inspect.excel.handler.CommentWriteHandler;
import com.ruoyi.inspect.mapper.StaffAttendanceTrackingRecordMapper;
import com.ruoyi.inspect.pojo.StaffAttendanceTrackingRecord;
import com.ruoyi.inspect.service.StaffAttendanceTrackingRecordService;
import com.ruoyi.inspect.util.HourDiffCalculator;
import com.ruoyi.inspect.util.TimeDiffCalculator;
import com.ruoyi.inspect.vo.StaffAttendanceVO;
-import com.ruoyi.inspect.vo.StaffClockInVO;
import com.ruoyi.performance.dto.PerformanceShiftMapDto;
import com.ruoyi.performance.mapper.PerformanceShiftMapper;
import com.ruoyi.performance.mapper.ShiftTimeMapper;
@@ -29,17 +33,27 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -75,6 +89,14 @@
// 鏁板瓧閮ㄥ垎鍥哄畾闀垮害
private static final int DIGIT_LENGTH = 6;
+
+ private static final String holidayLeaveKeyword = "浼�";//浼戝亣锛岃皟浼戝亣鐝鍏抽敭瀛�
+ private static final String personalLeaveKeyword = "浜�";//浜嬪亣鐝鍏抽敭瀛�
+ private static final String annualLeaveKeyword = "骞�";//骞村亣鐝鍏抽敭瀛�
+ private static final String officialTripKeyword = "鍏�";//鍏樊鐝鍏抽敭瀛�
+ private static final String marriageLeaveKeyword = "濠�";//濠氬亣鐝鍏抽敭瀛�
+ private static final String bereavementLeaveKeyword = "涓�";//涓у亣鐝鍏抽敭瀛�
+ private static final String sickLeaveKeyword = "鐥�";//鐥呭亣鐝鍏抽敭瀛�
/**
* 鍚屾鐨勯棬绂佽澶囧垪琛�
@@ -142,9 +164,13 @@
return true;
}
- @Override
- public IPage<StaffAttendanceVO> pageAttendanceRecord(Page<StaffAttendanceTrackingRecord> page,
- StaffAttendanceDTO staffAttendanceDTO) {
+ /**
+ * 鏌ヨ鑰冨嫟璁板綍
+ * @param performanceShifts 鐝淇℃伅
+ * @param staffAttendanceDTO 鑰冨嫟鏌ヨ鏉′欢
+ * @return
+ */
+ public List<StaffAttendanceVO> getAttendanceRecord(List<PerformanceShiftMapDto> performanceShifts,StaffAttendanceDTO staffAttendanceDTO) {
// 鏌ヨ鎵撳崱璁板綍
Wrapper<StaffAttendanceTrackingRecord> queryWrapper = Wrappers.<StaffAttendanceTrackingRecord>lambdaQuery()
.eq(StaffAttendanceTrackingRecord::getEnableReport, Boolean.TRUE)
@@ -155,9 +181,6 @@
.or()
.like(StaffAttendanceTrackingRecord::getPersonName, staffAttendanceDTO.getKeyword()));
List<StaffAttendanceTrackingRecord> recordList = baseMapper.selectList(queryWrapper);
- // 鏌ヨ鐝
- List<PerformanceShiftMapDto> performanceShifts = performanceShiftMapper.selectListByWorkTime(
- staffAttendanceDTO.getStartDate(), staffAttendanceDTO.getEndDate(), staffAttendanceDTO.getKeyword());
// 缁勮鏁版嵁
List<StaffAttendanceVO> resultList = new ArrayList<>();
for (int i = 0; i < performanceShifts.size(); i++) {
@@ -185,8 +208,7 @@
LocalDateTime currentShiftStartDateTime = LocalDateTime.of(p.getWorkTime().toLocalDate(),
currentShiftStartTime);
// 涓嬩竴鐝寮�濮嬫椂闂�
- LocalDateTime nextShiftStartDateTime = getShiftStartDateTime(i + 1, performanceShifts,
- startDateTime.plusDays(1L));
+ LocalDateTime nextShiftStartDateTime = getShiftStartDateTime(p.getPersonCode(), performanceShifts, startDateTime.plusDays(1L));
if (Double.compare(hourDiff, 0) == -1) {
// 濡傛灉灏忔椂宸负璐熸暟锛岃〃绀鸿法澶╋紝缁撴潫鏃堕棿闇�鍔犱竴
endDateTime = endDateTime.plusDays(1L);
@@ -258,6 +280,7 @@
vo.setPersonName(p.getUserName());
//搴斿嫟鏃堕暱
double plannedWorkHours = Math.abs(hourDiff);
+ vo.setDiffHour(hourDiff);
vo.setPlannedWorkHours(plannedWorkHours);
vo.setSwingDate(startDateTime);
vo.setWorkDateTime(workDateTime);
@@ -289,7 +312,16 @@
resultList.add(vo);
}
}
- return limitPages(page, resultList);
+ return resultList;
+ }
+
+ @Override
+ public IPage<StaffAttendanceVO> pageAttendanceRecord(Page<StaffAttendanceTrackingRecord> page,
+ StaffAttendanceDTO staffAttendanceDTO) {
+ // 鏌ヨ鐝
+ List<PerformanceShiftMapDto> performanceShifts = performanceShiftMapper.selectListByWorkTime(
+ staffAttendanceDTO.getStartDate(), staffAttendanceDTO.getEndDate(), staffAttendanceDTO.getKeyword());
+ return limitPages(page, getAttendanceRecord(performanceShifts,staffAttendanceDTO));
}
@Override
@@ -369,6 +401,208 @@
return this.saveOrUpdateBatch(records);
}
+ @Override
+ public void exportStaffAttendanceRecords(HttpServletResponse response, StaffAttendanceDTO staffAttendanceDTO) {
+ response.reset();
+ try{
+ List<LocalDate> attendanceDateList = buildAttendanceDateList(staffAttendanceDTO);
+ //鎵规敞淇℃伅鍧愭爣淇℃伅
+ List<StaffAttendanceAnnotationTextExcelData> annotationTextList = new ArrayList<>();
+ // 鏌ヨ鐝
+ List<PerformanceShiftMapDto> performanceShifts = performanceShiftMapper.selectListByWorkTime(
+ staffAttendanceDTO.getStartDate(), staffAttendanceDTO.getEndDate(), staffAttendanceDTO.getKeyword());
+ //鑾峰彇鑰冨嫟鏁版嵁
+ List<StaffAttendanceVO> attendanceRecords = getAttendanceRecord(performanceShifts,staffAttendanceDTO);
+ //缁勮瀵煎嚭鏁版嵁
+ List<StaffAttendanceExcelData> excelData = new ArrayList<>();
+ Map<Integer, List<PerformanceShiftMapDto>> groupByUserId = performanceShifts.stream().collect(Collectors.groupingBy(PerformanceShiftMapDto::getUserId));
+ List<Integer> userIdKeys = groupByUserId.keySet().stream().sorted().collect(Collectors.toList());
+ for (int i = 0; i < userIdKeys.size(); i++) {
+ List<PerformanceShiftMapDto> shiftMapDtos = groupByUserId.get(userIdKeys.get(i));
+ StaffAttendanceExcelData attendanceExcelData = new StaffAttendanceExcelData();
+ attendanceExcelData.setExcelIndex(i+1);
+ List<String> shiftList = new ArrayList<>();
+ attendanceExcelData.setPersonName(shiftMapDtos.get(0).getUserName());
+ AtomicInteger holidayCount = new AtomicInteger(0);//浼戞伅澶╂暟
+ AtomicInteger personalLeaveCount = new AtomicInteger(0);//浜嬪亣澶╂暟
+ AtomicInteger annualLeaveCount = new AtomicInteger(0);//骞村亣澶╂暟
+ AtomicInteger officialTripCount = new AtomicInteger(0);//鍏樊澶╂暟
+ AtomicInteger marriageLeaveCount = new AtomicInteger(0);//濠氬亣澶╂暟
+ AtomicInteger bereavementLeaveCount = new AtomicInteger(0);//涓у亣澶╂暟
+ AtomicInteger sickLeaveCount = new AtomicInteger(0);//鐥呭亣澶╂暟
+ AtomicInteger attendanceDayCount = new AtomicInteger(0);//鍑哄嫟澶╂暟
+ AtomicDouble attendanceWorkHourCount = new AtomicDouble(0D);//鍑哄嫟鎬绘椂闂�
+ for (int j = 0; j < shiftMapDtos.size(); j++) {
+ PerformanceShiftMapDto shiftMapDto = shiftMapDtos.get(j);
+ //缁熻鍚勫亣鏈熷拰鍏樊鐨勫ぉ鏁�
+ if(StringUtils.contains(shiftMapDto.getShiftName(),holidayLeaveKeyword)){
+ holidayCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),personalLeaveKeyword)){
+ personalLeaveCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),annualLeaveKeyword)){
+ annualLeaveCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),officialTripKeyword)){
+ officialTripCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),marriageLeaveKeyword)){
+ marriageLeaveCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),bereavementLeaveKeyword)){
+ bereavementLeaveCount.getAndIncrement();
+ }else if(StringUtils.contains(shiftMapDto.getShiftName(),sickLeaveKeyword)){
+ sickLeaveCount.getAndIncrement();
+ }
+ if(StringUtils.isAllBlank(shiftMapDto.getStartTime(),shiftMapDto.getEndTime())){
+ shiftList.add(shiftMapDto.getShiftName());
+ }else{
+ //杩囨护褰撳墠浜哄憳鐨勭彮娆′俊鎭�
+ StaffAttendanceVO vo = attendanceRecords.stream().filter(f->StringUtils.isNotBlank(f.getPersonCode())).filter(f -> StringUtils.equals(f.getPersonCode(), shiftMapDto.getPersonCode()) && f.getSwingDate().isEqual(shiftMapDto.getWorkTime())).findFirst().orElse(null);
+ if(ObjectUtils.isEmpty(vo)){
+ shiftList.add("");
+ }else{
+ String actualWorkHours = Objects.toString(vo.getActualWorkHours(), "");
+ Double diffHour = ObjectUtils.defaultIfNull(vo.getDiffHour(), 0D);
+ if (StringUtils.isBlank(actualWorkHours)) {
+ shiftList.add("");
+ } else {
+ shiftList.add(Double.compare(diffHour, 0D) < 0 ? "-" + actualWorkHours : actualWorkHours);
+ attendanceDayCount.getAndIncrement();
+ attendanceWorkHourCount.getAndAdd(Double.parseDouble(actualWorkHours));
+ }
+ }
+ }
+ if(StringUtils.isNotBlank(shiftMapDto.getAnnotationText())){
+ annotationTextList.add(new StaffAttendanceAnnotationTextExcelData(i,j,shiftMapDto.getAnnotationText()));
+ }
+ }
+ attendanceExcelData.setShiftList(shiftList);
+ attendanceExcelData.setAttendanceDayCount(attendanceDayCount.get());
+ attendanceExcelData.setAttendanceWorkHourCount(attendanceWorkHourCount.get());
+ //鐝鑰冨嫟澶╂暟
+ attendanceExcelData.setHolidayCount(holidayCount.get());
+ attendanceExcelData.setPersonalLeaveCount(personalLeaveCount.get());
+ attendanceExcelData.setAnnualLeaveCount(annualLeaveCount.get());
+ attendanceExcelData.setOfficialTripCount(officialTripCount.get());
+ attendanceExcelData.setMarriageLeaveCount(marriageLeaveCount.get());
+ attendanceExcelData.setBereavementLeaveCount(bereavementLeaveCount.get());
+ attendanceExcelData.setSickLeaveCount(sickLeaveCount.get());
+ excelData.add(attendanceExcelData);
+ }
+ //瀵煎嚭
+ String fileName = "涓ぉ鑰愪笣璐ㄩ噺鑰冨嫟姹囨��"+ ExcelTypeEnum.XLSX;
+ fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
+ response.setContentType("application/vnd.ms-excel");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ InputStream resourceAsStream = buildAttendanceTemplate(attendanceDateList);
+ EasyExcel.write(response.getOutputStream())
+ .withTemplate(resourceAsStream)
+ .registerWriteHandler(new CommentWriteHandler(excelData, annotationTextList))
+ .relativeHeadRowIndex(4)
+ .sheet()
+ .doFill(excelData);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private List<LocalDate> buildAttendanceDateList(StaffAttendanceDTO staffAttendanceDTO) {
+ if (staffAttendanceDTO == null || staffAttendanceDTO.getStartDate() == null || staffAttendanceDTO.getEndDate() == null) {
+ throw new IllegalArgumentException("瀵煎嚭鏃堕棿鑼冨洿涓嶈兘涓虹┖");
+ }
+ LocalDate startDate = staffAttendanceDTO.getStartDate().toLocalDate();
+ LocalDate endDate = staffAttendanceDTO.getEndDate().toLocalDate();
+ if (startDate.isAfter(endDate)) {
+ throw new IllegalArgumentException("寮�濮嬫椂闂翠笉鑳芥櫄浜庣粨鏉熸椂闂�");
+ }
+ List<LocalDate> attendanceDateList = new ArrayList<>();
+ for (LocalDate currentDate = startDate; !currentDate.isAfter(endDate); currentDate = currentDate.plusDays(1)) {
+ attendanceDateList.add(currentDate);
+ }
+ if (attendanceDateList.size() > 31) {
+ throw new IllegalArgumentException("瀵煎嚭鏃堕棿鑼冨洿涓嶈兘瓒呰繃31澶�");
+ }
+ return attendanceDateList;
+ }
+
+ private InputStream buildAttendanceTemplate(List<LocalDate> attendanceDateList) throws IOException {
+ try (InputStream templateStream = this.getClass().getResourceAsStream("/static/staff_attendance_template.xlsx");
+ Workbook workbook = WorkbookFactory.create(templateStream);
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+ Sheet sheet = workbook.getSheetAt(0);
+ fillAttendanceHeader(sheet, attendanceDateList);
+ workbook.write(outputStream);
+ return new ByteArrayInputStream(outputStream.toByteArray());
+ } catch (Exception e) {
+ throw new IOException("鏋勫缓鑰冨嫟瀵煎嚭妯℃澘澶辫触", e);
+ }
+ }
+
+ private void fillAttendanceHeader(Sheet sheet, List<LocalDate> attendanceDateList) {
+ if (sheet == null || attendanceDateList == null || attendanceDateList.isEmpty()) {
+ return;
+ }
+ Row titleRow = sheet.getRow(1);
+ if (titleRow != null) {
+ Cell titleCell = titleRow.getCell(0);
+ if (titleCell != null) {
+ titleCell.setCellValue(attendanceDateList.get(attendanceDateList.size() - 1).format(DateTimeFormatter.ofPattern("yyyy骞碝鏈�")));
+ }
+ }
+ Row weekRow = sheet.getRow(2);
+ Row dayRow = sheet.getRow(3);
+ if (weekRow == null || dayRow == null) {
+ return;
+ }
+ final int startColumnIndex = 2;
+ final int maxDateColumnCount = 31;
+ for (int i = 0; i < maxDateColumnCount; i++) {
+ Cell weekCell = getOrCreateCell(weekRow, startColumnIndex + i, startColumnIndex);
+ Cell dayCell = getOrCreateCell(dayRow, startColumnIndex + i, startColumnIndex);
+ if (i < attendanceDateList.size()) {
+ LocalDate currentDate = attendanceDateList.get(i);
+ weekCell.setCellValue(resolveWeekOfYear(currentDate));
+ dayCell.setCellValue(currentDate.getDayOfMonth());
+ } else {
+ weekCell.setBlank();
+ dayCell.setBlank();
+ }
+ }
+ }
+
+ private Cell getOrCreateCell(Row row, int cellIndex, int templateCellIndex) {
+ Cell cell = row.getCell(cellIndex);
+ if (cell != null) {
+ return cell;
+ }
+ Cell templateCell = row.getCell(templateCellIndex);
+ cell = row.createCell(cellIndex);
+ if (templateCell != null && templateCell.getCellStyle() != null) {
+ cell.setCellStyle(templateCell.getCellStyle());
+ }
+ return cell;
+ }
+
+ private String resolveWeekOfYear(LocalDate date) {
+ switch (date.getDayOfWeek()) {
+ case MONDAY:
+ return "涓�";
+ case TUESDAY:
+ return "浜�";
+ case WEDNESDAY:
+ return "涓�";
+ case THURSDAY:
+ return "鍥�";
+ case FRIDAY:
+ return "浜�";
+ case SATURDAY:
+ return "鍏�";
+ case SUNDAY:
+ return "鏃�";
+ default:
+ return "";
+ }
+ }
+
/**
* 鑷畾涔夊垎椤垫柟娉�
*
@@ -416,20 +650,23 @@
}
/**
- * 鑾峰彇鎸囧畾涓嬫爣鐨勭彮娆″紑濮嬫椂闂�
- *
- * @param index
- * @param dtoList
+ * 鑾峰彇褰撳墠鐝鏃ユ湡鐨勪笅涓�鐝寮�濮嬫椂闂�
+ * @param personCode 浜哄憳缂栧彿
+ * @param dtoList 鐝鍒楄〃
+ * @param nextShiftTime 涓嬩竴鐝鏃堕棿
* @return
*/
- private LocalDateTime getShiftStartDateTime(int index, List<PerformanceShiftMapDto> dtoList,
- LocalDateTime nextShiftTime) {
- if (dtoList.isEmpty() || index >= dtoList.size()) {
+ private LocalDateTime getShiftStartDateTime(String personCode,List<PerformanceShiftMapDto> dtoList, LocalDateTime nextShiftTime) {
+ if (dtoList.isEmpty()) {
return LocalDateTime.of(nextShiftTime.toLocalDate(), LocalTime.MAX);
}
- LocalTime localTime = ObjectUtil.isNull(dtoList.get(index).getStartTime()) ? LocalTime.MAX
- : LocalTime.parse(dtoList.get(index).getStartTime(), HHmm);
- return LocalDateTime.of(nextShiftTime.toLocalDate(), localTime);
+ //杩囨护褰撳墠浜哄憳鐨勪笅涓�鐝淇℃伅
+ PerformanceShiftMapDto shiftMapDto = dtoList.stream().filter(f -> StringUtils.equals(f.getPersonCode(), personCode) && f.getWorkTime().isEqual(nextShiftTime)).findFirst().orElse(new PerformanceShiftMapDto());
+ if(StringUtils.isEmpty(shiftMapDto.getStartTime())){
+ return LocalDateTime.of(nextShiftTime.toLocalDate(), LocalTime.MAX);
+ }
+ LocalTime nextShiftStartTime = LocalTime.parse(shiftMapDto.getStartTime(), HHmm);
+ return LocalDateTime.of(nextShiftTime.toLocalDate(), nextShiftStartTime);
}
/**
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/task/SyncStaffAttendanceRecordSchedule.java b/inspect-server/src/main/java/com/ruoyi/inspect/task/SyncStaffAttendanceRecordSchedule.java
index fc95b46..1c5e560 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/task/SyncStaffAttendanceRecordSchedule.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/task/SyncStaffAttendanceRecordSchedule.java
@@ -22,8 +22,7 @@
@Autowired
private StaffAttendanceTrackingRecordService trackingRecordService;
-
- @Scheduled(cron = "0 0 */12 * * ?")
+ @Scheduled(cron = "0 0 0,12 * * ?")
public void sync() {
log.info("--------鍚屾鑰冨嫟璁板綍瀹氭椂浠诲姟寮�濮�--------");
LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Shanghai")).minusDays(1L);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
index 46595ea..a39fbb0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
@@ -44,4 +44,7 @@
@ApiModelProperty("璁㈠崟鐘舵��")
private Integer insState;
+ @ApiModelProperty("闆朵欢棰滆壊")
+ private String partColor;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/StaffAttendanceVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/StaffAttendanceVO.java
index 8bbb11c..cc2176e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/StaffAttendanceVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/StaffAttendanceVO.java
@@ -99,5 +99,9 @@
private LocalDateTime updateTime;
+ /**
+ * 鐝鏃堕棿宸紝鍒ゆ柇鐝鏄惁璺ㄥぉ
+ */
+ private Double diffHour;
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 2fa7666..667f233 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -396,12 +396,14 @@
io2.entrust_code,
io2.test_quantity,
io2.ins_state,
+ sto.color AS part_color,
JSON_OBJECT(
'sample_name', io2.sample_view,
'entrust_code', io2.entrust_code
) labelBarCode
from ins_order io2
- LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
+ LEFT JOIN ins_sample isa ON io2.id = isa.ins_order_id
+ LEFT JOIN structure_test_object_part sto ON sto.part_no = io2.part_no COLLATE utf8mb4_general_ci
where type_source = -1
GROUP BY io2.id) a
where insOrderId in
diff --git a/inspect-server/src/main/resources/static/staff_attendance_template.xlsx b/inspect-server/src/main/resources/static/staff_attendance_template.xlsx
new file mode 100644
index 0000000..1872cea
--- /dev/null
+++ b/inspect-server/src/main/resources/static/staff_attendance_template.xlsx
Binary files differ
diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
index adf7a1b..6af2f1e 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
@@ -45,4 +45,7 @@
@ApiModelProperty("鐝缁撴潫鏃堕棿")
private String endTime;
+ @ApiModelProperty("鐝鍚嶇О")
+ private String shiftName;
+
}
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 381ef69..8fa884c 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -154,10 +154,13 @@
u.name AS user_name,
u.account AS person_code,
st.start_time,
- st.end_time
+ st.end_time,
+ sd.dict_label AS shift_name,
+ ps.annotation_text
FROM performance_shift ps
- LEFT JOIN user u ON ps.user_id = u.id
+ inner JOIN user u ON ps.user_id = u.id
LEFT JOIN shift_time st ON ps.shift = st.shift
+ left join sys_dict_data sd on ps.shift = sd.dict_value AND sd.dict_type='sys_class_type'
<where>
<if test="startTime!=null and endTime!=null">
AND ps.work_time BETWEEN #{startTime} AND #{endTime}
@@ -166,6 +169,6 @@
AND (u.account like concat('%',#{keyword},'%') OR u.name like concat('%',#{keyword},'%'))
</if>
</where>
- ORDER BY ps.work_time
+ ORDER BY ps.work_time,ps.user_id
</select>
</mapper>
--
Gitblit v1.9.3