From 5719d901b424f3b9b60f46731e7b1cd607dae733 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 18 三月 2024 17:31:30 +0800
Subject: [PATCH] 工单下发
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
index fe9ffe7..3b297fc 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
@@ -1,6 +1,9 @@
package com.ycl.platform.service.impl;
+import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.form.DefaultRuleSetForm;
import com.ycl.platform.mapper.DefaultRuleMapper;
import com.ycl.platform.service.DefaultRuleService;
import com.ycl.system.Result;
@@ -9,19 +12,23 @@
import com.ycl.platform.domain.vo.DefaultRuleVO;
import com.ycl.platform.domain.query.DefaultRuleQuery;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
/**
* 杩濈害瑙勫垯 鏈嶅姟瀹炵幇绫�
@@ -43,6 +50,7 @@
@Override
public Result add(DefaultRuleForm form) {
DefaultRule entity = DefaultRuleForm.getEntityByForm(form, null);
+ entity.setRuleStatus("鏈惎鐢�");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -103,6 +111,11 @@
public Result page(DefaultRuleQuery query) {
IPage<DefaultRule> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .like(StringUtils.hasText(query.getRuleName()), DefaultRule::getRuleName, query.getRuleName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ DefaultRule::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
.orderByDesc(DefaultRule::getCreateTime)
.page(PageUtil.getPage(query, DefaultRule.class));
@@ -142,4 +155,26 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result set(DefaultRuleSetForm form) {
+ DefaultRule defaultRule = baseMapper.selectById(form.getId());
+ if (Objects.isNull(defaultRule)) {
+ throw new ServiceException("杩濈害瑙勫垯涓嶅瓨鍦�");
+ }
+ if (form.getFlag()) {
+ // 鍚敤涔嬪墠妫�鏌ユ槸鍚﹀凡缁忔湁鍚敤鐨勮鍒欎簡锛屼繚鎸佷竴涓紑鍚�
+ List<DefaultRule> useList = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(DefaultRule::getRuleStatus, "鍚敤")
+ .list();
+ if (! CollectionUtils.isEmpty(useList)) {
+ throw new ServiceException("宸茬粡鏈夎鍒欒鍚敤浜嗭紝鍙兘鍚屾椂鍚敤涓�涓鍒�");
+ }
+ defaultRule.setRuleStatus("鍚敤");
+ } else {
+ defaultRule.setRuleStatus("鏈惎鐢�");
+ }
+ baseMapper.updateById(defaultRule);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.8.0