From 37d86ade1dccde5abfe62996ed0cec157435ebfa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 10:52:35 +0800
Subject: [PATCH] 场所详情相关，报事报修调整
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 34 +++++++++++
src/main/java/org/springblade/modules/place/service/IPlaceExtService.java | 7 ++
src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java | 2
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 19 +++++-
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java | 7 ++
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 43 +++++++++++++
src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java | 12 +++
src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java | 12 +++
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 1
src/main/resources/application.yml | 9 ++
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 6 +
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 11 ++-
12 files changed, 144 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
index c785e08..1076cd6 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -150,5 +150,4 @@
@TableLogic
@ApiModelProperty("是否已删除 0:否 1:是")
private Integer isDeleted;
-
}
diff --git a/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java b/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
index b70f8db..7f67e39 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
@@ -52,4 +52,11 @@
* @return
*/
boolean checkPlaceExt(PlaceExtEntity placeExt);
+
+ /**
+ * 场所详情表 新增
+ * @param placeExt
+ * @return
+ */
+ boolean savePlaceExt(PlaceExtEntity placeExt);
}
diff --git a/src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java b/src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java
index 819b12d..7c159f4 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlacePoiLabelService.java
@@ -1,8 +1,8 @@
package org.springblade.modules.place.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
public interface IPlacePoiLabelService extends IService<PlacePoiLabel> {
-
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 6c37077..2279d91 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -18,7 +18,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
+import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
import org.springblade.modules.place.mapper.PlaceExtMapper;
import org.springblade.modules.place.service.IPlaceExtService;
@@ -43,6 +45,9 @@
@Autowired
private ITaskService taskService;
+
+ @Autowired
+ private IPlaceService placeService;
/**
* 自定义查询
@@ -92,4 +97,33 @@
// 返回
return flag;
}
+
+ /**
+ * 场所详情表 新增
+ * @param placeExt
+ * @return
+ */
+ @Override
+ public boolean savePlaceExt(PlaceExtEntity placeExt) {
+ PlaceEntity placeEntity = placeService.getById(placeExt.getPlaceId());
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setId(placeExt.getTaskId());
+ taskEntity.setStatus(placeExt.getConfirmFlag());
+ taskEntity.setType(1);
+ taskEntity.setFrequency(3);
+ taskEntity.setName(placeEntity.getPlaceName() + "信息完善任务" + System.currentTimeMillis());
+ // 新增任务
+ boolean save = taskService.save(taskEntity);
+ if (save){
+ placeExt.setTaskId(taskEntity.getId());
+ placeExt.setConfirmFlag(1);
+ placeExt.setCreateTime(new Date());
+ placeExt.setUpdateTime(new Date());
+ placeExt.setCreateUser(AuthUtil.getUserId());
+ placeExt.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ save(placeExt);
+ }
+ return false;
+ }
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 2e2f100..944da7e 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -22,13 +22,16 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePoiLabel;
+import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
@@ -44,10 +47,15 @@
* @since 2023-10-28
*/
@Service
-@AllArgsConstructor
public class PlaceServiceImpl extends ServiceImpl<PlaceMapper, PlaceEntity> implements IPlaceService {
- private final IUserService userService;
- private final IPlacePoiLabelService placePoiLabelService;
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IPlacePoiLabelService placePoiLabelService;
+
+ @Autowired
+ private IPlaceExtService placeExtService;
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
@@ -136,7 +144,10 @@
// 用户插入后同时给场所详情表插入一条该场所信息
if (submit){
-
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setPlaceId(placeVO.getId());
+ //新增
+ placeExtService.savePlaceExt(placeExtEntity);
}
}
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
index 8869a2e..4f1cebb 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -89,7 +89,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskReportForRepairs")
public R save(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
- return R.status(taskReportForRepairsService.save(taskReportForRepairs));
+ return R.status(taskReportForRepairsService.saveTaskReportForRepairs(taskReportForRepairs));
}
/**
@@ -122,6 +122,10 @@
return R.status(taskReportForRepairsService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 查询报事报修统计
+ * @return
+ */
@GetMapping("/getStatisticsCount")
public R statisticsCount(){
return R.data(taskReportForRepairsService.getStatisticsCount());
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index a8b3b15..2f9d726 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -24,6 +24,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
+import sun.rmi.runtime.Log;
/**
* 报事报修任务表 实体类
@@ -38,10 +39,17 @@
public class TaskReportForRepairsEntity extends BaseEntity {
/**
- * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报
+ * 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报
*/
- @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报")
+ @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报")
private Integer type;
+
+ /**
+ * 任务id
+ */
+ @ApiModelProperty(value = "任务id")
+ private Long taskId;
+
/**
* 姓名
*/
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
index f4f480d..1911add 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -44,5 +44,10 @@
List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,@Param("vo") TaskReportForRepairsVO taskReportForRepairs);
- TaskReportStatistics getStatisticsCount();
+ /**
+ * 查询报事报修统计
+ * @param userId
+ * @return
+ */
+ TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index f24235e..d44bee5 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -31,11 +31,12 @@
<select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
SELECT
COUNT( 1 ) AS total,
- SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ) AS handle
- FROM
- jczz_task_report_for_repairs
- WHERE
- is_deleted = 0
+ ifnull(SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ),0) AS handle
+ FROM jczz_task_report_for_repairs
+ WHERE is_deleted = 0
+ <if test="userId != null">
+ and create_user = #{userId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java b/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
index 759ba26..862f4b7 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
@@ -39,6 +39,16 @@
*/
IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs);
-
+ /**
+ * 查询报事报修统计
+ * @return
+ */
TaskReportStatistics getStatisticsCount();
+
+ /**
+ * 报事报修任务表 新增
+ * @param taskReportForRepairs
+ * @return
+ */
+ boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
}
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 2393f27..667d6fb 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
@@ -16,12 +16,16 @@
*/
package org.springblade.modules.task.service.impl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
+import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.vo.TaskReportStatistics;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,15 +38,50 @@
@Service
public class TaskReportForRepairsServiceImpl extends BaseServiceImpl<TaskReportForRepairsMapper, TaskReportForRepairsEntity> implements ITaskReportForRepairsService {
+ @Autowired
+ private ITaskService taskService;
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param taskReportForRepairs
+ * @return
+ */
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
}
+ /**
+ * 查询报事报修统计
+ * @return
+ */
@Override
public TaskReportStatistics getStatisticsCount() {
- return baseMapper.getStatisticsCount();
+ return baseMapper.getStatisticsCount(AuthUtil.getUserId());
}
-
+ /**
+ * 报事报修任务表 新增
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ public boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ boolean flag = false;
+ // 任务新增
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setName("报事报修"+ System.currentTimeMillis());
+ taskEntity.setStatus(1);
+ taskEntity.setType(1);
+ taskEntity.setFrequency(3);
+ // 新增
+ boolean save = taskService.save(taskEntity);
+ if (save){
+ taskReportForRepairs.setTaskId(taskEntity.getId());
+ flag = save(taskReportForRepairs);
+ }
+ return flag;
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0330891..213d8f7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -44,6 +44,8 @@
exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
session-stat-enable: true
session-stat-max-count: 10
+ main:
+ allow-circular-references: true
# mybatis
mybatis-plus:
@@ -199,7 +201,12 @@
#接口放行
skip-url:
- /blade-test/**
- - /blade-doorplateAddress/doorplateAddress/**
+# - /blade-doorplateAddress/doorplateAddress/**
+ - /blade-house/house/**
+ - /blade-label/label/**
+ - /blade-houseRental/houseRental/**
+ - /blade-resource/oss/**
+ - /blade-place/**
#授权认证配置
auth:
- method: ALL
--
Gitblit v1.9.3