From 34ef93d02c402663740ecfeccf772fba7cd53c3f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 15:49:46 +0800
Subject: [PATCH] 工单处理记录接口重构
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java | 4 ++
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java | 12 ++++++
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 8 ---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml | 22 +++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 19 ++-------
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 2 +
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 9 ----
7 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
index ac11354..2e7abb0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
@@ -26,10 +26,14 @@
/** 鎻愪氦浜� */
private Integer commitUser;
+ private String commitUserName;
/** 杩愮淮鎯呭喌 */
private String ywCondition;
+ /** 浣愯瘉鏉愭枡 */
+ private String ywProofMaterials;
+
public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
if(vo == null) {
vo = new WorkOrderYwConditionRecordVO();
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index e7037c6..428d483 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -71,14 +71,8 @@
@GetMapping("/yw-condition/{id}")
@ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
- public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
+ public Result ywCondition(@PathVariable Integer id) {
return workOrderService.selectYwConditionByYwId(id);
- }
-
- @GetMapping("/yw-condition-list/{id}")
- @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
- public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
- return workOrderService.selectYwConditionListByYwId(id);
}
@GetMapping("/yw-auditing-list/{id}")
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index 57ae403..f42af24 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -8,6 +8,8 @@
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.form.WorkOrderForm;
import java.util.List;
+
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
index 887fff5..ee44f10 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
@@ -2,7 +2,11 @@
import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 宸ュ崟杩愮淮鎯呭喌璁板綍 Mapper 鎺ュ彛
@@ -13,4 +17,12 @@
@Mapper
public interface WorkOrderYwConditionRecordMapper extends BaseMapper<WorkOrderYwConditionRecord> {
+ /**
+ * 鏍规嵁宸ュ崟ID鏌ヨ杩愮淮璁板綍
+ *
+ * @param workOrderId
+ * @return
+ */
+ List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderId") Integer workOrderId);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index eead1af..078a6b3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -119,14 +119,7 @@
* @param id 宸ュ崟id
* @return 宸ュ崟杩愮淮鎯呭喌
*/
- Result selectYwConditionByYwId(String id);
-
- /**
- * 鑾峰彇宸ュ崟杩愮淮鎯呭喌璁板綍
- * @param id 宸ュ崟id
- * @return 宸ュ崟杩愮淮鎯呭喌璁板綍
- */
- Result selectYwConditionListByYwId(String id);
+ Result selectYwConditionByYwId(Integer id);
/**
* 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index bf1c716..053279c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -12,6 +12,7 @@
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
@@ -191,21 +192,9 @@
}
@Override
- public Result selectYwConditionByYwId(String id) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
- .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
- .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
- .list());
- }
-
- @Override
- public Result selectYwConditionListByYwId(String id) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
- .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
- .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
- .list());
+ public Result selectYwConditionByYwId(Integer id) {
+ List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ return Result.ok().data(ywConditionList);
}
@Override
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
new file mode 100644
index 0000000..2f40ff3
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO">
+ <result column="id" property="id"/>
+ <result column="create_time" property="createTime"/>
+ <result column="yw_condition" property="ywCondition"/>
+ <result column="commit_user" property="commitUser"/>
+ <result column="nick_name" property="commitUserName"/>
+ <result column="yw_proofMaterials" property="ywProofMaterials"/>
+ </resultMap>
+
+ <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
+ SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, su.nick_name
+ FROM t_work_order_yw_condition_record yw
+ INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0
+ ORDER BY yw.create_time DESC
+ </select>
+
+</mapper>
--
Gitblit v1.8.0