diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java index 161fb67..4f4cb51 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java @@ -33,7 +33,6 @@ public class WebController extends BaseController { private final IWebService webService; - /** * 查询发布量表 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java index cc51671..e2a5c83 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScalePublish.java @@ -37,10 +37,6 @@ public class SysScalePublish { */ @AutoMapping(target = "scaleIds", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleIds(), \",\"))") private String scaleIds; - - /** - * 量表名称 以逗号隔开 - */ @AutoMapping(target = "scaleNames", expression = "java(cn.hutool.core.util.StrUtil.split(source.getScaleNames(), \",\"))") private String scaleNames; @@ -54,6 +50,8 @@ public class SysScalePublish { */ @AutoMapping(target = "deptIds", expression = "java(cn.hutool.core.util.StrUtil.split(source.getDeptIds(), \",\"))") private String deptIds; + @AutoMapping(target = "deptNames", expression = "java(cn.hutool.core.util.StrUtil.split(source.getDeptNames(), \",\"))") + private String deptNames; /** * 截止日期 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java index 49dba62..0a2a0a7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java @@ -52,6 +52,7 @@ public class SysScalePublishBo { @AutoMapping(target = "deptIds", expression = "java(java.lang.String.join(\",\", source.getDeptIds()))") private List deptIds; + private String deptNames; /** * 截止日期 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java index df99eb4..cc449e5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScalePublishVo.java @@ -34,11 +34,6 @@ public class SysScalePublishVo implements Serializable { */ @ExcelProperty(value = "量表id,以逗号隔开") List scaleIds; - - /** - * 量表名称 以逗号隔开 - */ - @ExcelProperty(value = "量表名称 以逗号隔开") List scaleNames; /** @@ -52,6 +47,7 @@ public class SysScalePublishVo implements Serializable { */ @ExcelProperty(value = "部门分组id") private List deptIds; + private List deptNames; /** * 截止日期 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index 3bc5419..89a95da 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -26,6 +26,8 @@ import org.dromara.scale.mapper.SysScaleMapper; import org.dromara.scale.mapper.SysScalePublishMapper; import org.dromara.scale.service.ISysEvaluationRecordService; import org.dromara.scale.service.ISysScalePublishService; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.mapper.SysDeptMapper; import org.springframework.stereotype.Service; import java.util.Collection; @@ -52,6 +54,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { private final ISysEvaluationRecordService evaluationRecordService; + private final SysDeptMapper deptMapper; + /** * 查询量发布 */ @@ -120,6 +124,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { } //sysScaleMapper.updateBatchById(scaleList, 100); } + List deptList = deptMapper.findDeptByIds(StrUtil.join(StrUtil.COMMA, bo.getDeptIds())); + add.setDeptNames(deptList.stream().map(SysDeptVo::getDeptName).collect(Collectors.joining(StrUtil.COMMA))); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setBatchNo(add.getBatchNo()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index e18fe04..a6a5368 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -47,4 +47,6 @@ public interface SysDeptMapper extends BaseMapperPlus { String selectAncestorsById(Long deptId); + List findDeptByIds(String deptIds); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 0896cae..a55c617 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -29,4 +29,10 @@ + +