From fbfd690159082605f7b3f1e9cf80749e76ba7184 Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Wed, 5 Mar 2025 14:49:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tickets/controller/TicketsController.java | 2 +-
.../boge/modules/tickets/dao/TicketsDao.java | 2 +-
.../modules/tickets/entity/TicketsEntity.java | 14 ++++++++++++-
.../tickets/service/TicketsService.java | 2 +-
.../resources/mapper/tickets/TicketsDao.xml | 5 ++++-
base-vue/src/views/modules/car/CarDao.xml | 18 ----------------
.../views/modules/contract/ContractDao.xml | 21 -------------------
7 files changed, 20 insertions(+), 44 deletions(-)
delete mode 100644 base-vue/src/views/modules/car/CarDao.xml
delete mode 100644 base-vue/src/views/modules/contract/ContractDao.xml
diff --git a/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java b/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java
index e5e7f0c..405dbc7 100644
--- a/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java
+++ b/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java
@@ -22,7 +22,7 @@ import com.boge.common.utils.R;
*
* @author ls
* @email dengpbs@163.com
- * @date 2025-02-26 19:56:28
+ * @date 2025-03-05 14:29:12
*/
@RestController
@RequestMapping("tickets/tickets")
diff --git a/base-fast/src/main/java/com/boge/modules/tickets/dao/TicketsDao.java b/base-fast/src/main/java/com/boge/modules/tickets/dao/TicketsDao.java
index 412ab02..88dca4d 100644
--- a/base-fast/src/main/java/com/boge/modules/tickets/dao/TicketsDao.java
+++ b/base-fast/src/main/java/com/boge/modules/tickets/dao/TicketsDao.java
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
*
* @author ls
* @email dengpbs@163.com
- * @date 2025-02-26 19:56:28
+ * @date 2025-03-05 14:29:12
*/
@Mapper
public interface TicketsDao extends BaseMapper<TicketsEntity> {
diff --git a/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java b/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java
index 35711cc..9397f7c 100644
--- a/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java
+++ b/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java
@@ -12,7 +12,7 @@ import lombok.Data;
*
* @author ls
* @email dengpbs@163.com
- * @date 2025-02-26 19:56:28
+ * @date 2025-03-05 14:29:12
*/
@Data
@TableName("sys_tickets")
@@ -60,5 +60,17 @@ public class TicketsEntity implements Serializable {
* 创建时间
*/
private Date createTime;
+ /**
+ * 是否验收
+ */
+ private Integer isCheck;
+ /**
+ * 工单状态
+ */
+ private Integer status;
+ /**
+ * 工单关闭时间
+ */
+ private Date updateTime;
}
diff --git a/base-fast/src/main/java/com/boge/modules/tickets/service/TicketsService.java b/base-fast/src/main/java/com/boge/modules/tickets/service/TicketsService.java
index a580b4e..03fbf6f 100644
--- a/base-fast/src/main/java/com/boge/modules/tickets/service/TicketsService.java
+++ b/base-fast/src/main/java/com/boge/modules/tickets/service/TicketsService.java
@@ -11,7 +11,7 @@ import java.util.Map;
*
* @author ls
* @email dengpbs@163.com
- * @date 2025-02-26 19:56:28
+ * @date 2025-03-05 14:29:12
*/
public interface TicketsService extends IService<TicketsEntity> {
diff --git a/base-fast/src/main/resources/mapper/tickets/TicketsDao.xml b/base-fast/src/main/resources/mapper/tickets/TicketsDao.xml
index c1052ca..7c4403f 100644
--- a/base-fast/src/main/resources/mapper/tickets/TicketsDao.xml
+++ b/base-fast/src/main/resources/mapper/tickets/TicketsDao.xml
@@ -15,7 +15,10 @@
<result property="deptPhone" column="dept_phone"/>
<result property="createUserId" column="create_user_id"/>
<result property="createTime" column="create_time"/>
+ <result property="isCheck" column="is_check"/>
+ <result property="status" column="status"/>
+ <result property="updateTime" column="update_time"/>
</resultMap>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/base-vue/src/views/modules/car/CarDao.xml b/base-vue/src/views/modules/car/CarDao.xml
deleted file mode 100644
index a86ce69..0000000
--- a/base-vue/src/views/modules/car/CarDao.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.boge.modules.car.dao.CarDao">
-
- <!-- 可根据自己的需求，是否要使用 -->
- <resultMap type="com.boge.modules.car.entity.CarEntity" id="carMap">
- <result property="carId" column="car_id"/>
- <result property="carName" column="car_name"/>
- <result property="navigationType" column="navigation_type"/>
- <result property="remarks" column="remarks"/>
- <result property="isOn" column="is_on"/>
- <result property="createUserId" column="create_user_id"/>
- <result property="createTime" column="create_time"/>
- </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/base-vue/src/views/modules/contract/ContractDao.xml b/base-vue/src/views/modules/contract/ContractDao.xml
deleted file mode 100644
index 30893ba..0000000
--- a/base-vue/src/views/modules/contract/ContractDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.boge.modules.contract.dao.ContractDao">
-
- <!-- 可根据自己的需求，是否要使用 -->
- <resultMap type="com.boge.modules.contract.entity.ContractEntity" id="contractMap">
- <result property="contractId" column="contract_id"/>
- <result property="contractType" column="contract_type"/>
- <result property="isMaster" column="is_master"/>
- <result property="contractNumber" column="contract_number"/>
- <result property="clientId" column="client_id"/>
- <result property="materialJson" column="material_json"/>
- <result property="isAcceptance" column="is_acceptance"/>
- <result property="createTime" column="create_time"/>
- <result property="acceptanceTime" column="acceptance_time"/>
- <result property="remarks" column="remarks"/>
- </resultMap>
-
-
-</mapper>
\ No newline at end of file