Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-12-20 1f45c25ea725445d7e78e8d5da6e72150f35f2eb

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -173,7 +173,7 @@
    }

    @Override
    public Page listViolationsPage(Integer current, Integer size, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
    public Page listViolationsPage(Integer current, Integer size, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
        Integer type = 01;
        Integer hours = 60;
        Integer day = 24;
@@ -198,7 +198,7 @@
    }

    @Override
    public Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource) {
    public Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource) {
        Integer type = 02;
        Page page = new Page<>().setCurrent(current).setSize(size);
        return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource);
@@ -264,13 +264,15 @@
            baseCase.setViolationsVO(violationsVO);
        } else {
            IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
            LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
            dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
            DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
            if (dictionary != null) {
                illegalBuilding.setCategoryText(dictionary.getName());
            if(illegalBuilding!=null) {
                LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
                dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
                DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
                if (dictionary != null) {
                    illegalBuilding.setCategoryText(dictionary.getName());
                }
                baseCase.setIllegalBuilding(illegalBuilding);
            }
            baseCase.setIllegalBuilding(illegalBuilding);
        }
        //获取调度信息
        Map mapD = new HashMap();
@@ -666,4 +668,23 @@
        map.put("register", register);
        return map;
    }

    @Override
    public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
        if (pageIndex == null) {
            pageIndex = 1;
        }
        if (pageSize == null) {
            pageSize = 20;
        }
        IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
        return baseCaseMapper.getWorkOrder(page, keyword);
    }

    @Override
    public List<WorkOrderVO> getWorkOrderList(String keyword) {
        IPage<WorkOrderVO> page = new Page<>(1, 5000);
        IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
        return page1.getRecords();
    }
}