Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
54793124
You need to sign in or sign up before continuing.
Commit
54793124
authored
Jun 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
916c25b1
6e15ff7f
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
50 additions
and
14 deletions
+50
-14
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+7
-2
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+2
-0
TGzEmpInfoController.java
...lus/v1/yifu/archives/controller/TGzEmpInfoController.java
+1
-1
TGzEmpInfoService.java
...loud/plus/v1/yifu/archives/service/TGzEmpInfoService.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+15
-0
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+2
-2
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+5
-5
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+8
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+8
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
54793124
...
@@ -53,6 +53,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -53,6 +53,7 @@ public class TEmployeeContractPre extends BaseEntity {
private
String
position
;
private
String
position
;
@Schema
(
description
=
"入职日期"
)
@Schema
(
description
=
"入职日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
joinLeaveDate
;
private
Date
joinLeaveDate
;
@Schema
(
description
=
"合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同"
)
@Schema
(
description
=
"合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同"
)
...
@@ -96,17 +97,19 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -96,17 +97,19 @@ public class TEmployeeContractPre extends BaseEntity {
* 预计确认时间
* 预计确认时间
*/
*/
@Schema
(
description
=
"预计确认时间"
)
@Schema
(
description
=
"预计确认时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss
"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+08:00
"
)
private
LocalDateTime
expectedConfirmTime
;
private
LocalDateTime
expectedConfirmTime
;
@Schema
(
description
=
"预计发起时间"
)
@Schema
(
description
=
"预计发起时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss
"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+08:00
"
)
private
LocalDateTime
expectedCollectionTime
;
private
LocalDateTime
expectedCollectionTime
;
@Schema
(
description
=
"合同起始时间"
)
@Schema
(
description
=
"合同起始时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
contractStart
;
private
Date
contractStart
;
@Schema
(
description
=
"合同到期时间"
)
@Schema
(
description
=
"合同到期时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
contractEnd
;
private
Date
contractEnd
;
@Schema
(
description
=
"签订类型"
)
@Schema
(
description
=
"签订类型"
)
...
@@ -122,9 +125,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -122,9 +125,11 @@ public class TEmployeeContractPre extends BaseEntity {
private
String
contractDurationMonth
;
private
String
contractDurationMonth
;
@Schema
(
description
=
"合同试用期开始时间"
)
@Schema
(
description
=
"合同试用期开始时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
tryPeriodStart
;
private
Date
tryPeriodStart
;
@Schema
(
description
=
"合同试用期结束时间"
)
@Schema
(
description
=
"合同试用期结束时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
tryPeriodEnd
;
private
Date
tryPeriodEnd
;
@Schema
(
description
=
"工作任务"
)
@Schema
(
description
=
"工作任务"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
54793124
...
@@ -223,6 +223,8 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -223,6 +223,8 @@ public class TGzEmpInfoExportMain implements Serializable {
// 日期格式化
// 日期格式化
@ExcelProperty
(
"预计转正日期"
)
@ExcelProperty
(
"预计转正日期"
)
private
String
probationDt
;
private
String
probationDt
;
@ExcelAttribute
(
name
=
"合同签署主体"
,
isDataId
=
true
,
readConverterExp
=
"V59=安徽皖信人力资源管理有限公司"
)
@ExcelProperty
(
"合同签署主体"
)
@ExcelProperty
(
"合同签署主体"
)
private
String
neeProviderId
;
private
String
neeProviderId
;
@ExcelProperty
(
"合同工作地"
)
@ExcelProperty
(
"合同工作地"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TGzEmpInfoController.java
View file @
54793124
...
@@ -112,7 +112,7 @@ public class TGzEmpInfoController {
...
@@ -112,7 +112,7 @@ public class TGzEmpInfoController {
@Operation
(
summary
=
"C端保存瓜子档案表"
,
description
=
"C端保存瓜子档案表"
)
@Operation
(
summary
=
"C端保存瓜子档案表"
,
description
=
"C端保存瓜子档案表"
)
@SysLog
(
"C端保存瓜子档案表"
)
@SysLog
(
"C端保存瓜子档案表"
)
@PostMapping
(
"/saveTGzEmpInfo"
)
@PostMapping
(
"/saveTGzEmpInfo"
)
public
R
<
Boolean
>
saveTGzEmpInfo
(
@RequestBody
TGzEmpInfoSearchVo
tGzEmpInfo
)
{
public
R
<
String
>
saveTGzEmpInfo
(
@RequestBody
TGzEmpInfoSearchVo
tGzEmpInfo
)
{
return
tGzEmpInfoService
.
saveTGzEmpInfo
(
tGzEmpInfo
);
return
tGzEmpInfoService
.
saveTGzEmpInfo
(
tGzEmpInfo
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TGzEmpInfoService.java
View file @
54793124
...
@@ -64,7 +64,7 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
...
@@ -64,7 +64,7 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
* @Date: 2025/6/19 18:13
* @Date: 2025/6/19 18:13
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
**/
R
<
Boolean
>
saveTGzEmpInfo
(
TGzEmpInfoSearchVo
tGzEmpInfoVo
);
R
<
String
>
saveTGzEmpInfo
(
TGzEmpInfoSearchVo
tGzEmpInfoVo
);
/**
/**
* @param offerInfo offer信息
* @param offerInfo offer信息
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
54793124
...
@@ -554,6 +554,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -554,6 +554,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
}
else
{
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
//撤销签署重新提交的话判断有没有合同待签订数据,有的话更新状态
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
tEmployeeContractInfo
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
TWO_INT
)
{
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
}
contractPre
.
setRevokeReason
(
""
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
baseMapper
.
updateById
(
tEmployeeContractInfo
);
baseMapper
.
updateById
(
tEmployeeContractInfo
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
54793124
...
@@ -486,7 +486,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -486,7 +486,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
**/
**/
@Override
@Override
@Transactional
@Transactional
public
R
<
Boolean
>
saveTGzEmpInfo
(
TGzEmpInfoSearchVo
tGzEmpInfoVo
)
{
public
R
<
String
>
saveTGzEmpInfo
(
TGzEmpInfoSearchVo
tGzEmpInfoVo
)
{
YifuUser
user
=
getNewYifuUser
();
YifuUser
user
=
getNewYifuUser
();
TGzEmpInfo
tGzEmpInfo
=
tGzEmpInfoVo
;
TGzEmpInfo
tGzEmpInfo
=
tGzEmpInfoVo
;
Integer
offerId
=
tGzEmpInfoVo
.
getOfferId
();
Integer
offerId
=
tGzEmpInfoVo
.
getOfferId
();
...
@@ -608,7 +608,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -608,7 +608,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
attaInfoService
.
saveBatch
(
attaList
);
attaInfoService
.
saveBatch
(
attaList
);
}
}
return
R
.
ok
();
return
R
.
ok
(
gzEmpId
);
}
}
/**
/**
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
54793124
...
@@ -456,7 +456,7 @@
...
@@ -456,7 +456,7 @@
a.national_id,
a.national_id,
a.persist_flag,
a.persist_flag,
date_format(a.nid_start_date, '%Y-%m-%d') nid_start_date,
date_format(a.nid_start_date, '%Y-%m-%d') nid_start_date,
date_format(a.nid_expiry_date, '%Y-%m-%d'
) nid_expiry_date,
if ( a.nid_expiry_date = '9999-12-31', '长期', date_format(a.nid_expiry_date, '%Y-%m-%d')
) nid_expiry_date,
a.phone,
a.phone,
a.mail,
a.mail,
a.address_type,
a.address_type,
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
54793124
...
@@ -1177,11 +1177,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1177,11 +1177,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
return
RegistConstants
.
PHONE_FORMAT_ERROR
;
return
RegistConstants
.
PHONE_FORMAT_ERROR
;
}
}
//姓名、身份证+手机号真实性校验
//姓名、身份证+手机号真实性校验
//
R<Boolean> checkRes = checkDaprUtil.checkIdCardAndMobile(registration.getEmployeeName(),
R
<
Boolean
>
checkRes
=
checkDaprUtil
.
checkIdCardAndMobile
(
registration
.
getEmployeeName
(),
//
registration.getEmpIdcard(),registration.getEmpPhone());
registration
.
getEmpIdcard
(),
registration
.
getEmpPhone
());
//
if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
if
(
Common
.
isEmpty
(
checkRes
)
||
checkRes
.
getCode
()
!=
CommonConstants
.
SUCCESS
){
//
return checkRes.getMsg();
return
checkRes
.
getMsg
();
//
}
}
EmployeeRegistration
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
EmployeeRegistration
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
54793124
...
@@ -748,6 +748,10 @@ public class DoJointInsuranceTask {
...
@@ -748,6 +748,10 @@ public class DoJointInsuranceTask {
pushParam
.
setFd_3b16dfb32778f2
(
deptInfoVo
.
getFdId
());
pushParam
.
setFd_3b16dfb32778f2
(
deptInfoVo
.
getFdId
());
pushParam
.
setFd_3b16dfb32778f2_text
(
deptInfoVo
.
getDeptNo
());
pushParam
.
setFd_3b16dfb32778f2_text
(
deptInfoVo
.
getDeptNo
());
//实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM")
//实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM")
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if
(
Common
.
isEmpty
(
param
.
getSettleMonth
())
&&
!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
param
.
setSettleMonth
(
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
if
(
"结算月本月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
if
(
"结算月本月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
pushParam
.
setFd_3af9d11088facc
(
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
));
pushParam
.
setFd_3af9d11088facc
(
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
else
if
(
"结算月上月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
}
else
if
(
"结算月上月数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
...
@@ -820,6 +824,10 @@ public class DoJointInsuranceTask {
...
@@ -820,6 +824,10 @@ public class DoJointInsuranceTask {
//商险更新赋值
//商险更新赋值
public
void
initValueUpdate
(
EkpInsurancesInfo
info
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
public
void
initValueUpdate
(
EkpInsurancesInfo
info
,
EkpInsuranceDeptInfoVo
deptInfoVo
,
EkpInteractiveParam
param
)
throws
ParseException
{
//实际结算月份
//实际结算月份
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if
(
Common
.
isEmpty
(
param
.
getSettleMonth
())
&&
!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
()))
{
param
.
setSettleMonth
(
LocalDateTimeUtils
.
formatTime
(
LocalDateTime
.
now
(),
DateUtil
.
DATETIME_YYYY_MM
));
}
info
.
setFd_3af9d11088facc
(!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
)
:
null
);
info
.
setFd_3af9d11088facc
(!
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
DateUtil
.
parseDate
(
param
.
getSettleMonth
(),
DateUtil
.
DATETIME_YYYY_MM
)
:
null
);
//是否全部结算
//是否全部结算
info
.
setFd_3b13b2ecc164aa
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
"是"
:
"否"
);
info
.
setFd_3b13b2ecc164aa
(
"全量未结算数据"
.
equals
(
deptInfoVo
.
getInsurancesType
())
?
"是"
:
"否"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
54793124
...
@@ -149,6 +149,12 @@ public class SocialFriendConfig {
...
@@ -149,6 +149,12 @@ public class SocialFriendConfig {
json
.
put
(
"ywblzhlb"
,
ywblzhlbArr
);
json
.
put
(
"ywblzhlb"
,
ywblzhlbArr
);
// type 1社保增 2社保减 3医保增 4医保减
// type 1社保增 2社保减 3医保增 4医保减
setEmpInfo
(
json
,
listVo
,
type
,
vo
.
getQyzgjbylbxcbdjb
());
setEmpInfo
(
json
,
listVo
,
type
,
vo
.
getQyzgjbylbxcbdjb
());
// 企业职工社会保险增员花名册列表
String
fileName
=
"qyzgshbxzyhmclb"
;
if
(
type
==
2
||
type
==
4
)
{
// 职工社会保险减少花名册
fileName
=
"zgshbxjshmc"
;
}
if
(
Common
.
isNotNull
(
vo
.
getQyzgshbxzyhmc
()))
{
if
(
Common
.
isNotNull
(
vo
.
getQyzgshbxzyhmc
()))
{
JSONArray
qyzgshbxzyhmclbArr
=
new
JSONArray
();
JSONArray
qyzgshbxzyhmclbArr
=
new
JSONArray
();
qyzgshbxzyhmclbArr
.
add
(
vo
.
getQyzgshbxzyhmc
());
qyzgshbxzyhmclbArr
.
add
(
vo
.
getQyzgshbxzyhmc
());
...
@@ -156,14 +162,14 @@ public class SocialFriendConfig {
...
@@ -156,14 +162,14 @@ public class SocialFriendConfig {
// 税友新附件接口说用原来的:那就一批任务里面用一份文件就可以了 还是原来的那个字段 2025-5-16 16:57:00 王赣松
// 税友新附件接口说用原来的:那就一批任务里面用一份文件就可以了 还是原来的那个字段 2025-5-16 16:57:00 王赣松
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
}
}
json
.
put
(
"qyzgshbxzyhmclb"
,
qyzgshbxzyhmclbArr
);
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
}
else
if
(
Common
.
isNotNull
(
vo
.
getQyzgjbylbxcbdjb
()))
{
}
else
if
(
Common
.
isNotNull
(
vo
.
getQyzgjbylbxcbdjb
()))
{
JSONArray
qyzgshbxzyhmclbArr
=
new
JSONArray
();
JSONArray
qyzgshbxzyhmclbArr
=
new
JSONArray
();
qyzgshbxzyhmclbArr
.
add
(
vo
.
getQyzgjbylbxcbdjb
());
qyzgshbxzyhmclbArr
.
add
(
vo
.
getQyzgjbylbxcbdjb
());
if
(
vo
.
getImgList
()
!=
null
&&
!
vo
.
getImgList
().
isEmpty
())
{
if
(
vo
.
getImgList
()
!=
null
&&
!
vo
.
getImgList
().
isEmpty
())
{
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
qyzgshbxzyhmclbArr
.
addAll
(
vo
.
getImgList
());
}
}
json
.
put
(
"qyzgshbxzyhmclb"
,
qyzgshbxzyhmclbArr
);
json
.
put
(
fileName
,
qyzgshbxzyhmclbArr
);
}
}
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
json
.
toString
(),
headers
);
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
json
.
toString
(),
headers
);
...
...
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