Commit e40bb7e7c41be284234c5c1036934c7a71cf4f5b
1 parent
90a3c2a0
♻️ refactor(mes): 移除未使用的导入和优化工作记录逻辑
Showing
2 changed files
with
2 additions
and
4 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workrecord/MesProWorkRecordDO.java
| @@ -2,15 +2,13 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.pro.workrecord; | @@ -2,15 +2,13 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.pro.workrecord; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 3 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; | 4 | import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; |
| 5 | +import cn.iocoder.yudao.module.mes.enums.DictTypeConstants; | ||
| 5 | import com.baomidou.mybatisplus.annotation.KeySequence; | 6 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| 6 | -import com.baomidou.mybatisplus.annotation.TableField; | ||
| 7 | import com.baomidou.mybatisplus.annotation.TableId; | 7 | import com.baomidou.mybatisplus.annotation.TableId; |
| 8 | import com.baomidou.mybatisplus.annotation.TableName; | 8 | import com.baomidou.mybatisplus.annotation.TableName; |
| 9 | -import com.baomidou.mybatisplus.annotation.FieldStrategy; | ||
| 10 | import lombok.*; | 9 | import lombok.*; |
| 11 | 10 | ||
| 12 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 13 | -import cn.iocoder.yudao.module.mes.enums.DictTypeConstants; | ||
| 14 | 12 | ||
| 15 | /** | 13 | /** |
| 16 | * MES 用户工作站绑定关系(当前快照) DO | 14 | * MES 用户工作站绑定关系(当前快照) DO |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workrecord/MesProWorkRecordServiceImpl.java
| @@ -71,7 +71,7 @@ public class MesProWorkRecordServiceImpl implements MesProWorkRecordService { | @@ -71,7 +71,7 @@ public class MesProWorkRecordServiceImpl implements MesProWorkRecordService { | ||
| 71 | } else { | 71 | } else { |
| 72 | workRecordMapper.updateById(new MesProWorkRecordDO().setId(record.getId()) | 72 | workRecordMapper.updateById(new MesProWorkRecordDO().setId(record.getId()) |
| 73 | .setWorkstationId(workstationId).setType(MesProWorkRecordTypeEnum.CLOCK_IN.getType()) | 73 | .setWorkstationId(workstationId).setType(MesProWorkRecordTypeEnum.CLOCK_IN.getType()) |
| 74 | - .setClockInTime(LocalDateTime.now()).setClockOutTime(null)); | 74 | + .setClockInTime(LocalDateTime.now())); |
| 75 | } | 75 | } |
| 76 | return log.getId(); | 76 | return log.getId(); |
| 77 | } | 77 | } |