无诈bug修复

lin

2024-04-11 72a8f46bf2af7ee8511b1544f212fb6399e0c448

无诈bug修复

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -419,7 +419,6 @@
                and jt.report_type in (5,8)
            </if>
            and jt.is_deleted = 0
            and jt.house_code is not null
        </where>
    </select>


 src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml

@@ -52,7 +52,7 @@
            <if test="place.updateTime != null ">and jtnfr.update_time = #{place.updateTime}</if>
            <if test="place.createTime != null ">and jtnfr.create_time = #{place.createTime}</if>
            <if test="place.houseCode != null  and place.houseCode != ''">and jtnfr.house_code = #{place.houseCode}</if>
            <if test="place.createUser != null ">and jtnfr.create_user = #{createUser}</if>
            <if test="place.createUser != null ">and jtnfr.create_user = #{place.createUser}</if>
            <if test="place.imageUrls != null  and place.imageUrls != ''">and jtnfr.image_urls = #{place.imageUrls}</if>
            <if test="place.status != null ">and jtnfr.status = #{place.status}</if>
            <if test="place.deleteFlag != null ">and jtnfr.delete_flag = #{place.deleteFlag}</if>

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

@@ -256,6 +256,10 @@
        Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
        // 居住证申请
        Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
        // 无诈统计
        taskVO.setReportType(6);
        Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
        // 设置
        objectObjectHashMap.put("qbhs", qbhs);// 取保候审
        objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -267,6 +271,7 @@
        objectObjectHashMap.put("xfzc", xfzc);// 消防自查
        objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
        objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
        objectObjectHashMap.put("wztj", wztj);// 无诈
        return objectObjectHashMap;
    }

@@ -619,30 +624,29 @@
        }
        // 根据任务报告类型，更新任务状态并触发相应的事件更新
        boolean result = updateById(task);
        if (!result) {
            return false;
        }
        if (task.getReportType().equals(CommonConstant.REPORT_TYPE_SECONDHAND_TRADE)) {
            // 如果报告类型匹配，尝试更新任务标签报告事件状态
            if (result) {
                ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
                return bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
                    .set(TaskLabelReportingEventEntity::getConfirmFlag, task.getStatus())
                    .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
            }
        } else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_FIRE_INSPECTION)) {
            ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
            return bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
                .set(TaskLabelReportingEventEntity::getConfirmFlag, task.getStatus())
                .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
        } else if (task.getReportType().
            equals(CommonConstant.REPORT_TYPE_FIRE_INSPECTION)) {
            // 如果报告类型为消防自查，尝试更新消防自查状态
            if (result) {
                ITaskPlaceSelfCheckService bean = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
                return bean.update(Wrappers.<TaskPlaceSelfCheckEntity>lambdaUpdate()
                    .set(TaskPlaceSelfCheckEntity::getStatus, task.getStatus())
                    .eq(TaskPlaceSelfCheckEntity::getTaskId, task.getId()));
            }
            ITaskPlaceSelfCheckService bean = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
            return bean.update(Wrappers.<TaskPlaceSelfCheckEntity>lambdaUpdate()
                .set(TaskPlaceSelfCheckEntity::getStatus, task.getStatus())
                .eq(TaskPlaceSelfCheckEntity::getTaskId, task.getId()));

        } else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
            // 如果报告类型为无诈，尝试更新无诈报告状态
            if (result) {
                ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
                return bean.update(Wrappers.<TaskNoFraudReportingEntity>lambdaUpdate()
                    .set(TaskNoFraudReportingEntity::getStatus, task.getStatus())
                    .eq(TaskNoFraudReportingEntity::getTaskId, task.getId()));
            }
            ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
            return bean.update(Wrappers.<TaskNoFraudReportingEntity>lambdaUpdate()
                .set(TaskNoFraudReportingEntity::getStatus, task.getStatus())
                .eq(TaskNoFraudReportingEntity::getTaskId, task.getId()));
        }
        // 如果没有匹配的报告类型，返回false
        return false;