Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
b44fc526
Commit
b44fc526
authored
Jul 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-relationTypeSub
parent
014795ae
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
7 deletions
+21
-7
TAttaInfo.java
...om/yifu/cloud/plus/v1/yifu/archives/entity/TAttaInfo.java
+10
-1
FileUploadController.java
...lus/v1/yifu/archives/controller/FileUploadController.java
+3
-3
FileUploadService.java
...loud/plus/v1/yifu/archives/service/FileUploadService.java
+2
-1
FileUploadServiceImpl.java
.../v1/yifu/archives/service/impl/FileUploadServiceImpl.java
+3
-1
TAttaInfoMapper.xml
...rchives-biz/src/main/resources/mapper/TAttaInfoMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAttaInfo.java
View file @
b44fc526
...
...
@@ -58,12 +58,21 @@ public class TAttaInfo extends BaseEntity {
private
String
attaType
;
/**
* 关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本
* ;21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件);0(最高教育经历);2(执业资格证书);24 身份证国徽 25 户口本本人页26学信
* ;21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件);0(最高教育经历);2(执业资格证书);24 身份证国徽
* 25 户口本本人页26学信27预入职其他附件
*/
@NotBlank
(
message
=
"关系类型不能为空"
)
@Length
(
max
=
2
,
message
=
"关系类型不能超过2个字符"
)
@Schema
(
description
=
"关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招投标7业务评估8二维码9身份证 10 户口本;21(预入职申明签名);22(预入职确认签名);23(预入职pdf文件);0(最高教育经历);2(执业资格证书);24 身份证国徽 25 户口本本人页26学信)"
)
private
String
relationType
;
/**
* 预入职其他附件子类型
* hgw 2024-7-17 10:25:11
*/
@NotBlank
(
message
=
"预入职其他附件子类型不能为空"
)
@Length
(
max
=
2
,
message
=
"预入职其他附件子类型不能超过2个字符"
)
@Schema
(
description
=
"预入职其他附件子类型"
)
private
String
relationTypeSub
;
/**
* 实体id和关系类型共同确定附件所属(9、10、21、22、23、24、25存项目档案id,0、2、26存附属表id)
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FileUploadController.java
View file @
b44fc526
...
...
@@ -69,7 +69,7 @@ public class FileUploadController {
* @Author hgw
* @Description 改编自ossUploadFile接口,改变了回传信息——专为预入职微信端使用——忽略了token,其余人慎用
* @Date 13:49 2022/6/17
* @Param
* @Param
relationTypeSub 预入职其他附件的子类型
* @return
**/
@Operation
(
description
=
"OSS文件上传接口"
+
...
...
@@ -80,8 +80,8 @@ public class FileUploadController {
"\t"
)
@PostMapping
(
value
=
"/uploadFileReturnAtta"
)
public
R
<
TAttaInfo
>
uploadFileReturnAtta
(
@RequestBody
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domainId
,
@RequestParam
(
required
=
false
)
String
attaName
)
throws
IOException
{
return
fileUploadService
.
uploadFileReturnAtta
(
file
,
filePath
,
type
,
domainId
,
attaName
);
,
@RequestParam
(
required
=
false
)
String
attaName
,
@RequestParam
(
required
=
false
)
String
relationTypeSub
)
throws
IOException
{
return
fileUploadService
.
uploadFileReturnAtta
(
file
,
filePath
,
type
,
domainId
,
attaName
,
relationTypeSub
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/FileUploadService.java
View file @
b44fc526
...
...
@@ -17,7 +17,8 @@ public interface FileUploadService {
R
<
FileVo
>
uploadImg
(
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domain
)
throws
IOException
;
R
<
TAttaInfo
>
uploadFileReturnAtta
(
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domainId
,
String
attaName
)
throws
IOException
;
R
<
TAttaInfo
>
uploadFileReturnAtta
(
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domainId
,
String
attaName
,
String
relationTypeSub
)
throws
IOException
;
R
<
FileVo
>
createQrCode
(
String
domainId
,
String
url
,
String
name
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FileUploadServiceImpl.java
View file @
b44fc526
...
...
@@ -39,7 +39,8 @@ public class FileUploadServiceImpl implements FileUploadService {
private
final
QrCodeUtil
codeUtil
;
@Override
public
R
<
TAttaInfo
>
uploadFileReturnAtta
(
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domainId
,
String
attaName
)
throws
IOException
{
public
R
<
TAttaInfo
>
uploadFileReturnAtta
(
MultipartFile
file
,
String
filePath
,
Integer
type
,
String
domainId
,
String
attaName
,
String
relationTypeSub
)
throws
IOException
{
if
(
null
==
file
)
{
return
R
.
failed
(
"文件删除异常,请重新上传!"
);
}
...
...
@@ -83,6 +84,7 @@ public class FileUploadServiceImpl implements FileUploadService {
null
);
attaInfo
.
setCreateBy
(
user
.
getId
());
attaInfo
.
setCreateName
(
user
.
getNickname
());
attaInfo
.
setRelationTypeSub
(
relationTypeSub
);
if
(
Common
.
isNotNull
(
attaName
))
{
attaInfo
.
setAttaName
(
attaName
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAttaInfoMapper.xml
View file @
b44fc526
...
...
@@ -11,6 +11,7 @@
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"relationType"
column=
"relation_type"
/>
<result
property=
"relationTypeSub"
column=
"RELATION_TYPE_SUB"
/>
<result
property=
"domainId"
column=
"domain_id"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -22,7 +23,8 @@
a.create_by,
a.create_time,
a.relation_type,
a.domain_id
a.domain_id,
a.RELATION_TYPE_SUB
</sql>
<sql
id=
"tAttaInfo_where"
>
<if
test=
"tAttaInfo != null"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment