From 36fe71cc6f93197aec868fd57e39e7dc63aef367 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 17 Jul 2024 17:27:20 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
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 aaaae9c..4fa71e6 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
@@ -31,6 +31,8 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
@@ -43,7 +45,9 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceExtService;
+import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.sms.service.ISmsSendService;
import org.springblade.modules.task.entity.*;
@@ -109,31 +113,6 @@
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
-// String roleName = SpringUtils.getRequestParam("roleName");
-// String communityCode = SpringUtils.getRequestParam("communityCode");
-// if (!Strings.isBlank(communityCode)) {
-// // 校验社区编号是否合规
-// if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
-// task.setCommunityCode(communityCode);
-// }
-// }
-// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-// Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- // 网格编号集合
-// List<String> gridCodeList = new ArrayList<>();
- // 民警角色
-// if (!Strings.isBlank(roleName)) {
-// task.setRoleName(roleName);
-// if (roleName.equals("mj")) {
-// regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
-// }
-// if (roleName.equals("wgy")) {
-// gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
-// }
-// }
-// if (AuthUtil.getUserAccount().equals("18879306957")) {
-// task.setCommunityCode("361102003027");
-// }
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
if (null != task.getReportType() && task.getReportType() == 1) {
// 查询取保候审任务列表(人房相关)
@@ -251,7 +230,7 @@
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
taskVO.setReportType(CommonConstant.NUMBER_ONE);
// 取保候审
- Integer qbhs = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ Integer qbhs = baseMapper.selectTaskPageByPersonCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 报事报修
Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, commonParamSet.getRegionChildCodesList(),
@@ -291,12 +270,18 @@
long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
// 校园纠纷矛盾
taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
- long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);;
+ long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+ ;
taskVO.setReportType(CommonConstant.NUMBER_FOUR);
// 校园安全检查
Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+ PlacePractitionerVO placePractitionerVO = new PlacePractitionerVO();
+ placePractitionerVO.setConfirmFlag(CommonConstant.NUMBER_ONE);
+ // 从业人员审核
+ Integer cyrysh = SpringUtils.getBean(IPlacePractitionerService.class).selectPlacePractitionerCount(placePractitionerVO);
+
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -313,6 +298,7 @@
objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
+ objectObjectHashMap.put("cyrysh", cyrysh);// 从业人员审核
return objectObjectHashMap;
}
@@ -684,14 +670,15 @@
} else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
// 如果报告类型为无诈，尝试更新无诈报告状态
- ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
+ ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
LambdaUpdateWrapper<TaskNoFraudReportingEntity> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
if (StringUtils.isNotBlank(task.getHouseCode())) {
objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getHouseCode, task.getHouseCode());
}
objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getStatus, task.getStatus());
+ objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getRemark, task.getRemark());
objectLambdaUpdateWrapper.eq(TaskNoFraudReportingEntity::getTaskId, task.getId());
- return bean.update(objectLambdaUpdateWrapper);
+ return noFraudReportingService.update(objectLambdaUpdateWrapper);
}
// 如果没有匹配的报告类型，返回false
return false;
--
Gitblit v1.9.3