From d3b80867235caafc56e573349275bdde9bab15ed Mon Sep 17 00:00:00 2001 From: cjw Date: Sat, 11 May 2024 10:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysScaleFactorServiceImpl.java | 6 ++-- .../impl/SysScaleQuestionServiceImpl.java | 12 +++---- .../mapper/scale/StatisticMapper.xml | 4 +++ .../system/domain/vo/SysUserImportVo.java | 18 ++++------- .../listener/SysUserImportListener.java | 32 ++++++++++++------- .../system/service/ISysDeptService.java | 2 ++ .../service/impl/SysDeptServiceImpl.java | 6 +++- 7 files changed, 46 insertions(+), 34 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java index e58c793..6cbbfd4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleFactorServiceImpl.java @@ -110,13 +110,13 @@ public class SysScaleFactorServiceImpl implements ISysScaleFactorService { @Override public Boolean insertByBo(SysScaleFactorBo bo) { SysScaleFactor add = processData(bo); - if (CollUtil.isNotEmpty(bo.getFactorRangeList())) { - insertFactorRange(bo); - } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setFactorId(add.getFactorId()); } + if (CollUtil.isNotEmpty(bo.getFactorRangeList())) { + insertFactorRange(bo); + } return flag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java index b16ebbb..465c9d4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java @@ -107,20 +107,20 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService { @Override public Boolean insertByBo(SysScaleQuestionBo bo) { SysScaleQuestion add = MapstructUtils.convert(bo, SysScaleQuestion.class); - validEntityBeforeSave(add); + //validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setQuestionId(add.getQuestionId()); } - batchInsertAnswer(bo, add); + batchInsertAnswer(bo); return flag; } - private void batchInsertAnswer(SysScaleQuestionBo bo, SysScaleQuestion sysScaleQuestion) { + private void batchInsertAnswer(SysScaleQuestionBo bo) { List scaleAnswerList = bo.getScaleAnswerList(); for (SysScaleAnswer sysScaleAnswer : scaleAnswerList) { sysScaleAnswer.setScaleId(bo.getScaleId()); - sysScaleAnswer.setQuestionId(sysScaleQuestion.getQuestionId()); + sysScaleAnswer.setQuestionId(bo.getQuestionId()); } scaleAnswerMapper.batchInsert(scaleAnswerList); } @@ -137,9 +137,9 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService { @Override public Boolean updateByBo(SysScaleQuestionBo bo) { SysScaleQuestion update = MapstructUtils.convert(bo, SysScaleQuestion.class); - validEntityBeforeSave(update); + //validEntityBeforeSave(update); scaleAnswerMapper.deleteScaleAnswerByQuestionId(update.getQuestionId()); - batchInsertAnswer(bo, update); + batchInsertAnswer(bo); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml index f5c2d1f..450f2a6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml @@ -135,6 +135,7 @@ FROM sys_scale_publish sp LEFT JOIN sys_evaluation_record er ON er.batch_no = sp.batch_no GROUP BY sp.batch_no + ORDER BY `expireTime` desc diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index c34a23c..090756d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -23,17 +23,11 @@ public class SysUserImportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 用户ID - */ - @ExcelProperty(value = "用户序号") - private Long userId; - /** * 部门ID */ - @ExcelProperty(value = "部门编号") - private Long deptId; + @ExcelProperty(value = "部门名称") + private String deptName; /** * 用户账号 @@ -67,10 +61,10 @@ public class SysUserImportVo implements Serializable { private String sex; /** - * 帐号状态（0正常 1停用） + * 用户类型 */ - @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; + @ExcelProperty(value = "用户类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_user_type") + private String userType; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java index c20a4ec..ffa9067 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.ValidatorUtils; @@ -15,8 +16,8 @@ import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserImportVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ISysUserService; -import lombok.extern.slf4j.Slf4j; import java.util.List; @@ -30,6 +31,8 @@ public class SysUserImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); - } else if (isUpdateSupport) { - Long userId = sysUser.getUserId(); - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); - user.setUserId(userId); - ValidatorUtils.validate(user); - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(operUserId); - userService.updateUser(user); - successNum++; - successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功"); } else { + //todo 是否需要更新，暂不知需求 +// } else if (isUpdateSupport) { +// Long userId = sysUser.getUserId(); +// SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); +// user.setUserId(userId); +// ValidatorUtils.validate(user); +// userService.checkUserAllowed(user.getUserId()); +// userService.checkUserDataScope(user.getUserId()); +// user.setUpdateBy(operUserId); +// userService.updateUser(user); +// successNum++; +// successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功"); +// } else { failureNum++; failureMsg.append("
").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在"); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index cc3f6d3..8f95860 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -115,4 +115,6 @@ public interface ISysDeptService { */ int deleteDeptById(Long deptId); + Long selectIdBuName(String deptName); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 609f9ac..cf0c23b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -325,5 +325,9 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return baseMapper.deleteById(deptId); } - + @Override + public Long selectIdBuName(String deptName) { + SysDept sysDept = baseMapper.selectOne(new LambdaQueryWrapper().select(SysDept::getDeptId).eq(SysDept::getDeptName, deptName)); + return sysDept.getDeptId(); + } }