部门编辑优化

zhanghua

2022-10-18 2e6034b9011e82870622054c081899879915a6a4

部门编辑优化

 document/¼ÝÊ»²ÕÊý¾Ý½Ó¿ÚÎĵµ.docx

Binary files differ

 ycl-common/src/main/java/com/ycl/service/depart/IDepartManagerService.java

@@ -2,10 +2,11 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.depart.DepartManager;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
 *  æœåŠ¡ç±»
 * æœåŠ¡ç±»
 * </p>
 *
 * @author zhanghua
@@ -13,4 +14,5 @@
 */
public interface IDepartManagerService extends IService<DepartManager> {

    void deleteByDepartId(Long departId);
}

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

@@ -1,5 +1,6 @@
package com.ycl.service.depart.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.depart.DepartManager;
import com.ycl.mapper.depart.DepartManagerMapper;
@@ -8,7 +9,7 @@

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author zhanghua
@@ -17,4 +18,10 @@
@Service
public class DepartManagerServiceImpl extends ServiceImpl<DepartManagerMapper, DepartManager> implements IDepartManagerService {

    @Override
    public void deleteByDepartId(Long departId) {
        LambdaQueryWrapper<DepartManager> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DepartManager::getDepartId, departId);
        baseMapper.delete(queryWrapper);
    }
}

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

@@ -86,27 +86,21 @@
    @Transactional(rollbackFor = Exception.class)
    public void update(DepartVO.UpdateDepartVO updateDepartVO) {
        UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
        if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) {
        if (null != sccgDepart && !sccgDepart.getId().equals(updateDepartVO.getId())) {
            throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
        }
        UmsDepart depart = this.getById(updateDepartVO.getId());
        UmsDepart depart = new UmsDepart();
        BeanUtils.copyProperties(updateDepartVO, depart);
        List<Long> userIds = updateDepartVO.getUserIds();
        if (CollUtil.isNotEmpty(userIds)) {
            Long departId = updateDepartVO.getId();
            List<UmsDepartManage> departList = umsAdminDepartService.queryByDepartId(departId);
            if (CollUtil.isNotEmpty(departList)) {
                umsAdminDepartService.deletedByDepartId(departId);
            }
            userIds.forEach(e -> {
                UmsDepartManage adminDepart = new UmsDepartManage();
                adminDepart.setDepartId(departId);
                adminDepart.setUserId(e);
                umsAdminDepartService.save(adminDepart);
            });
        }
        if (sccgDepartMapper.updateById(depart) != 1) {
            throw new ApiException(ResultCode.RECORD_UPDATE_FAIL);
        umsDepartService.updateById(depart);
        if (updateDepartVO.getDepartManagerList().size() > 0) {
            iDepartManagerService.deleteByDepartId(depart.getId());

            updateDepartVO.getDepartManagerList()
                    .forEach(item -> {
                        item.setCreateTime(LocalDateTime.now());
                        item.setDepartId(depart.getId());
                    });
            iDepartManagerService.saveBatch(updateDepartVO.getDepartManagerList());
        }
    }


 ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java

@@ -56,27 +56,10 @@

    @ApiModel
    @Data
    public static class UpdateDepartVO {
    public static class UpdateDepartVO extends AddDepartVO {
        @ApiModelProperty(value = "部门id")
        @NotNull(message = "部门id不能为空")
        private Long id;
        @ApiModelProperty("部门名称")
        private String departName;

        @ApiModelProperty("部门描述")
        private String departDes;

        @ApiModelProperty("部门类型")
        private Integer departType;

        @ApiModelProperty("父级id,默认0")
        private Long parentId;

        @ApiModelProperty("负责人Id集合")
        private List<Long> userIds;

//        @ApiModelProperty("停用状态，0->false,1->true,默认停用")
//        private byte status;
    }

    @ApiModel

 ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java

@@ -28,4 +28,7 @@
    @ApiModelProperty("部门类型")
    private String departTypeName;

    @ApiModelProperty("父部门")
    private String parentDepartName;

}

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

@@ -23,6 +23,7 @@

    <resultMap id="DepartVOMap" type="com.ycl.vo.depart.UmsDepartVO" extends="BaseResultMap">
        <result column="depart_type_name" property="departTypeName" jdbcType="VARCHAR"></result>
        <result column="p_depart_name" property="parentDepartName" jdbcType="VARCHAR"></result>
        <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
            <id column="user_id" property="userId"/>
            <result column="username" property="username"/>
@@ -43,7 +44,7 @@
        SELECT t_0.*,
        ua.id user_id,
        ua.username,
        dd.`name` as depart_type_name,udm.is_leader
        dd.`name` as depart_type_name,udm.is_leader,pd.depart_name as p_depart_name
        FROM (
        SELECT ud.*
        FROM ums_depart ud
@@ -51,12 +52,13 @@
        <if test="departName!=null and departName!=''">
            and ud.name like CONCAT('%',#{departName},'%')
        </if>
        ORDER BY create_time desc
        ORDER BY ud.parent_id,ud.id desc
        LIMIT #{offset}, #{size}
        ) t_0
        LEFT JOIN ums_depart_manager udm ON t_0.id = udm.depart_id
        LEFT JOIN ums_admin ua ON udm.user_id = ua.id
        left join ums_data_dictionary as dd on t_0.depart_type = dd.id
        left join ums_depart as pd on t_0.parent_id = pd.id
    </select>