Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-28 39dc3d6f7168eae8fda1b0fe6671be819d35c732

Merge remote-tracking branch 'origin/wb' into wb

 screen-api/src/main/java/com/moral/api/controller/AllocationController.java

@@ -62,6 +62,16 @@
        return ResultMessage.ok(professions);
    }

    @ApiOperation(value = "责任单位", notes = "责任单位")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "unit", method = RequestMethod.GET)
    public ResultMessage unit() {
        List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
        return ResultMessage.ok(responsibilityUnits);
    }


    /**
     * 添加交办单

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

@@ -19,6 +19,8 @@

    List<Map<String, Object>> sysDictData(String code);

    List<ResponsibilityUnit> seleteUnit();

    Integer insertAllocation(AllocationAddCond allocation);

    void updateAll(AllocationUpdateCond allocationUpdateCond);

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -104,6 +104,27 @@
        return sysDictDataMapper.selectMaps(dataQueryWrapper);
    }

    /**
     * 查询责任主体
     * @return
     */
    @Override
    public List<ResponsibilityUnit> seleteUnit() {
        QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
        wrapper.select("unit_name","unit_id");
        wrapper.eq("is_del",Constants.NOT_DELETE);
        wrapper.eq("state",0);
        wrapper.eq("is_invalid",0);

        //获取用户信息
        List<Integer> unitList = unitResult();
        if (CollectionUtils.isNotEmpty(unitList)){
            wrapper.in("unit_id",unitList);
        }
        List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
        return responsibilityUnits;
    }


    /**
     * 添加交办单