Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IComponentInfoService.java

@@ -1,12 +1,15 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.dto.ComponentExt;
import org.jeecg.modules.dnc.entity.ComponentInfo;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.PermissionStream;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.stereotype.Service;

import java.util.Collection;
import java.util.List;
@@ -104,7 +107,7 @@
     * @param departmentList
     * @return
     */
    boolean assignAddDepart(ComponentInfo componentInfo, Collection<Department> departmentList);
    boolean assignAddDepart(ComponentInfo componentInfo, Collection<MdcProduction> departmentList);

    /**
     * 移除部门权限
@@ -112,7 +115,7 @@
     * @param departmentList
     * @return
     */
    boolean assignRemoveDepart(ComponentInfo componentInfo, Collection<Department> departmentList);
    boolean assignRemoveDepart(ComponentInfo componentInfo, Collection<MdcProduction> departmentList);

    /**
     * 获取唯一 部件编号
@@ -143,6 +146,33 @@
     * @return
     */
    List<ComponentInfo> getByParentIdAndUserId(String parentId, String userId);

    /**
     * 通过零件号、材质等查询对应电子样板
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByComponentInfo(TreeInfoRequest treeInfoRequest);

    /**
     * 查询可以被引用的部件
     * @param componentInfo
     * @param pageNo
     * @param pageSize
     * @return
     */
    IPage<ComponentInfo> getByComponentId(ComponentInfo componentInfo, Integer pageNo, Integer pageSize);

    /**
     * 借用部件(可批量) - 原有部件id，新部件ids
     * @param oldId,newIds
     * @return
     */
    Result<?> borrowComponent(String oldId, String newIds);

    boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd);

    boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd);
}