From 9e754d4c91e41b02a1e39d7ca709ec9491558da2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 21:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java | 5
src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java | 15 +++
src/main/java/org/springblade/modules/task/service/ITaskHotelReportingService.java | 3
src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java | 3
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 3
src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.xml | 3
src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java | 14 +++
src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.java | 8 +
src/main/java/org/springblade/common/config/MetaObjectConfig.java | 28 +++++++
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java | 3
src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java | 3
src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.java | 8 +
src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml | 3
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 1
src/main/java/org/springblade/modules/task/entity/TaskEntity.java | 22 +++++
src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java | 3
src/main/java/org/springblade/modules/task/dto/TaskBailReportingEventDTO.java | 4 +
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 22 +++++
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 5
src/main/java/org/springblade/modules/task/service/ITaskBailReportingEventService.java | 3
src/main/java/org/springblade/modules/task/controller/TaskController.java | 22 +++--
src/main/resources/application-test.yml | 2
src/main/java/org/springblade/modules/task/dto/TaskLabelReportingEventDTO.java | 5 +
src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java | 3
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java | 5
src/main/java/org/springblade/modules/task/dto/TaskHotelReportingDTO.java | 5 +
src/main/java/org/springblade/modules/task/service/ITaskService.java | 3
src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java | 14 +++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 2
src/main/resources/application.yml | 2
30 files changed, 191 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/MetaObjectConfig.java b/src/main/java/org/springblade/common/config/MetaObjectConfig.java
new file mode 100644
index 0000000..8feddc0
--- /dev/null
+++ b/src/main/java/org/springblade/common/config/MetaObjectConfig.java
@@ -0,0 +1,28 @@
+package org.springblade.common.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+ @Slf4j
+ @Component
+public class MetaObjectConfig implements MetaObjectHandler {
+
+ @Override
+ public void insertFill(MetaObject metaObject) {
+ //设置自动插入填充
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ this.setFieldValByName("happenTime", new Date(), metaObject);
+
+ }
+
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ //设置自动修改填充
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ }
+}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index e2b5aca..10fc7e8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -100,7 +100,7 @@
return townList;
}
// 如果是居民
- if (type==2){
+ if (type==2 || type==3){
return getInhabitantInfo(list);
}
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
index 08c70b9..e655b42 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
@@ -88,7 +89,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskBailReportingEvent")
- public R save(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) {
+ public R save(@Valid @RequestBody TaskBailReportingEventDTO taskBailReportingEvent) {
return R.status(taskBailReportingEventService.saveBailReporting(taskBailReportingEvent));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index 5583974..2eec18e 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -16,25 +16,24 @@
*/
package org.springblade.modules.task.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskEntity;
+import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.task.wrapper.TaskWrapper;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 任务表 控制器
@@ -122,5 +121,12 @@
return R.status(taskService.deleteLogic(Func.toLongList(ids)));
}
+ @PostMapping("/countNumber")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "统计用户标签报事数量")
+ public R countNumber(@RequestParam(value = "houseCode",required = false) String houseCode, @RequestParam(value = "status",required = false) Integer status) {
+ return R.data(taskService.countNumber(houseCode, status));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java b/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
index 379eb2e..4274561 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskHotelReportingController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.task.dto.TaskHotelReportingDTO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
@@ -88,7 +89,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskHotelReporting")
- public R save(@Valid @RequestBody TaskHotelReportingEntity taskHotelReporting) {
+ public R save(@Valid @RequestBody TaskHotelReportingDTO taskHotelReporting) {
return R.status(taskHotelReportingService.saveHotelReporting(taskHotelReporting));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
index bcae248..4c75802 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
@@ -88,7 +89,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskLabelReportingEvent")
- public R save(@Valid @RequestBody TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ public R save(@Valid @RequestBody TaskLabelReportingEventDTO taskLabelReportingEvent) {
return R.status(taskLabelReportingEventService.saveReportingEven(taskLabelReportingEvent));
}
diff --git a/src/main/java/org/springblade/modules/task/dto/TaskBailReportingEventDTO.java b/src/main/java/org/springblade/modules/task/dto/TaskBailReportingEventDTO.java
index 7d083ac..4b02311 100644
--- a/src/main/java/org/springblade/modules/task/dto/TaskBailReportingEventDTO.java
+++ b/src/main/java/org/springblade/modules/task/dto/TaskBailReportingEventDTO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.dto;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,7 @@
public class TaskBailReportingEventDTO extends TaskBailReportingEventEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "门牌地址编码")
+ private String houseCode;
+
}
diff --git a/src/main/java/org/springblade/modules/task/dto/TaskHotelReportingDTO.java b/src/main/java/org/springblade/modules/task/dto/TaskHotelReportingDTO.java
index 87531a2..f2175ad 100644
--- a/src/main/java/org/springblade/modules/task/dto/TaskHotelReportingDTO.java
+++ b/src/main/java/org/springblade/modules/task/dto/TaskHotelReportingDTO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.dto;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,8 @@
public class TaskHotelReportingDTO extends TaskHotelReportingEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "门牌地址编码")
+ private String houseCode;
+
+
}
diff --git a/src/main/java/org/springblade/modules/task/dto/TaskLabelReportingEventDTO.java b/src/main/java/org/springblade/modules/task/dto/TaskLabelReportingEventDTO.java
index 8f709e2..bd6cd06 100644
--- a/src/main/java/org/springblade/modules/task/dto/TaskLabelReportingEventDTO.java
+++ b/src/main/java/org/springblade/modules/task/dto/TaskLabelReportingEventDTO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.dto;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,8 @@
public class TaskLabelReportingEventDTO extends TaskLabelReportingEventEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "门牌地址编码")
+ private String houseCode;
+
+
}
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
index c25ee7b..f8bef8a 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.task.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -184,4 +186,16 @@
@ApiModelProperty(value = "返回-位置图片")
private String returnImageUrls;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "创建时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ @ApiModelProperty(value = "更新时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
index 284a494..4596e68 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
@@ -16,13 +16,17 @@
*/
package org.springblade.modules.task.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 任务表 实体类
@@ -57,4 +61,22 @@
@ApiModelProperty(value = "备注")
private String remark;
+ /**
+ * 门牌地址编码
+ */
+ @ApiModelProperty(value = "门牌地址编码")
+ private String houseCode;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "创建时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ @ApiModelProperty(value = "更新时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
index 72f7071..23bf3ff 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskHotelReportingEntity.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.task.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -178,4 +180,16 @@
@ApiModelProperty(value = "确认标记")
private String confirmFlag;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "创建时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ @ApiModelProperty(value = "更新时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
index ce0a161..12c5e4e 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.task.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -65,6 +67,7 @@
@ApiModelProperty(value = "发生时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
private Date happenTime;
/**
* 用户ID
@@ -169,4 +172,16 @@
@ApiModelProperty(value = "标签名称")
private String labelName;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "创建时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ @ApiModelProperty(value = "更新时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.java
index 52e0449..7a96519 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.java
@@ -16,10 +16,12 @@
*/
package org.springblade.modules.task.mapper;
-import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
-import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
+import org.springblade.modules.task.vo.TaskBailReportingEventVO;
+
import java.util.List;
/**
@@ -37,7 +39,7 @@
* @param taskBailReportingEvent
* @return
*/
- List<TaskBailReportingEventVO> selectTaskBailReportingEventPage(IPage page, TaskBailReportingEventVO taskBailReportingEvent);
+ List<TaskBailReportingEventVO> selectTaskBailReportingEventPage(IPage page, @Param("vo") TaskBailReportingEventVO taskBailReportingEvent);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.xml
index cb6441a..e7c186f 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskBailReportingEventMapper.xml
@@ -37,6 +37,9 @@
<select id="selectTaskBailReportingEventPage" resultMap="taskBailReportingEventResultMap">
select * from jczz_task_bail_reporting_event where is_deleted = 0
+ <if test="vo.checkUserId != null and vo.checkUserId != ''">
+ AND check_user_id = #{vo.checkUserId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.java
index 9fa57fe..249f5e3 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.java
@@ -16,10 +16,12 @@
*/
package org.springblade.modules.task.mapper;
-import org.springblade.modules.task.entity.TaskHotelReportingEntity;
-import org.springblade.modules.task.vo.TaskHotelReportingVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.task.entity.TaskHotelReportingEntity;
+import org.springblade.modules.task.vo.TaskHotelReportingVO;
+
import java.util.List;
/**
@@ -37,7 +39,7 @@
* @param taskHotelReporting
* @return
*/
- List<TaskHotelReportingVO> selectTaskHotelReportingPage(IPage page, TaskHotelReportingVO taskHotelReporting);
+ List<TaskHotelReportingVO> selectTaskHotelReportingPage(IPage page, @Param("vo") TaskHotelReportingVO taskHotelReporting);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
index fe4d4a9..7eaee3e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskHotelReportingMapper.xml
@@ -37,6 +37,9 @@
<select id="selectTaskHotelReportingPage" resultMap="taskHotelReportingResultMap">
select * from jczz_task_hotel_reporting where is_deleted = 0
+ <if test="vo.checkUserId != null and vo.checkUserId != ''">
+ AND check_user_id = #{vo.checkUserId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
index 5973124..9de5469 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.mapper;
+import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param taskLabelReportingEvent
* @return
*/
- List<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage page, TaskLabelReportingEventVO taskLabelReportingEvent);
+ List<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage page, @Param("vo") TaskLabelReportingEventVO taskLabelReportingEvent);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index aedf2ec..88746ce 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -35,6 +35,9 @@
<select id="selectTaskLabelReportingEventPage" resultMap="taskLabelReportingEventResultMap">
select * from jczz_task_label_reporting_event where is_deleted = 0
+ <if test="vo.userId != null and vo.userId != ''">
+ AND user_id = #{vo.checkUserId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index e5809b0..5d3514c 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -15,6 +15,7 @@
<result column="update_user" property="updateUser"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="house_code" property="houseCode"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskBailReportingEventService.java b/src/main/java/org/springblade/modules/task/service/ITaskBailReportingEventService.java
index 82552dc..c599c2c 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskBailReportingEventService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskBailReportingEventService.java
@@ -17,6 +17,7 @@
package org.springblade.modules.task.service;
import liquibase.pro.packaged.B;
+import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springblade.core.mp.base.BaseService;
@@ -40,7 +41,7 @@
IPage<TaskBailReportingEventVO> selectTaskBailReportingEventPage(IPage<TaskBailReportingEventVO> page, TaskBailReportingEventVO taskBailReportingEvent);
- Boolean saveBailReporting(TaskBailReportingEventEntity taskBailReportingEvent);
+ Boolean saveBailReporting(TaskBailReportingEventDTO taskBailReportingEvent);
Boolean updateBailReporting(TaskBailReportingEventEntity taskBailReportingEvent);
}
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskHotelReportingService.java b/src/main/java/org/springblade/modules/task/service/ITaskHotelReportingService.java
index 7908e44..79923e7 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskHotelReportingService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskHotelReportingService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.service;
+import org.springblade.modules.task.dto.TaskHotelReportingDTO;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
import org.springblade.modules.task.vo.TaskHotelReportingVO;
import org.springblade.core.mp.base.BaseService;
@@ -43,7 +44,7 @@
* @param taskHotelReporting
* @return
*/
- boolean saveHotelReporting(TaskHotelReportingEntity taskHotelReporting);
+ boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting);
Boolean updateHotelReporting(TaskHotelReportingEntity taskHotelReporting);
}
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java b/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
index 2316e63..38fcd63 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.service;
+import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
import org.springblade.core.mp.base.BaseService;
@@ -39,7 +40,7 @@
IPage<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage<TaskLabelReportingEventVO> page, TaskLabelReportingEventVO taskLabelReportingEvent);
- Boolean saveReportingEven(TaskLabelReportingEventEntity taskLabelReportingEvent);
+ Boolean saveReportingEven(TaskLabelReportingEventDTO taskLabelReportingEvent);
Boolean updateLabelReporting(TaskLabelReportingEventEntity taskLabelReportingEvent);
}
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskService.java b/src/main/java/org/springblade/modules/task/service/ITaskService.java
index 2a9487a..168c7d4 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -48,7 +48,7 @@
* @param createUser
* @return
*/
- Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser);
+ Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode);
/**
* @param type
@@ -61,4 +61,5 @@
*/
public Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status);
+ Object countNumber(String houseCode, Integer status);
}
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
index 5b9e34c..5c39928 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -18,6 +18,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskBailReportingEventVO;
@@ -47,8 +48,8 @@
@Override
- public Boolean saveBailReporting(TaskBailReportingEventEntity taskBailReportingEvent) {
- Long aLong = taskService.saveTask(1, DictConstant.BAIL_PENDING_TRIAL, 3, "", AuthUtil.getUserId());
+ public Boolean saveBailReporting(TaskBailReportingEventDTO taskBailReportingEvent) {
+ Long aLong = taskService.saveTask(1, DictConstant.BAIL_PENDING_TRIAL, 3, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode());
if (aLong > 0) {
taskBailReportingEvent.setTaskId(aLong);
taskBailReportingEvent.setCheckUserId(AuthUtil.getUserId());
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
index df932cd..15e92e5 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -20,6 +20,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.task.dto.TaskHotelReportingDTO;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
import org.springblade.modules.task.mapper.TaskHotelReportingMapper;
import org.springblade.modules.task.service.ITaskHotelReportingService;
@@ -48,8 +49,8 @@
@Override
- public boolean saveHotelReporting(TaskHotelReportingEntity taskHotelReporting) {
- Long aLong = taskService.saveTask(1, DictConstant.HOTEL_SECURITY, 2, "", AuthUtil.getUserId());
+ public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
+ Long aLong = taskService.saveTask(1, DictConstant.HOTEL_SECURITY, 2, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode());
if (aLong > 0) {
taskHotelReporting.setTaskId(aLong);
taskHotelReporting.setCheckUserId(AuthUtil.getUserId());
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 b359afd..a6e2d31 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
@@ -20,6 +20,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
import org.springblade.modules.task.service.ITaskLabelReportingEventService;
@@ -47,7 +48,7 @@
}
@Override
- public Boolean saveReportingEven(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ public Boolean saveReportingEven(TaskLabelReportingEventDTO taskLabelReportingEvent) {
String name;
switch (taskLabelReportingEvent.getEventType()) {
case "1":
@@ -62,7 +63,7 @@
default:
name = "";
}
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId());
+ Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode());
if (aLong > 0) {
taskLabelReportingEvent.setTaskId(aLong);
taskLabelReportingEvent.setUserId(AuthUtil.getUserId());
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 3d3c0ac..4e288df 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
@@ -17,7 +17,9 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.ITaskService;
@@ -25,6 +27,8 @@
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 任务表 服务实现类
@@ -34,6 +38,7 @@
*/
@Service
public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements ITaskService {
+
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
@@ -51,7 +56,7 @@
* @return
*/
@Override
- public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser) {
+ public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode) {
TaskEntity taskEntity = new TaskEntity();
taskEntity.setType(type);
taskEntity.setName(name);
@@ -59,6 +64,7 @@
taskEntity.setRemark(remark);
taskEntity.setCreateTime(new Date());
taskEntity.setCreateUser(createUser);
+ taskEntity.setHouseCode(houseCode);
return baseMapper.insert(taskEntity) > 0 ? taskEntity.getId() : 0;
}
@@ -75,4 +81,18 @@
taskEntity.setStatus(status);
return baseMapper.updateById(taskEntity) > 0 ? 1L : 0;
}
+
+
+ @Override
+ public Object countNumber(String houseCode, Integer status) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ // 总数
+ Long all = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getCreateUser, AuthUtil.getUserId() ));
+ // 已处理
+ Long processed = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery().eq(TaskEntity::getCreateUser, AuthUtil.getUserId())
+ .eq(TaskEntity::getStatus, 2));
+ objectObjectHashMap.put("all", all);
+ objectObjectHashMap.put("processed", processed);
+ return objectObjectHashMap;
+ }
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index e3fe180..334d210 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -14,7 +14,7 @@
# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
# commandTimeout: 5000
datasource:
- url: jdbc:mysql://127.0.0.1:3308/jczz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3306/jczz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: root
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 213d8f7..720ccf4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,6 +13,8 @@
direct-buffers: true
spring:
+ profiles:
+ active: test
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
#driver-class-name: org.postgresql.Driver
--
Gitblit v1.9.3