From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 e76a4b1..31156ba 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,14 +19,21 @@
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.core.mp.base.BaseServiceImpl;
+import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.utils.SpringUtils;
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.excel.TaskLabelReportingEventExcel;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
import org.springblade.modules.task.service.ITaskLabelReportingEventService;
import org.springblade.modules.task.service.ITaskService;
@@ -36,6 +43,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -57,27 +65,17 @@
@Override
public IPage<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage<TaskLabelReportingEventVO> page, TaskLabelReportingEventVO taskLabelReportingEvent) {
- return page.setRecords(baseMapper.selectTaskLabelReportingEventPage(page, taskLabelReportingEvent));
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskLabelReportingEventVO.class,taskLabelReportingEvent);
+ List<String> regionChildCodesList = commonParamSet.getRegionChildCodesList();
+ Integer isAdministrator = commonParamSet.getIsAdministrator();
+ List<String> gridCodeList = commonParamSet.getGridCodeList();
+ 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(), 0);
+ 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<>();
@@ -86,7 +84,7 @@
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;
@@ -138,4 +136,18 @@
return this.baseMapper.selectTaskLabelReportingEventList(taskLabelReportingEventDTO);
}
+ /**
+ * 导出二手交易信息
+ * @param taskLabelReportingEvent
+ */
+ @Override
+ public List<TaskLabelReportingEventExcel> exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent) {
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskLabelReportingEventVO.class,taskLabelReportingEvent);
+ return baseMapper.exportTaskLabelReportingEventList(taskLabelReportingEvent,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getGridCodeList());
+ }
+
}
--
Gitblit v1.9.3