yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新问题类型判断

Browse Source
This commit is contained in:
panshuling321 2022-09-27 16:25:15 +08:00
parent 97445c7f50
commit 3749895d5e
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
View File

@ -1,22 +1,33 @@
package com.xhpc.activity.service.impl; 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.WorkTypeService;
import com.xhpc.activity.service.WorkUserService;
import com.xhpc.common.api.SmsService; import com.xhpc.common.api.SmsService;
import com.xhpc.common.core.domain.R; import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.exception.CustomException; import com.xhpc.common.core.exception.CustomException;
import com.xhpc.common.core.utils.StringUtils; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.sql.Date; import java.sql.Date;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@Service @Service

12
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
View File

@ -71,6 +71,12 @@ public class WorkTypeServiceImpl implements WorkTypeService {
if(exitsDomain != null) { if(exitsDomain != null) {
throw new CustomException("名称不能重复"); 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; return typeDictMapper.insertSelective(domain) > 0;
} }
@ -90,6 +96,12 @@ public class WorkTypeServiceImpl implements WorkTypeService {
if(exitsDomain != null && !exitsDomain.getWorkTypeId().equals(domain.getWorkTypeId())) { if(exitsDomain != null && !exitsDomain.getWorkTypeId().equals(domain.getWorkTypeId())) {
throw new CustomException("名称不能重复"); 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; return typeDictMapper.updateByPrimaryKeySelective(domain) > 0;
} }