From 814bc16fea10387998eebdef89363e74968dd5b1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 May 2024 08:56:32 +0800
Subject: [PATCH] 无诈审核优化
---
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 2 +-
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 14 ++++++++------
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 4 +++-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index 342b9f6..d656648 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -182,7 +182,9 @@
sort
FROM blade_region
where 1=1
- and district_code like concat(#{region.districtCode},'%')
+ <if test="region.districtCode!=null and region.districtCode!=''">
+ and district_code like concat(#{region.districtCode},'%')
+ </if>
<if test="region.parentCode!=null and region.parentCode!=''">
and parent_code = #{region.parentCode}
</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
index 7ac3b9e..4796e75 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -31,7 +31,7 @@
jg.grid_name,
jp.principal,
jp.principal_phone,
- jp.no_explosion_category,
+ IFNULL(jtnfr.no_fraud_type,jp.no_explosion_category) noExplosionCategory,
br.town_name as streetName,
br.village_name as communityName,
jpag.pcs_name,
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 1950ef4..3ef9c6d 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/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;
@@ -50,9 +51,6 @@
import org.springblade.modules.task.service.*;
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;
@@ -678,9 +676,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;
--
Gitblit v1.9.3