fix: 案卷查询按街道为条件

wl

2022-12-06 13b6b155c914b5ab14acfe34a60c0a7b005d0013

fix: 案卷查询按街道为条件

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java

@@ -279,12 +279,12 @@
    public CommonResult queryCase(@RequestParam Integer pageSize,
                                  @RequestParam Integer current,
                                  @RequestParam(required = false) String number,
                                  @RequestParam(required = false) Integer communityId,
                                  @RequestParam(required = false) Integer streetId,
                                  @RequestParam(required = false) Integer categories,
                                  @RequestParam(required = false) String startTime,
                                  @RequestParam(required = false) String endTime,
                                  @RequestParam(required = false) String site) {
        return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, communityId, categories, startTime, endTime, site));
        return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, streetId, categories, startTime, endTime, site));
    }

    @GetMapping("/query_for_violation")

 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java

@@ -30,7 +30,7 @@

    BaseCase selectCondMap(Map map);

    Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number,@Param("communityId") Integer communityId, @Param("categories") Integer categories, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("site") String site);
    Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number,@Param("streetId") Integer streetId, @Param("categories") Integer categories, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("site") String site);

    Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, QueryForViolationParam queryForViolationParam);


 ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java

@@ -56,7 +56,7 @@

    void endCase(Long caseId, String result,String opinion);

    Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer communityId, Integer categories, String startTime, String endTime, String site);
    Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer streetId, Integer categories, String startTime, String endTime, String site);

    Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam);


 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -388,8 +388,8 @@
    }

    @Override
    public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) {
        return baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, startTime, endTime, site);
    public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer streetId, Integer categories, String startTime, String endTime, String site) {
        return baseCaseMapper.selectBaseCasePage(page, number, streetId, categories, startTime, endTime, site);
    }

    @Override

 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -127,13 +127,13 @@
        select t1.*,
        t3.region_name community_text
        from ums_base_case t1
        left join ums_sccg_region t3 on t1.community_id=t3.id
        left join ums_sccg_region t3 on t1.street_id=t3.id
        <where>
            <if test="categories != null">
                t1.category = #{categories}
            </if>
            <if test="communityId != null">
                and t1.community_id = #{communityId}
            <if test="streetId != null">
                and t1.street_id = #{streetId}
            </if>
            <if test="code != null and code !=''">
                and t1.code like concat('%',#{code},'%')