yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
李宇辰 2024-01-30 17:12:06 +08:00
parent c866432d72 157b411106
commit 43d98a239d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
View File

@ -27,4 +27,6 @@ public class DataUpload extends EntityData{
private String vordmId; private String vordmId;
private String geometry; private String geometry;
private String uploaderEmail;
} }

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
View File

@ -42,7 +42,8 @@
ed.status,ed.uploader_id,ed.manager_id, ed.status,ed.uploader_id,ed.manager_id,
ed.review_time, ed.source_organization, ed.review_time, ed.source_organization,
ed.upload_type, ed.upload_type,
bu.name as uploaderName bu.name as uploaderName,
bu.email as uploaderEmail
from entity_data ed from entity_data ed
left join blade_user bu on bu.id = ed.uploader_id left join blade_user bu on bu.id = ed.uploader_id
<where> <where>

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
View File

@ -887,6 +887,7 @@
gmdr.manager_id = #{userId} gmdr.manager_id = #{userId}
</where> </where>
</select> </select>
<select id="getUserDisasterInfoListNDRNew" resultType="com.kening.vordm.entity.DisasterInfo"> <select id="getUserDisasterInfoListNDRNew" resultType="com.kening.vordm.entity.DisasterInfo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>