From 868f10bcaa907e86be23afdd101038628cafb4fe Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 15:57:23 +0800
Subject: [PATCH] 报事报修审核，查询修改
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 3 +
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 39 +++++++++++++
src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java | 34 +++++++++++
src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java | 5 +
src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java | 14 ++++
src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java | 5 +
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 19 ++++++
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 28 +++++++--
8 files changed, 140 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 3b8ae9c..ca24cad 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -10,6 +10,9 @@
<if test="placeExt.placeName != null and placeExt.placeName != ''">
and jp.place_name like concat('%',#{placeExt.placeName},'%')
</if>
+ <if test="placeExt.houseCode != null and placeExt.houseCode != ''">
+ and jp.house_code = #{placeExt.houseCode}
+ </if>
<if test="placeExt.confirmFlag != null">
and jpe.confirm_flag = #{placeExt.confirmFlag}
</if>
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
index 055a1f5..78edd3e 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
@@ -37,4 +37,9 @@
*/
private String placeName;
+ /**
+ * 地址编码
+ */
+ private String houseCode;
+
}
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 4f1cebb..ce3f23f 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -103,6 +103,25 @@
}
/**
+ * 报事报修任务表 自定义修改
+ */
+ @PostMapping("/updateTaskReportForRepairs")
+ @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ public R updateTaskReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ return R.status(taskReportForRepairsService.updateTaskReportForRepairs(taskReportForRepairs));
+ }
+
+ /**
+ * 报事报修任务表 审核
+ */
+ @PostMapping("/checkReportForRepairs")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ public R checkReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ return R.status(taskReportForRepairsService.checkReportForRepairs(taskReportForRepairs));
+ }
+
+ /**
* 报事报修任务表 新增或修改
*/
@PostMapping("/submit")
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 2f9d726..91d4875 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -17,6 +17,9 @@
package org.springblade.modules.task.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +27,7 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import sun.rmi.runtime.Log;
/**
@@ -51,6 +55,12 @@
private Long taskId;
/**
+ * 门牌地址编码
+ */
+ @ApiModelProperty(value = "门牌地址编码")
+ private String addressCode;
+
+ /**
* 姓名
*/
@ApiModelProperty(value = "姓名")
@@ -70,4 +80,28 @@
*/
@ApiModelProperty(value = "图片路径")
private String imageUrls;
+
+ /**
+ * 确认用户ID
+ */
+ @ApiModelProperty(value = "确认用户ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long confirmUserId;
+ /**
+ * 确认时间
+ */
+ @ApiModelProperty(value = "确认时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 确认标记 1：待处理 2：处理中 3：已处理
+ */
+ @ApiModelProperty(value = "确认标记 1：待处理 2：处理中 3：已处理")
+ private Integer confirmFlag;
+ /**
+ * 确认意见
+ */
+ @ApiModelProperty(value = "确认意见")
+ private String confirmNotion;
}
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 d44bee5..0ca220e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -17,16 +17,30 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
- <select id="selectTaskReportForRepairsPage" resultMap="taskReportForRepairsResultMap">
- select * from jczz_task_report_for_repairs where is_deleted = 0
+ <!--自定义分页查询-->
+ <select id="selectTaskReportForRepairsPage" resultType="org.springblade.modules.task.vo.TaskReportForRepairsVO">
+ select
+ jtrfr.*,
+ jda.address_name as addressName
+ from jczz_task_report_for_repairs jtrfr
+ left join jczz_doorplate_address jda on jda.address_code = jtrfr.address_code
+ where jtrfr.is_deleted = 0
<if test="vo.createUser != null and vo.createUser != ''">
- AND create_user = #{vo.createUser}
+ AND jtrfr.create_user = #{vo.createUser}
</if>
- <if test="vo.type != null and vo.type != ''">
- AND type = #{vo.type}
+ <if test="vo.type != null">
+ AND jtrfr.type = #{vo.type}
</if>
- ORDER BY create_time DESC
+ <if test="vo.realName != null and vo.realName != ''">
+ AND jtrfr.real_name like concat('%',#{vo.realName},'%')
+ </if>
+ <if test="vo.phone != null and vo.phone != ''">
+ AND jtrfr.phone like concat('%',#{vo.phone},'%')
+ </if>
+ <if test="vo.confirmFlag != null">
+ AND jtrfr.confirm_flag = #{vo.confirmFlag}
+ </if>
+ ORDER BY jtrfr.create_time DESC
</select>
<select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
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 862f4b7..1d5c7eb 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
@@ -51,4 +51,18 @@
* @return
*/
boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
+
+ /**
+ * 报事报修任务表 自定义修改
+ * @param taskReportForRepairs
+ * @return
+ */
+ boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
+
+ /**
+ * 报事报修任务表 审核
+ * @param taskReportForRepairs
+ * @return
+ */
+ boolean checkReportForRepairs(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 667d6fb..0703985 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
@@ -29,6 +29,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.Date;
+
/**
* 报事报修任务表 服务实现类
*
@@ -84,4 +86,41 @@
}
return flag;
}
+
+ /**
+ * 报事报修任务表 自定义修改
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ public boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ // 设置参数
+ taskReportForRepairs.setUpdateTime(new Date());
+ taskReportForRepairs.setUpdateUser(AuthUtil.getUserId());
+ // 更新
+ return updateById(taskReportForRepairs);
+ }
+
+ /**
+ * 报事报修任务表 审核
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ boolean flag = false;
+ // 设置更新时间
+ taskReportForRepairs.setConfirmTime(new Date());
+ // 更新数据
+ boolean b = updateById(taskReportForRepairs);
+ if (b) {
+ // 更新任务表状态
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setId(taskReportForRepairs.getTaskId());
+ taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
+ flag = taskService.updateById(taskEntity);
+ }
+ // 返回
+ return flag;
+ }
}
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java b/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
index 3641c69..c40ce82 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
@@ -32,4 +32,9 @@
public class TaskReportForRepairsVO extends TaskReportForRepairsEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 地址名称
+ */
+ private String addressName;
+
}
--
Gitblit v1.9.3