代码提交
This commit is contained in:
parent
5fb0804300
commit
c480a08e52
|
|
@ -185,6 +185,8 @@ public class FileManagementController extends BaseController {
|
||||||
dto.setUpdateUserName(getLoginUser().getUsername());
|
dto.setUpdateUserName(getLoginUser().getUsername());
|
||||||
dto.setCreateUserId(getLoginUser().getUserId());
|
dto.setCreateUserId(getLoginUser().getUserId());
|
||||||
dto.setCreateUserName(getLoginUser().getUsername());
|
dto.setCreateUserName(getLoginUser().getUsername());
|
||||||
|
dto.setDataSource("1");
|
||||||
|
dto.setIsUnique("1");
|
||||||
} else if (file == null || file.isEmpty()) {
|
} else if (file == null || file.isEmpty()) {
|
||||||
return R.fail("请上传文件");
|
return R.fail("请上传文件");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -223,12 +223,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
dkfcns.del_flag = '1'
|
dkfcns.del_flag = '1'
|
||||||
</select>
|
</select>
|
||||||
<select id="getFileManageById" resultType="com.bonus.web.domain.DaKyProFilesContentsDto">
|
<select id="getFileManageById" resultType="com.bonus.web.domain.DaKyProFilesContentsDto">
|
||||||
select dkpfc.*,
|
SELECT
|
||||||
dksdd.dict_label AS markCode,
|
dkpfc.*,
|
||||||
dkfcm.classify_mark_name AS classifyMark
|
dkfs.id AS fileId,
|
||||||
from da_ky_pro_files_contents dkpfc
|
dkfs.file_name AS fileName,
|
||||||
left join da_ky_sys_dict_data dksdd on dkpfc.mark_code = dksdd.dict_value and dksdd.dict_type = 'mark_code'
|
CASE
|
||||||
left join da_ky_files_classify_mark dkfcm on dkpfc.classify_mark = dkfcm.id
|
WHEN dkpfc.data_source = '1' THEN
|
||||||
where dkpfc.id = #{id}
|
'本系统上传'
|
||||||
|
WHEN dkpfc.data_source = '2' THEN
|
||||||
|
'智慧现场' ELSE ''
|
||||||
|
END AS dataSource,
|
||||||
|
dksdd.dict_label AS markCode,
|
||||||
|
dkfcm.classify_mark_name AS classifyMark
|
||||||
|
FROM
|
||||||
|
da_ky_pro_files_contents dkpfc
|
||||||
|
LEFT JOIN da_ky_sys_dict_data dksdd ON dkpfc.mark_code = dksdd.dict_value
|
||||||
|
AND dksdd.dict_type = 'mark_code'
|
||||||
|
LEFT JOIN da_ky_files_classify_mark dkfcm ON dkpfc.classify_mark = dkfcm.id
|
||||||
|
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
|
||||||
|
WHERE
|
||||||
|
dkpfc.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue