修改【导办工单管理】无法搜索 bug

lidongdong

2022-10-20 45e4e73fcc9923d79499332a476721b23e080e93

修改【导办工单管理】无法搜索 bug

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

@@ -364,8 +364,9 @@
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                   @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                   @RequestParam(value = "matterName",required = false) String matterName,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterName",required = false) String matterName,
                                          @RequestParam(value = "status",required = false) String status,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
@@ -373,8 +374,9 @@
        Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);

        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName,ids);
        int num=iGuideRepairOrderService.countConfigList(matterName,ids);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
                matterName,ids,status);
        int num=iGuideRepairOrderService.countConfigList(matterName,ids,status);
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -50,15 +50,19 @@
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids);
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            @Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status);

    /**
     * 获取工单列表(求和)
     * @param matterName
     * @return
     */
    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);
    int countConfigList(@Param("matterName") String matterName,
                        @Param("ids") List<String> ids,
                        @Param("status") String status);


    /**

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -39,7 +39,8 @@
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,String matterName,List<String> ids);
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status);


    /**
@@ -47,7 +48,7 @@
     * @param matterName
     * @return
     */
    int countConfigList(String matterName,List<String> ids);
    int countConfigList(String matterName,List<String> ids,String status);


    /**

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -200,13 +200,14 @@
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName, List<String> ids) {
        return baseMapper.selectConfigList(page, state, matterName, ids);
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                                   String matterName, List<String> ids,String status) {
        return baseMapper.selectConfigList(page, state, matterName, ids,status);
    }

    @Override
    public int countConfigList(String matterName, List<String> ids) {
        return baseMapper.countConfigList(matterName, ids);
    public int countConfigList(String matterName, List<String> ids,String status) {
        return baseMapper.countConfigList(matterName, ids,status);
    }

    @Override

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -83,7 +83,11 @@
        <include refid="selectGuideRepairOrderVo"/>
        <where>
            <if test="matterName != null and matterName != ''">
                AND matter_name like concat('%', #{matterName}, '%')
                AND (matter_name like concat('%', #{matterName}, '%')) or
                (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
            </if>
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="ids != null">
                and department_id IN
@@ -99,7 +103,11 @@
        select count(id) from automessage_guide_repair_order
        <where>
            <if test="matterName != null and matterName != ''">
                AND matter_name like   concat('%', #{matterName}, '%')
                AND (matter_name like concat('%', #{matterName}, '%')) or
                (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
            </if>
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="ids != null">
                and department_id IN