From 5d2cfd4562f74496a5263db3451c1e78ff53aead Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 27 三月 2025 08:44:16 +0800
Subject: [PATCH] 单据增加查询返回字段
---
assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysDictTypeServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysDictTypeServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysDictTypeServiceImpl.java
index ab0e065..b088ff1 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysDictTypeServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,19 +1,21 @@
package com.gkhy.assess.system.service.impl;
import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.assess.common.api.CommonPage;
+import com.gkhy.assess.common.enums.DeleteFlagEnum;
import com.gkhy.assess.common.exception.ApiException;
import com.gkhy.assess.common.utils.PageUtil;
import com.gkhy.assess.system.domain.SysDictData;
import com.gkhy.assess.system.domain.SysDictType;
-import com.gkhy.assess.system.domain.SysLaw;
import com.gkhy.assess.system.mapper.SysDictDataMapper;
import com.gkhy.assess.system.mapper.SysDictTypeMapper;
import com.gkhy.assess.system.service.SysDictTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.assess.system.utils.ShiroUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -44,6 +46,10 @@
@Override
public int addDictType(SysDictType dictType) {
+ if(!checkDictTypeUnique(dictType)){
+ throw new ApiException("新增字典类型已存在");
+ }
+ dictType.setCreateBy(ShiroUtils.getSysUser().getUsername());
boolean b=save(dictType);
if(!b){
throw new ApiException("新增字典类型失败");
@@ -52,10 +58,14 @@
}
@Override
- @Transactional(rollbackFor = RuntimeException.class)
+ // @Transactional(rollbackFor = RuntimeException.class)
public int editDictType(SysDictType dict) {
+ if(!checkDictTypeUnique(dict)){
+ throw new ApiException("字典类型已存在");
+ }
SysDictType oldDict= baseMapper.getDictTypeById(dict.getId());
- dictDataMapper.updateDictDataDictType(oldDict.getDictType(), dict.getDictType());
+ dict.setDictType(oldDict.getDictType());//字典类型不能修改
+ dict.setUpdateBy(ShiroUtils.getSysUser().getUsername());
boolean b=updateById(dict);
if(!b){
throw new ApiException("修改数据字典类型失败");
@@ -69,7 +79,10 @@
if(dictDataMapper.countDictDataByType(dictType.getDictType())>0){
throw new ApiException(String.format("%1$s已分配,不能删除", dictType.getName()));
}
- boolean b=removeById(dictId);
+ SysDictType sysDictType=new SysDictType().setId(dictId)
+ .setDelFlag(DeleteFlagEnum.DELETED.getCode());
+ sysDictType.setUpdateBy(ShiroUtils.getSysUser().getName());
+ boolean b=updateById(sysDictType);
if(!b){
throw new ApiException("删除字典类型失败");
}
@@ -78,17 +91,15 @@
@Override
public int changeDictTypeStatus(SysDictType dictType) {
- boolean b=updateById(dictType);
- if(!b){
- throw new ApiException("修改数据字典类型失败");
- }
- return 1;
+ SysDictType dt=new SysDictType().setId(dictType.getId()).setDictType(dictType.getDictType());
+ dt.setUpdateBy(ShiroUtils.getSysUser().getUsername());
+ return baseMapper.updateById(dt);
}
@Override
public boolean checkDictTypeUnique(SysDictType dict) {
Long dictId = ObjectUtil.isNull(dict.getId()) ? -1L : dict.getId();
- SysDictType dictType = baseMapper.checkDictTypeUnique(dict.getDictType());
+ SysDictType dictType = baseMapper.checkDictTypeUnique(dict.getDictType(),dict.getName());
if (ObjectUtil.isNotNull(dictType) && dictType.getId().longValue() != dictId.longValue())
{
return false;
--
Gitblit v1.9.2