From 47deab07bcacb133ee7adc012b71d77b7ead80fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Fri, 11 Oct 2024 16:11:58 +0800
Subject: [PATCH] no message

---
 .../youchain/basicdata/domain/WorkPoint.java  | 24 ++++---------------
 .../basicdata/service/dto/WorkPointDto.java   | 12 ----------
 .../service/impl/PointServiceImpl.java        |  2 ++
 .../service/impl/WorkPointServiceImpl.java    |  1 +
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/basicdata/domain/WorkPoint.java b/youchain-system/src/main/java/com/youchain/basicdata/domain/WorkPoint.java
index b3ae543..7d9b329 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/domain/WorkPoint.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/domain/WorkPoint.java
@@ -16,6 +16,7 @@
 package com.youchain.basicdata.domain;
 
 import com.youchain.base.BaseEntity;
+import com.youchain.modules.system.domain.Dept;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,9 +93,10 @@ public class WorkPoint  extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "最大料箱任务数")
     private Integer maxStockNumber;
 
-    @Column(name = "`dept_id`")
+    @OneToOne
+    @JoinColumn(name = "dept_id",nullable = false)
     @ApiModelProperty(value = "仓库ID")
-    private Long deptId;
+    private Dept dept;
 
     @Column(name = "`description`")
     @ApiModelProperty(value = "描述")
@@ -102,23 +104,7 @@ public class WorkPoint  extends BaseEntity implements Serializable {
 
     @Column(name = "`enabled`")
     @ApiModelProperty(value = "是否启用")
-    private Boolean enabled;
-
-    @Column(name = "`create_by`")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @Column(name = "`update_by`")
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-    @Column(name = "`create_time`")
-    @ApiModelProperty(value = "创建时间")
-    private Timestamp createTime;
-
-    @Column(name = "`update_time`")
-    @ApiModelProperty(value = "修改时间")
-    private Timestamp updateTime;
+    private Boolean enabled=true;
 
     public void copy(WorkPoint source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/WorkPointDto.java b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/WorkPointDto.java
index cda78ae..b69d157 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/dto/WorkPointDto.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/dto/WorkPointDto.java
@@ -75,16 +75,4 @@ public class WorkPointDto implements Serializable {
 
     /** 是否启用 */
     private Boolean enabled;
-
-    /** 创建人 */
-    private String createBy;
-
-    /** 修改人 */
-    private String updateBy;
-
-    /** 创建时间 */
-    private Timestamp createTime;
-
-    /** 修改时间 */
-    private Timestamp updateTime;
 }
\ No newline at end of file
diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
index 57cde46..a5ab2e8 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java
@@ -73,6 +73,8 @@ public class PointServiceImpl implements PointService {
             pointList = pointRepository.getPointList(BaseStatus.BHZC);
         } else if (type.equals("5")) {//ZZKW
             pointList = pointRepository.getPointList(BaseStatus.ZZKW);
+        } else if (type.equals("0")) {
+            pointList=pointRepository.findAll();
         }
         return pointMapper.toDto(pointList);
     }
diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/WorkPointServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/WorkPointServiceImpl.java
index 3a9a32c..a9ded83 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/WorkPointServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/WorkPointServiceImpl.java
@@ -73,6 +73,7 @@ public class WorkPointServiceImpl implements WorkPointService {
         if(workPointRepository.findByCode(resources.getCode()) != null){
             throw new EntityExistException(WorkPoint.class,"code",resources.getCode());
         }
+        resources.setDept(UserUtils.getDept());
         return workPointMapper.toDto(workPointRepository.save(resources));
     }