flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -10,6 +10,7 @@
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -29,6 +30,10 @@
    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;
    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;
    /**
     * 查询导办事务详情
     * @param Id
@@ -36,7 +41,7 @@
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    @Authorization
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(Id, "Id 不能为空");
@@ -50,16 +55,20 @@
     */
    @ApiOperation("导办事物列表")
    @GetMapping("/getList")
    @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 = "classifyGrade",required = false) String classifyGrade)
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,classifyGrade);
        int num=iTransactionEventService.countNum(matterAndUser,classifyGrade);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
                classifyGrade,ids);
        int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
        return getDataTable(list,num);
    }
@@ -137,32 +146,8 @@
        return queryResults;
    }
    /**
     * 导办事务搜索(无分页用于小程序)
     * @param keyWord
     * @return
     */
    @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
    @GetMapping("/queryKeyWord")
    @Authorization
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
        QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
        return queryResults;
    }
    /**
     *  根据分离查询导办事务
     * @param classifyId
     * @return
     */
    @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class)
    @GetMapping("/queryByClassifyIdList")
    public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){
        return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
    }
    /**
     *  根据分类id查询导办事务(分页)
@@ -219,7 +204,6 @@
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    @Authorization
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);