Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/service/AllocationService.java

@@ -7,18 +7,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.Allocation;
import com.moral.api.entity.AllocationLog;
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationListExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.query.app.AppAllocationFileCond;
import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.app.AppAllocationFindVo;
import com.moral.api.pojo.vo.app.AppAuthority;

public interface AllocationService extends IService<Allocation> {

@@ -139,7 +139,29 @@
     * @param userId
     * @return
     */
    Integer authority(String allocationNum,Integer userId);
    AppAuthority authority(String allocationNum, Integer userId);

    /**
     * 修改责任单位
     * @param id
     * @param unitId
     */
    void updataUnit(Integer id,Integer unitId,Integer polluteType);

    /**
     * 查看修改记录
     * @param allocationNum
     * @return
     */
    List<AllocationLog> getLog(String allocationNum);

    /**
     * 根据字典名称获取权限   空值无权，有值有权
     * @param code
     * @return
     */
    List<Integer> getUnitAuthority(String code);


    List<AllocationExcelExt> listExcel(List<Integer> id);
}