bug修复

linwe

2024-06-21 02ee149247ca123ff4df76d439fa93d7ae764f1f

bug修复

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -382,7 +382,7 @@
            and nei_code = #{houseParam.code}
        </if>
        <include refid="filterHouseGrid"/>
        group by street_ru_name
        group by street_ru_code,street_ru_name
    </select>

    <!--根据街路巷编号查询街路巷门牌名称集合-->

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -159,6 +159,9 @@
            <if test="vo.auditStatus ==2">
                AND jhr.audit_status  = 0
            </if>
            <if test="vo.auditStatus ==0">
                AND jhr.audit_status  = 0
            </if>
            <if test="vo.auditStatus ==10">
                AND date_format(jhr.due_time,'%Y-%m-%d')&gt;= date_format(now(),'%Y-%m-%d')
            </if>
@@ -204,7 +207,7 @@

        <include refid="filterData"/>

        order by jhr.id desc
        order by jhr.update_time desc
    </select>

    <!--查询房屋出租情况-->

 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java

@@ -272,7 +272,7 @@
        // 消防自查
        Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_ONE);
        // 校园安全隐患排除
        Integer xyaqyhpc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
        // Integer xyaqyhpc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
        // 消防隐患整改
        Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, CommonConstant.NUMBER_ONE);
        // 居住证申请
@@ -292,6 +292,11 @@
        // 校园纠纷矛盾
        taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
        long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);;

        taskVO.setReportType(CommonConstant.NUMBER_FOUR);
        // 校园安全检查
        Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
        // 设置
        objectObjectHashMap.put("qbhs", qbhs);// 取保候审
        objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -304,9 +309,10 @@
        objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
        objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
        objectObjectHashMap.put("wztj", wztj);// 无诈
        objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
        // objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
        objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
        objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
        objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
        return objectObjectHashMap;
    }