From 1ad34492bb286f55d3ce6dcdeb643f0d52062c4a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 13 Mar 2024 14:41:01 +0800
Subject: [PATCH] 自动生成警单
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 5cd4855..f0c5ea0 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
@@ -29,6 +30,10 @@
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.service.IHouseService;
+import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
@@ -64,11 +69,6 @@
@Autowired
private ITaskService taskService;
- @Autowired
- private IGridService gridService;
-
- @Autowired
- private IDeptService deptService;
/**
* 自定义分页
@@ -80,11 +80,10 @@
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
// 公共参数设置
- CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class,taskReportForRepairs);
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
- List<String> addressCodeList = new ArrayList<>();
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
- if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
+ if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
taskReportForRepairs.setConfirmUserId(null);
//
@@ -119,8 +118,8 @@
aoiCodeList = districtEntityList.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, addressCodeList,
- commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList,commonParamSet.getGridCodeList()));
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,
+ commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList()));
}
/**
@@ -156,6 +155,18 @@
// 新增
boolean save = taskService.save(taskEntity);
if (save) {
+ // 设置网格编码
+// if (taskReportForRepairs.getHouseFlag().equals(CommonConstant.NUMBER_TWO)) {
+// IPlaceService bean = SpringUtils.getBean(IPlaceService.class);
+// PlaceEntity placeEntity = bean.getOne(Wrappers.<PlaceEntity>lambdaQuery()
+// .eq(PlaceEntity::getHouseCode, taskReportForRepairs.getAddressCode()).last("limit 1"));
+// taskReportForRepairs.setGridCode(placeEntity.getGridCode());
+// } else {
+// IHouseService bean = SpringUtils.getBean(IHouseService.class);
+// HouseEntity houseEntity = bean.getOne(Wrappers.<HouseEntity>lambdaQuery()
+// .eq(HouseEntity::getHouseCode, taskReportForRepairs.getAddressCode()));
+// taskReportForRepairs.setGridCode(houseEntity.getGridCode());
+// }
taskReportForRepairs.setTaskId(taskEntity.getId());
taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
@@ -209,7 +220,8 @@
@Override
public Integer getStatistics(Long userId, String neiCode) {
- return baseMapper.getStatistics(userId, neiCode);
+ String roleName = SpringUtils.getRequestParam("roleName");
+ return baseMapper.getStatistics(userId, neiCode,roleName);
}
/**
--
Gitblit v1.9.3