From fe97e3191aaa5f5db104541946f6ac7937e46e15 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 四月 2026 16:10:17 +0800
Subject: [PATCH] 人员考勤统计调整&原材料下单导出检验项详情
---
performance-server/src/main/resources/mapper/StaffAttendanceTrackingRecordMapper.xml | 3
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java | 3
performance-server/src/main/java/com/ruoyi/performance/controller/StaffAttendanceController.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/enums/StaffWorkStateFlag.java | 21 +++++
inspect-server/src/main/java/com/ruoyi/inspect/vo/ProductVo.java | 98 ++++++++++++++++++++++--
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 8 +
performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java | 15 +--
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 20 ++--
basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java | 14 +-
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 33 ++++++++
performance-server/src/main/java/com/ruoyi/performance/pojo/StaffAttendanceTrackingRecord.java | 5 +
11 files changed, 184 insertions(+), 37 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index f8c0db4..624c48b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -19,7 +19,7 @@
/**
* 濮旀墭缂栧彿
*/
- @ExcelProperty(index = 2, value = "濮旀墭缂栧彿")
+ @ExcelProperty(index = 1, value = "濮旀墭缂栧彿")
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
@@ -32,11 +32,11 @@
@ApiModelProperty("閿�鍞鍗曞垎绫诲悕绉�")
private String orderTypeName;
- @ExcelProperty(index = 7, value = "鏍峰搧鍚嶇О")
+ @ExcelProperty(index = 6, value = "鏍峰搧鍚嶇О")
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sampleName;
- @ExcelProperty(index = 8, value = "鏍峰搧鍨嬪彿")
+ @ExcelProperty(index = 7, value = "鏍峰搧鍨嬪彿")
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
@@ -90,21 +90,21 @@
@ApiModelProperty("鍒涘缓浜�")
private Integer createUser;
- @ExcelProperty(index = 9, value = "妫�楠屼汉")
+ @ExcelProperty(index = 8, value = "妫�楠屼汉")
@ApiModelProperty("妫�楠屼汉")
private String userName;
- @ExcelProperty(index = 10, value = "涓嬪彂鏃堕棿")
+ @ExcelProperty(index = 9, value = "涓嬪彂鏃堕棿")
private String sendTimeString;
- @ExcelProperty(index = 14, value = "鎺ユ敹鏃堕棿")
+ @ExcelProperty(index = 13, value = "鎺ユ敹鏃堕棿")
private String receiverDateString;
- @ExcelProperty(index = 15, value = "鎶ユ鏃堕棿")
+ @ExcelProperty(index = 14, value = "鎶ユ鏃堕棿")
private String declareDateString;
// 鍚堟牸鐘舵��,: 0 妫�楠屼腑, 1鍚堟牸, 2涓嶅悎鏍�, 3鏈笅鍗�,4璁╂鏀捐
- @ExcelProperty(index = 6, value = "妫�楠岀姸鎬�")
+ @ExcelProperty(index = 5, value = "妫�楠岀姸鎬�")
private String inspectStatusString;
@ApiModelProperty("鎶ユ寮�濮嬫椂闂�")
@@ -114,12 +114,12 @@
private String endDeclareDate;
@ApiModelProperty("涓嶅悎鏍兼弿杩�")
- @ExcelProperty(index = 16, value = "涓嶅悎鏍兼弿杩�")
+ @ExcelProperty(index = 15, value = "涓嶅悎鏍兼弿杩�")
private String unqualifiedDesc;
@ApiModelProperty("涓嶅悎鏍奸」")
- @ExcelProperty(index = 17, value = "涓嶅悎鏍奸」")
+ @ExcelProperty(index = 16, value = "涓嶅悎鏍奸」")
private String unqualifiedItem;
@ApiModelProperty("鍏嶆")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
index 9c3a4d7..f9ae81c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
@@ -23,7 +23,7 @@
@ApiModelProperty("鍩�")
private String contract;
- @ExcelProperty(index = 13, value = "璁㈠崟鍙�")
+ @ExcelProperty(index = 12, value = "璁㈠崟鍙�")
@ApiModelProperty("璁㈠崟鍙�")
private String orderNo;
@@ -42,11 +42,11 @@
@ApiModelProperty("鎺ユ敹鍙�")
private Integer receiptNo;
- @ExcelProperty(index = 3, value = "闆朵欢鍙�")
+ @ExcelProperty(index = 2, value = "闆朵欢鍙�")
@ApiModelProperty("闆朵欢鍙�")
private String partNo;
- @ExcelProperty(index = 4, value = "闆朵欢鎻忚堪")
+ @ExcelProperty(index = 3, value = "闆朵欢鎻忚堪")
@ApiModelProperty("闆朵欢鎻忚堪")
private String partDesc;
@@ -56,7 +56,7 @@
@ApiModelProperty("鐘舵��(IFS鍘熸湰鎷夊彇鐨勭姸鎬�)")
private String statusDb;
- @ExcelProperty(index = 11, value = "鎶佃揪鐨勯噰璐暟閲�")
+ @ExcelProperty(index = 10, value = "鎶佃揪鐨勯噰璐暟閲�")
@ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
private BigDecimal qtyArrived;
@@ -69,7 +69,7 @@
@ApiModelProperty("渚涘簲鍟嗙紪鍙�")
private String supplierId;
- @ExcelProperty(index = 5, value = "渚涘簲鍟嗗悕绉�")
+ @ExcelProperty(index = 4, value = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
@@ -142,7 +142,7 @@
@ApiModelProperty("閲囪喘璁㈠崟琛屽娉�")
private String lineRemarks;
- @ExcelProperty(index = 12, value = "鍗曚綅")
+ @ExcelProperty(index = 11, value = "鍗曚綅")
@ApiModelProperty("鍗曚綅")
private String buyUnitMeas;
@@ -189,7 +189,7 @@
private Integer isQuarter;
// 淇敼鍚庣殑
- @ExcelProperty(index = 1, value = "鎵瑰彿")
+ @ExcelProperty(index = 0, value = "鎵瑰彿")
@ApiModelProperty("鎵瑰彿")
private String updateBatchNo;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
index 6b87a62..9ad0dce 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
@@ -8,6 +8,7 @@
import com.ruoyi.inspect.dto.SampleProductRawAnalysisDto;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsProductDeviationWarningDetail;
+import com.ruoyi.inspect.vo.ProductVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -79,6 +80,8 @@
* @return
*/
List<InsProductDeviationWarningDetail> selectAnalysis(@Param("insProduct") InsProduct insProduct, @Param("supplierName") String supplierName);
+
+ List<ProductVo> selectInspectListByIfsIfs(@Param("ifsIds") List<Long> ifsIds);
}
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 19d7e5f..798ccdc 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
@@ -51,6 +51,7 @@
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
+import com.ruoyi.inspect.vo.ProductVo;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import com.ruoyi.system.mapper.UserMapper;
@@ -783,6 +784,9 @@
}
}
+ //鏌ヨ妫�楠岄」璁板綍
+ List<Long> ifsIds = ifsByOverList.stream().map(IfsInventoryQuantitySupplierDto::getId).collect(Collectors.toList());
+ List<ProductVo> inspectList = insProductMapper.selectInspectListByIfsIfs(ifsIds);
response.setContentType("application/vnd.ms-excel");
@@ -794,10 +798,12 @@
//鏂板缓ExcelWriter
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
//鑾峰彇sheet0瀵硅薄
- WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭鍑�").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭�昏").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet inspectSheet = EasyExcel.writerSheet(1, "鍘熸潗鏂欐娴嬫暟鎹鎯�").head(ProductVo.class).build();
//鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
excelWriter.write(ifsByOverList, mainSheet);
+ excelWriter.write(inspectList, inspectSheet);
//鍏抽棴娴�
excelWriter.finish();
} catch (IOException e) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/ProductVo.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/ProductVo.java
index bb99385..0a0db0a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/ProductVo.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/ProductVo.java
@@ -1,22 +1,102 @@
package com.ruoyi.inspect.vo;
-import com.ruoyi.inspect.pojo.InsProduct;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ProductVo {
- //绠¤壊鏍�
- private String bushColor;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ExcelProperty(value = "璁㈠崟鍙�",index = 0)
+ @ApiModelProperty("璁㈠崟鍙�")
+ private String orderNo;
- //鍏夌氦鑹叉爣
- private String color;
+ /**
+ * 鎵规鍙�
+ */
+ @ExcelProperty(value = "鎵规鍙�",index = 1)
+ @ApiModelProperty("鎵规鍙�")
+ private String updateBatchNo;
- //鍏夌氦甯︾紪鍙�
- private String code;
+ /**
+ * 闆朵欢鍙�
+ */
+ @ExcelProperty(value = "闆朵欢鍙�",index = 2)
+ @ApiModelProperty("闆朵欢鍙�")
+ private String partNo;
- //妫�楠岄」鐩�
- private InsProduct insProduct;
+ /**
+ * 闆朵欢鎻忚堪
+ */
+ @ExcelProperty(value = "闆朵欢鎻忚堪",index = 3)
+ @ApiModelProperty("闆朵欢鎻忚堪")
+ private String partDesc;
+
+ /**
+ * 濮旀墭缂栧彿
+ */
+ @ExcelProperty(value = "濮旀墭缂栧彿",index = 4)
+ @ApiModelProperty("濮旀墭缂栧彿")
+ private String entrustCode ;
+
+ /**
+ * 鏍峰搧缂栧彿
+ */
+ @ExcelProperty(value = "鏍峰搧缂栧彿",index = 5)
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ /**
+ * 妫�楠岄」
+ */
+ @ExcelProperty(value = "妫�楠岄」",index = 6)
+ @ApiModelProperty("妫�楠岄」")
+ private String inspectionItem;
+
+ /**
+ * 妫�楠屽瓙椤�
+ */
+ @ExcelProperty(value = "妫�楠屽瓙椤�",index = 7)
+ @ApiModelProperty("妫�楠屽瓙椤�")
+ private String inspectionItemSubclass;
+
+ /**
+ * 鏍囧噯瑕佹眰
+ */
+ @ExcelProperty(value = "鏍囧噯瑕佹眰",index = 8)
+ @ApiModelProperty("鏍囧噯瑕佹眰")
+ private String tell;
+
+ /**
+ * 妫�楠屽��
+ */
+ @ExcelProperty(value = "妫�楠屽��",index = 9)
+ @ApiModelProperty("妫�楠屽��")
+ private String lastValue;
+
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ @ExcelProperty(value = "妫�楠岀粨鏋�",index = 10)
+ @ApiModelProperty("妫�楠岀粨鏋�")
+ private String insResult;
+
+ /**
+ * 妫�楠屼汉
+ */
+ @ExcelProperty(value = "妫�楠屼汉",index = 11)
+ @ApiModelProperty("妫�楠屼汉")
+ private String name;
+
+ /**
+ * 妫�楠屾椂闂�
+ */
+ @ExcelProperty(value = "妫�楠屾椂闂�",index = 12)
+ @ApiModelProperty("妫�楠屾椂闂�")
+ private String createTime;
}
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 5299c2b..5bc29db 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -172,4 +172,37 @@
order by io.first_submit_date desc
limit 10
</select>
+ <select id="selectInspectListByIfsIfs" resultType="com.ruoyi.inspect.vo.ProductVo">
+ select
+ iiq.order_no,
+ iiq.update_batch_no,
+ iiq.part_no,
+ iiq.part_desc,
+ io.entrust_code ,
+ isa.sample_code,
+ ip.inspection_item,
+ ip.inspection_item_subclass,
+ ip.tell,
+ ip.`last_value`,
+ case
+ when ip.ins_result = 0 then '涓嶅悎鏍�'
+ when ip.ins_result = 1 then '鍚堟牸'
+ when ip.ins_result = 3 then '涓嶅垽瀹�'
+ else ''
+ end AS ins_result,
+ u.name,
+ ipr.create_time
+ from ifs_inventory_quantity iiq
+ inner join ins_order io on iiq.id = io.ifs_inventory_id
+ left join ins_sample isa on io.id = isa.ins_order_id
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ inner join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join user u on ipr.create_user = u.id
+ WHERE
+ iiq.id in
+ <foreach collection="ifsIds" item="ifsId" separator="," open="(" close=")">
+ #{ifsId}
+ </foreach>
+ AND ip.state = 1
+ </select>
</mapper>
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/StaffAttendanceController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/StaffAttendanceController.java
index af0662d..fe256d1 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/StaffAttendanceController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/StaffAttendanceController.java
@@ -73,6 +73,7 @@
StaffAttendanceTrackingRecord trackingRecord = new StaffAttendanceTrackingRecord();
trackingRecord.setId(staffAttendanceDTO.getId());
trackingRecord.setEnableReport(staffAttendanceDTO.getEnableReport());
+ trackingRecord.setWorkStateFlag(staffAttendanceDTO.getWorkStateFlag());
return Result.success(trackingRecordService.updateById(trackingRecord));
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/pojo/StaffAttendanceTrackingRecord.java b/performance-server/src/main/java/com/ruoyi/performance/pojo/StaffAttendanceTrackingRecord.java
index 00a2370..e2045fc 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/pojo/StaffAttendanceTrackingRecord.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/pojo/StaffAttendanceTrackingRecord.java
@@ -163,6 +163,11 @@
private Boolean enableReport;
/**
+ * 涓�/涓嬬彮鐘舵�佹爣璁�
+ */
+ private String workStateFlag;
+
+ /**
* 鍒涘缓浜�
*/
@TableField(fill = FieldFill.INSERT)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
index f09e090..92d39a8 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
@@ -13,10 +13,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.util.concurrent.AtomicDouble;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.enums.ClockInState;
-import com.ruoyi.common.enums.EnterOrExitType;
-import com.ruoyi.common.enums.CalendarType;
-import com.ruoyi.common.enums.SyncStatus;
+import com.ruoyi.common.enums.*;
import com.ruoyi.common.utils.api.icc.IccApiUtil;
import com.ruoyi.common.utils.api.icc.model.GetResultPageRequest;
import com.ruoyi.common.utils.api.icc.model.GetResultPageResponse;
@@ -240,13 +237,13 @@
if (!enterRecords.isEmpty()) {
// 涓婄彮鏃堕棿鍜岀姸鎬�
StaffAttendanceTrackingRecord enterRecord = enterRecords.stream()
- .filter(s -> !s.getSwingTime().isAfter(currentShiftStartDateTime) && !s.getSwingTime().isBefore(boundaryTime))
+ .filter(s -> (!s.getSwingTime().isAfter(currentShiftStartDateTime) && !s.getSwingTime().isBefore(boundaryTime)) || StringUtils.equals(s.getWorkStateFlag(), StaffWorkStateFlag.WORK.getValue()))
.max(Comparator.comparing(StaffAttendanceTrackingRecord::getSwingTime))
.orElse(new StaffAttendanceTrackingRecord());
if (BeanUtil.isEmpty(enterRecord)) {
enterRecord = enterRecords.stream()
.filter(s -> (s.getSwingTime().isAfter(currentShiftStartDateTime)
- && s.getSwingTime().isBefore(currentShiftEndDateTime)))
+ && s.getSwingTime().isBefore(currentShiftEndDateTime)) || StringUtils.equals(s.getWorkStateFlag(), StaffWorkStateFlag.WORK.getValue()))
.min(Comparator.comparing(StaffAttendanceTrackingRecord::getSwingTime))
.orElse(new StaffAttendanceTrackingRecord());
workDateTime = enterRecord.getSwingTime();
@@ -263,14 +260,14 @@
if (!exitRecords.isEmpty()) {
// 涓嬬彮鏃堕棿鍜岀姸鎬�
StaffAttendanceTrackingRecord exitRecord = exitRecords.stream()
- .filter(s -> !s.getSwingTime().isBefore(currentShiftEndDateTime)
- && s.getSwingTime().isBefore(nextShiftStartDateTime))
+ .filter(s -> (!s.getSwingTime().isBefore(currentShiftEndDateTime)
+ && s.getSwingTime().isBefore(nextShiftStartDateTime)) || StringUtils.equals(s.getWorkStateFlag(), StaffWorkStateFlag.OFF_WORK.getValue()))
.min(Comparator.comparing(StaffAttendanceTrackingRecord::getSwingTime))
.orElse(new StaffAttendanceTrackingRecord());
if (BeanUtil.isEmpty(exitRecord) && !now.isBefore(currentShiftEndDateTime)) {
exitRecord = exitRecords.stream()
.filter(s -> (s.getSwingTime().isAfter(currentShiftStartDateTime)
- && s.getSwingTime().isBefore(currentShiftEndDateTime)))
+ && s.getSwingTime().isBefore(currentShiftEndDateTime)) || StringUtils.equals(s.getWorkStateFlag(), StaffWorkStateFlag.OFF_WORK.getValue()))
.max(Comparator.comparing(StaffAttendanceTrackingRecord::getSwingTime))
.orElse(new StaffAttendanceTrackingRecord());
offWorkDateTime = exitRecord.getSwingTime();
diff --git a/performance-server/src/main/resources/mapper/StaffAttendanceTrackingRecordMapper.xml b/performance-server/src/main/resources/mapper/StaffAttendanceTrackingRecordMapper.xml
index db4dcfb..fe084c3 100644
--- a/performance-server/src/main/resources/mapper/StaffAttendanceTrackingRecordMapper.xml
+++ b/performance-server/src/main/resources/mapper/StaffAttendanceTrackingRecordMapper.xml
@@ -33,6 +33,7 @@
<result property="curTemp" column="cur_temp" jdbcType="DOUBLE"/>
<result property="isSync" column="is_sync" jdbcType="INTEGER"/>
<result property="enableReport" column="enable_report" jdbcType="BOOLEAN"/>
+ <result property="workStateFlag" column="work_state_flag" jdbcType="VARCHAR"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
@@ -48,7 +49,7 @@
enter_or_exit,image_type,open_result,
open_type,paper_number,record_image_url,
record_image,remark,mask_state,
- over_temp,cur_temp,is_sync,enable_report,
+ over_temp,cur_temp,is_sync,enable_report,work_state_flag,
create_user,create_time,update_user,
update_time
</sql>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/StaffWorkStateFlag.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/StaffWorkStateFlag.java
new file mode 100644
index 0000000..5c6e2a6
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/StaffWorkStateFlag.java
@@ -0,0 +1,21 @@
+package com.ruoyi.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 浜哄憳鑰冨嫟-涓�/涓嬬彮鐘舵�佹灇涓�
+ */
+@Getter
+public enum StaffWorkStateFlag {
+
+ WORK("涓婄彮","00work"),
+ OFF_WORK("涓嬬彮","01offWork");
+
+ private String desc,value;
+
+ StaffWorkStateFlag(String desc, String value) {
+ this.desc = desc;
+ this.value = value;
+ }
+
+}
--
Gitblit v1.9.3