From f32f5eafce18630df2f0f77d070b263c471caaed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 28 七月 2022 09:20:01 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java | 2 +-
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
index 86b06d9..3b339f0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
@@ -28,7 +28,7 @@
private Boolean approveResult;
//审批意见
private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
+ //关联业务类型
private Integer relateType;
//关联的审批对象表ID
private Long relateId;
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
index e2c5cb8..8ff15b8 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
@@ -6,10 +6,16 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO" id="WorkApproveInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="team_level" property="teamLevel"/>
- <result column="team_name" property="teamName"/>
- <result column="principal_phone" property="principalPhone"/>
- <result column="team_desc" property="teamDesc"/>
+ <result column="work_name" property="workName"/>
+ <result column="title" property="title"/>
+ <result column="submit_person_id" property="submitPersonId"/>
+ <result column="approve_person_id" property="submitPersonId"/>
+ <result column="approve_status" property="approveStatus"/>
+ <result column="approve_result" property="approveResult"/>
+ <result column="approve_memo" property="approveMemo"/>
+ <result column="relate_type" property="relateType"/>
+ <result column="relate_id" property="relateId"/>
+ <result column="relate_desc" property="relateDesc"/>
</resultMap>
<select id="selectWorkApproveList" resultMap="WorkApproveInfoPageDOResult">
--
Gitblit v1.9.2