From 3749895d5e2a8aa2f7c4ca1065f61eb1e0cd5fab Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 27 Sep 2022 16:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkOrderServiceImpl.java    | 23 ++++++++++++++-----
 .../service/impl/WorkTypeServiceImpl.java     | 12 ++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
index 629320da..79dcf0f4 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
@@ -1,22 +1,33 @@
 package com.xhpc.activity.service.impl;
 
-import cn.hutool.core.date.DateUtil;
+import com.xhpc.activity.domain.XhpcStationDeviceDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderImageDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderUserDomain;
+import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
+import com.xhpc.activity.domain.XhpcWorkUserDomain;
+import com.xhpc.activity.mapper.XhpcStationDeviceMapper;
+import com.xhpc.activity.mapper.XhpcWorkOrderImageMapper;
+import com.xhpc.activity.mapper.XhpcWorkOrderMapper;
+import com.xhpc.activity.mapper.XhpcWorkOrderPushMessageMapper;
+import com.xhpc.activity.service.WorkOrderService;
 import com.xhpc.activity.service.WorkTypeService;
+import com.xhpc.activity.service.WorkUserService;
 import com.xhpc.common.api.SmsService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
-import com.xhpc.activity.domain.*;
-import com.xhpc.activity.mapper.*;
-import com.xhpc.activity.service.WorkOrderService;
-import com.xhpc.activity.service.WorkUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.sql.Date;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
index 92a64187..f70633e2 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
@@ -71,6 +71,12 @@ public class WorkTypeServiceImpl implements WorkTypeService {
         if(exitsDomain != null) {
             throw new CustomException("名称不能重复");
         }
+        if(domain.getAutoSend() == 1 && (domain.getUserId() == null || domain.getUserId() < 1)){
+            throw new CustomException("请选择派发人");
+        }
+        if(domain.getAutoRun() == 1 && (domain.getMeasure() == null || domain.getMeasure() < 1)){
+            throw new CustomException("请选择自动执行措施");
+        }
 
         return typeDictMapper.insertSelective(domain) > 0;
     }
@@ -90,6 +96,12 @@ public class WorkTypeServiceImpl implements WorkTypeService {
         if(exitsDomain != null && !exitsDomain.getWorkTypeId().equals(domain.getWorkTypeId())) {
             throw new CustomException("名称不能重复");
         }
+        if(domain.getAutoSend() == 1 && (domain.getUserId() == null || domain.getUserId() < 1)){
+            throw new CustomException("请选择派发人");
+        }
+        if(domain.getAutoRun() == 1 && (domain.getMeasure() == null || domain.getMeasure() < 1)){
+            throw new CustomException("请选择自动执行措施");
+        }
         return typeDictMapper.updateByPrimaryKeySelective(domain) > 0;
     }