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

glj-代码提交

This commit is contained in:
管李杰 2024-03-13 18:16:22 +08:00
parent 6f08741ac8
commit 367a9bc720
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,9 @@ public class EntityData implements Serializable {
private String password;
//来源路径 方便查看信息来源
private String sourceLink;
/**
* 上传人姓名
*/

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

@ -27,4 +27,8 @@ public class OtherData{
private Integer visualFlag;
private String sourceOrganization;
private String sourceLink;
private Long userId;
}

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

@ -885,7 +885,7 @@
LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
<where>
gmdr.manager_id = #{userId}
and di.respond_status > 1
and di.respond_status = 2
</where>
</select>

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

@ -27,12 +27,11 @@
<result property="isDownload" column="is_download" jdbcType="INTEGER"/>
<result property="account" column="account" jdbcType="VARCHAR"/>
<result property="password" column="password" jdbcType="VARCHAR"/>
<result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
ed
.
id
ed.id
,ed.title,ed.size,
ed.type,ed.link,ed.remark,
ed.upload_time,ed.disaster_id,ed.visual_flag,
@ -40,7 +39,7 @@
ed.status,ed.uploader_id,ed.manager_id,
ed.review_time, ed.source_organization,
ed.upload_type, ed.is_deleted, ed.is_publish,
ed.is_download, ed.account, ed.password
ed.is_download, ed.account, ed.password, ed.source_link
</sql>
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">

7
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
View File

@ -116,11 +116,14 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
entityData.setTitle(OtherData.getTitle());
entityData.setStatus(1);
entityData.setUploadType(2);
entityData.setUploaderId(AuthUtil.getUserId());
entityData.setManagerId(AuthUtil.getUserId());
entityData.setUploaderId(OtherData.getUserId());
entityData.setManagerId(OtherData.getUserId());
entityData.setReviewTime(new Date());
entityData.setVisualFlag(OtherData.getVisualFlag());
entityData.setSourceOrganization(OtherData.getSourceOrganization());
if (OtherData.getSourceLink()!=null){
entityData.setSourceLink(OtherData.getSourceLink());
}
return save(entityData);
}