From 71794ce4487fb1ef08d60585cb309b8b760037c3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Feb 2024 19:04:50 +0800
Subject: [PATCH] 二手交易查询修改
---
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
index fba319b..910f762 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -19,11 +19,19 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.DictConstant;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
+import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
@@ -35,7 +43,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* 打金店报事 服务实现类
@@ -55,35 +65,47 @@
@Override
public IPage<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage<TaskLabelReportingEventVO> page, TaskLabelReportingEventVO taskLabelReportingEvent) {
- return page.setRecords(baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent));
+ String roleName = SpringUtils.getRequestParam("roleName");
+ String communityCode = SpringUtils.getRequestParam("communityCode");
+ if (!Strings.isBlank(communityCode)) {
+ // 校验社区编号是否合规
+ if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+ taskLabelReportingEvent.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)) {
+ taskLabelReportingEvent.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")) {
+ taskLabelReportingEvent.setCommunityCode("361102003027");
+ }
+ return page.setRecords(baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent,regionChildCodesList,isAdministrator,gridCodeList));
}
@Override
public Boolean saveReportingEven(TaskLabelReportingEventDTO taskLabelReportingEvent) {
- String name;
- switch (taskLabelReportingEvent.getEventType()) {
- case "1":
- name = DictConstant.DA_JIN_DIAN;
- break;
- case "2":
- name = DictConstant.USED_MOBILE_PHONES;
- break;
- case "3":
- name = DictConstant.USED_CAR;
- break;
- default:
- name = "";
- }
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType());
+ Long aLong = taskService.saveTask(1, DictConstant.SECOND_HAND_TRANSACTION, 1, "", AuthUtil.getUserId(),
+ taskLabelReportingEvent.getHouseCode(), taskLabelReportingEvent.getReportType(), 1);
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("house_code",taskLabelReportingEvent.getHouseCode());
+ queryWrapper.eq("is_deleted", 0).eq("house_code", taskLabelReportingEvent.getHouseCode());
PlaceEntity placeEntity = placeService.getOne(queryWrapper);
taskLabelReportingEvent.setPlaceId(placeEntity.getId());
taskLabelReportingEvent.setTaskId(aLong);
taskLabelReportingEvent.setUserId(AuthUtil.getUserId());
- taskLabelReportingEvent.setLabelName(name);
+ taskLabelReportingEvent.setLabelName(DictConstant.SECOND_HAND_TRANSACTION);
return baseMapper.insert(taskLabelReportingEvent) > 0;
}
return false;
@@ -97,7 +119,12 @@
if (aLong > 0) {
taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
- taskLabelReportingEvent.setConfirmTime(new Date());
+ if (null != taskLabelReportingEvent.getStatus()
+ && taskLabelReportingEvent.getStatus() != 4) {
+ taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
+ taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskLabelReportingEvent.setConfirmTime(new Date());
+ }
Boolean b = baseMapper.updateById(taskLabelReportingEvent) > 0;
if (b) {
return b;
@@ -106,4 +133,28 @@
}
return false;
}
+
+
+ /**
+ * 查询打金店报事
+ *
+ * @param id 打金店报事ID
+ * @return 打金店报事
+ */
+ @Override
+ public TaskLabelReportingEventDTO selectTaskLabelReportingEventById(Long id) {
+ return this.baseMapper.selectTaskLabelReportingEventById(id);
+ }
+
+ /**
+ * 查询打金店报事列表
+ *
+ * @param taskLabelReportingEventDTO 打金店报事
+ * @return 打金店报事集合
+ */
+ @Override
+ public List<TaskLabelReportingEventDTO> selectTaskLabelReportingEventList(TaskLabelReportingEventDTO taskLabelReportingEventDTO) {
+ return this.baseMapper.selectTaskLabelReportingEventList(taskLabelReportingEventDTO);
+ }
+
}
--
Gitblit v1.9.3