glj-代码提交
This commit is contained in:
parent
6f08741ac8
commit
367a9bc720
|
@ -123,6 +123,9 @@ public class EntityData implements Serializable {
|
||||||
|
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
//来源路径 方便查看信息来源
|
||||||
|
private String sourceLink;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传人姓名
|
* 上传人姓名
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -27,4 +27,8 @@ public class OtherData{
|
||||||
private Integer visualFlag;
|
private Integer visualFlag;
|
||||||
|
|
||||||
private String sourceOrganization;
|
private String sourceOrganization;
|
||||||
|
|
||||||
|
private String sourceLink;
|
||||||
|
|
||||||
|
private Long userId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -885,7 +885,7 @@
|
||||||
LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
|
LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
|
||||||
<where>
|
<where>
|
||||||
gmdr.manager_id = #{userId}
|
gmdr.manager_id = #{userId}
|
||||||
and di.respond_status > 1
|
and di.respond_status = 2
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,11 @@
|
||||||
<result property="isDownload" column="is_download" jdbcType="INTEGER"/>
|
<result property="isDownload" column="is_download" jdbcType="INTEGER"/>
|
||||||
<result property="account" column="account" jdbcType="VARCHAR"/>
|
<result property="account" column="account" jdbcType="VARCHAR"/>
|
||||||
<result property="password" column="password" jdbcType="VARCHAR"/>
|
<result property="password" column="password" jdbcType="VARCHAR"/>
|
||||||
|
<result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
ed
|
ed.id
|
||||||
.
|
|
||||||
id
|
|
||||||
,ed.title,ed.size,
|
,ed.title,ed.size,
|
||||||
ed.type,ed.link,ed.remark,
|
ed.type,ed.link,ed.remark,
|
||||||
ed.upload_time,ed.disaster_id,ed.visual_flag,
|
ed.upload_time,ed.disaster_id,ed.visual_flag,
|
||||||
|
@ -40,7 +39,7 @@
|
||||||
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.is_deleted, ed.is_publish,
|
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>
|
</sql>
|
||||||
|
|
||||||
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
||||||
|
|
|
@ -116,11 +116,14 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
entityData.setTitle(OtherData.getTitle());
|
entityData.setTitle(OtherData.getTitle());
|
||||||
entityData.setStatus(1);
|
entityData.setStatus(1);
|
||||||
entityData.setUploadType(2);
|
entityData.setUploadType(2);
|
||||||
entityData.setUploaderId(AuthUtil.getUserId());
|
entityData.setUploaderId(OtherData.getUserId());
|
||||||
entityData.setManagerId(AuthUtil.getUserId());
|
entityData.setManagerId(OtherData.getUserId());
|
||||||
entityData.setReviewTime(new Date());
|
entityData.setReviewTime(new Date());
|
||||||
entityData.setVisualFlag(OtherData.getVisualFlag());
|
entityData.setVisualFlag(OtherData.getVisualFlag());
|
||||||
entityData.setSourceOrganization(OtherData.getSourceOrganization());
|
entityData.setSourceOrganization(OtherData.getSourceOrganization());
|
||||||
|
if (OtherData.getSourceLink()!=null){
|
||||||
|
entityData.setSourceLink(OtherData.getSourceLink());
|
||||||
|
}
|
||||||
return save(entityData);
|
return save(entityData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue