From 23003e5ece97193921dacc7a7dc98926449b64d6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 四月 2024 11:55:46 +0800
Subject: [PATCH] 新增工单

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java  |    8 ++++++++
 ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java           |   20 ++++++++++++++------
 ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java           |    7 +++++++
 ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java     |    6 ++++++
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |    4 ++++
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index 95a5a34..ff2fd40 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -26,7 +26,7 @@
 @ApiModel(value = "WorkOrder琛ㄥ崟", description = "宸ュ崟琛ㄥ崟")
 public class WorkOrderForm extends AbsForm {
 
-    @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+    // @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
     @ApiModelProperty("宸ュ崟鍙�")
     private String workOrderNo;
 
@@ -34,23 +34,31 @@
     @ApiModelProperty("杩愮淮鍗曚綅")
     private Integer unitId;
 
-    @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @NotBlank(message = "宸ュ崟鏉ユ簮涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("宸ュ崟鏉ユ簮")
+    private String source;
+
+    @NotNull(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    @ApiModelProperty("鏁呴殰绫诲瀷")
+    private String errorType;
+
+    // @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("杩愮淮浜哄憳")
     private Integer ywPeopleId;
 
-    @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    // @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
     private LocalDateTime ywHandleTime;
 
-    @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    // @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("杩愮淮缁撴灉")
     private String ywResult;
 
-    @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+    // @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
     @ApiModelProperty("杩愮淮鎯呭喌")
     private String ywCondition;
 
-    @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
+    // @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
     @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
     private String ywCheckResult;
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
index 91dc9d6..46900da 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -67,6 +67,12 @@
         return ywPeopleService.detail(id);
     }
 
+    @GetMapping("/getPeopleByUnitId/{id}")
+    @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+    public Result getPeopleByUnitId(@PathVariable("id") String id) {
+        return ywPeopleService.getPeopleByUnitId(id);
+    }
+
     @GetMapping("/list")
     @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
     public Result list() {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
index 55ed77f..1fa5cc6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPeopleService.java
@@ -62,4 +62,11 @@
      * @return
      */
     Result all();
+
+    /**
+     * 鏍规嵁杩愮淮鍗曚綅鏌ヨ杩愮淮浜哄憳璇︾粏
+     * @param id id
+     * @return 杩愮淮浜哄憳
+     */
+    Result getPeopleByUnitId(String id);
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index c64d795..73d58cf 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -56,6 +56,10 @@
     @Override
     public Result add(WorkOrderForm form) {
         WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+        entity.setWorkOrderNo(DateUtils.dateTimeNow());
+        entity.setCreateTime(DateUtils.getNowDate());
+        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+        entity.setDeleted("0");
         if(baseMapper.insert(entity) > 0) {
             return Result.ok("娣诲姞鎴愬姛");
         }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 53a6c0a..52a2c6b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -198,4 +198,12 @@
                 .collect(Collectors.toList());
         return Result.ok().data(vos);
     }
+
+    @Override
+    public Result getPeopleByUnitId(String id) {
+        List<YwPeople> entities = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(YwPeople::getBelongUnit, id)
+                .list();
+        return Result.ok().data(entities);
+    }
 }

--
Gitblit v1.8.0