Merge branch 'master' into gzdyh_test

liyj

2024-09-20 b433e768a5185a6f4ce1f9271e43051b5dc254cc

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java

@@ -388,6 +388,38 @@
    }

    /**
     * 联合处置申请-选择组织
     * @url {ctx}/api/web/ctUnit/assistApplyUnitChoose
     * @param userId 组织编号
     * @return Object
     */
    @GetMapping("/assistApplyUnitChoose")
    public Object assistApplyUnitChoose(@CurrentUser String userId) {
        try {
            List<SelectTermDTO> unitSelectTerms = service.assistApplyUnitChoose(userId);
            return ReturnSucUtils.getRepInfo(unitSelectTerms);
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo(e.getMessage());
        }
    }

    /**
     * 督办-选择组织
     * @url {ctx}/api/web/ctUnit/superviceUnitChoose
     * @param userId 组织编号
     * @return Object
     */
    @GetMapping("/superviceUnitChoose")
    public Object superviceUnitChoose(@CurrentUser String userId) {
        try {
            List<SelectTermDTO> unitSelectTerms = service.superviceUnitChoose(userId);
            return ReturnSucUtils.getRepInfo(unitSelectTerms);
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo(e.getMessage());
        }
    }

    /**
     * web端任务处理-上报-查询上报的目标组织
     * @url {ctx}/api/web/ctUnit/getAppearToUnit
     * @return Object