Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -59,7 +59,7 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterAndUser",required = false) String matterAndUser,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
                                          @CurrentUser SysUser sysUser)
    {
@@ -67,9 +67,9 @@
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,ids);
        int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
        return getDataTable(list,num);
    }

@@ -133,6 +133,8 @@
        {
            return ResultData.error("事件名称不能为空");
        }



        return toAjax(iTransactionEventService.updateConfig(entity));
    }
@@ -233,8 +235,35 @@
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);

    }


    /**
     * 办事指南复制
     * @return
     */
    @ApiOperation(value = "办事指南复制",response = ResultData.class)
    @GetMapping("/copy")
    public ResultData copy(@RequestParam("Id") String Id)
    {
        if(StringUtils.isEmpty(Id))
        {
            return ResultData.error("Id不能为空");
        }

        TransactionEvent transactionEvent=iTransactionEventService.selectConfigData(Id,null);
        if(transactionEvent==null)
        {
            return ResultData.error("复制项不存在");
        }
        transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");

        transactionEvent.setId(null);
        return toAjax(iTransactionEventService.insertConfig(transactionEvent));
    }





}