bug修复

linwe

2024-06-21 02ee149247ca123ff4df76d439fa93d7ae764f1f

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

@@ -20,6 +20,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,11 +49,9 @@
import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
import org.springblade.modules.task.vo.TaskSchoolEvenVO;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.task.service.ITaskPlaceRectificationService;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -273,19 +272,19 @@
      // 消防自查
      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);
      // 居住证申请
      Integer jzzsq = residencePermitApplyService.getCount(neiCode, CommonConstant.NUMBER_ONE);
      // 无诈统计
      taskVO.setReportType(6);
      Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
      ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
      TaskNoFraudReportingVO taskNoFraudReportingVO = new TaskNoFraudReportingVO();
      taskNoFraudReportingVO.setStatus(1);
      Integer wztj = noFraudReportingService.selectTaskNoFraudReportingCount(taskNoFraudReportingVO);

      ITaskSchoolEvenService taskSchoolEvenService = SpringUtils.getBean(ITaskSchoolEvenService.class);
      TaskSchoolEvenVO taskSchoolEvenVO = new TaskSchoolEvenVO();
//      taskSchoolEvenVO.setIsReporting(CommonConstant.NUMBER_ONE.toString());
//      taskSchoolEvenVO.setIsHandle(CommonConstant.NUMBER_TWO.toString());
      taskSchoolEvenVO.setConfirmFlag(CommonConstant.NUMBER_ONE.toString());
      taskSchoolEvenVO.setType(CommonConstant.NUMBER_ONE.toString());
      // 校园隐患
@@ -293,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);// 标签报事-二手交易
@@ -305,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;
   }

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