还没改完

baizonghao

2023-03-18 49c3bb0fc7875bb0c1f231a958fafc6a732fea40

还没改完

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -136,14 +136,14 @@


    @ApiOperation("用户导出")
    @PostMapping("/import")
    @PostMapping("/export")
    public void exportUser(HttpServletResponse response) {
        List<UmsUserDto> umsUserDtos = adminService.userExp();
        String sheetName = "用户导出";
        EasyExcelUtils.export(response, sheetName, UmsUserDto.class, umsUserDtos);
    }

    @ApiOperation("部门导入")
    @ApiOperation("用户导入")
    @PostMapping("/import")
    public CommonResult importUser(MultipartFile file) throws IOException {
        EasyExcelUtils.importDepartFile(file);

 ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java

@@ -19,7 +19,7 @@
    private String departTypeName;

    @ExcelProperty(value = "部门类型", index = 2)
    private Integer departType;
    private String departType;

    @ExcelProperty(value = "上级部门", index = 3)
    private String parentDepartName;

 ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java

@@ -25,4 +25,7 @@
    List<UmsAdmin> selectSurplusUser();

    List<UmsAdmin> selectSurplusUserAndExistUser(@Param("id") Long id);

    String getDepartType(Integer id);

}

 ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java

@@ -148,7 +148,9 @@
                .map(item -> {
                    UmsDepartDto umsDepartDto = new UmsDepartDto();
                    umsDepartDto.setId(item.getId());
                    umsDepartDto.setDepartType(item.getDepartType());
                    umsDepartDto.setParentDepartName(item.getDepartName());
                    String departType = sccgDepartMapper.getDepartType(item.getDepartType());
                    umsDepartDto.setDepartType(departType);
                    UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, item.getId()));
                    if (Objects.isNull(umsDepartFather)){
                        umsDepartDto.setParentDepartName("");

 ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java

@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.dto.UmsDepartDto;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.depart.UmsDepartMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
@@ -16,6 +18,9 @@

    @Resource
    private UmsDepartMapper sccgDepartMapper;

    @Resource
    DataDictionaryMapper dataDictionaryMapper;


    @Override
@@ -36,7 +41,10 @@
        umsDepart.setDepartDes(umsDepartDto.getDepartDes());

        //  设置部门类型
        umsDepart.setDepartType(umsDepartDto.getDepartType());
//        LambdaQueryWrapper<DataDictionary> dataDictionaryLambdaQueryWrapper = new LambdaQueryWrapper<DataDictionary>(DataDictionary::getName, umsDepartDto.getDepartTypeName());
////        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper(DataDictionary));
////        sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>(UmsDepart::getDepartType))
////        umsDepart.setDepartType(umsDepartDto.getDepartType());

        //  设置父id
        UmsDepart two = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, umsDepartDto.getParentDepartName()));

 ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml

@@ -94,4 +94,7 @@
        HAVING
            count( * )= 1
    </select>
    <select id="getDepartType" resultType="java.lang.String">
        select name from ums_data_dictionary where id = #{id}
    </select>
</mapper>