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
a4cc8055
Commit
a4cc8055
authored
Dec 17, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-%解析错误修改
parent
2593a2b1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
26 deletions
+36
-26
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+6
-4
TCertInfoServiceImpl.java
...s/v1/business/service/cert/impl/TCertInfoServiceImpl.java
+4
-2
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+1
-1
TEkpSocialInfoController.java
...loud/plus/v1/ekp/controller/TEkpSocialInfoController.java
+2
-1
SysUserPermissionController.java
...v1/permission/controller/SysUserPermissionController.java
+2
-1
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+3
-2
TPreDispatchInfoController.java
...v1/yifu/social/controller/TPreDispatchInfoController.java
+6
-3
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+12
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
a4cc8055
...
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
...
@@ -364,7 +363,8 @@ public class TSettleDomainController {
...
@@ -364,7 +363,8 @@ public class TSettleDomainController {
@PostMapping
(
"/updateProjectInfo"
)
@PostMapping
(
"/updateProjectInfo"
)
public
R
updateProjectInfo
(
@RequestBody
String
jsonStr
)
{
public
R
updateProjectInfo
(
@RequestBody
String
jsonStr
)
{
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
@@ -394,7 +394,8 @@ public class TSettleDomainController {
...
@@ -394,7 +394,8 @@ public class TSettleDomainController {
@PostMapping
(
"/updateProjectStopStatus"
)
@PostMapping
(
"/updateProjectStopStatus"
)
public
R
updateProjectStopStatus
(
@RequestBody
String
jsonStr
)
{
public
R
updateProjectStopStatus
(
@RequestBody
String
jsonStr
)
{
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
@@ -413,7 +414,8 @@ public class TSettleDomainController {
...
@@ -413,7 +414,8 @@ public class TSettleDomainController {
@PostMapping
(
"/updateProjectServerTeam"
)
@PostMapping
(
"/updateProjectServerTeam"
)
public
R
<
Boolean
>
updateProjectServerTeam
(
@RequestBody
String
jsonStr
)
{
public
R
<
Boolean
>
updateProjectServerTeam
(
@RequestBody
String
jsonStr
)
{
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/cert/impl/TCertInfoServiceImpl.java
View file @
a4cc8055
...
@@ -96,7 +96,8 @@ public class TCertInfoServiceImpl extends ServiceImpl<TCertInfoMapper, TCertInfo
...
@@ -96,7 +96,8 @@ public class TCertInfoServiceImpl extends ServiceImpl<TCertInfoMapper, TCertInfo
// 导入字段封装
// 导入字段封装
initBusiDict
(
otherMap
,
CommonConstants
.
ZERO_INT
);
initBusiDict
(
otherMap
,
CommonConstants
.
ZERO_INT
);
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TCertInfo
.
class
);
util1
=
new
ExcelUtil
<>(
TCertInfo
.
class
);
util1
.
getJsonStringToList
(
jsonStr
,
initMapForImport
(
otherMap
));
util1
.
getJsonStringToList
(
jsonStr
,
initMapForImport
(
otherMap
));
List
<
TCertInfo
>
list
=
util1
.
getEntityList
();
List
<
TCertInfo
>
list
=
util1
.
getEntityList
();
...
@@ -315,7 +316,8 @@ public class TCertInfoServiceImpl extends ServiceImpl<TCertInfoMapper, TCertInfo
...
@@ -315,7 +316,8 @@ public class TCertInfoServiceImpl extends ServiceImpl<TCertInfoMapper, TCertInfo
// 导入字段封装
// 导入字段封装
initBusiDict
(
otherMap
,
CommonConstants
.
ZERO_INT
);
initBusiDict
(
otherMap
,
CommonConstants
.
ZERO_INT
);
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util
=
new
ExcelUtil
<>(
TCertInfo
.
class
);
util
=
new
ExcelUtil
<>(
TCertInfo
.
class
);
util
.
getJsonStringToList
(
jsonStr
,
initMapForImport
(
otherMap
));
util
.
getJsonStringToList
(
jsonStr
,
initMapForImport
(
otherMap
));
List
<
TCertInfo
>
list
=
util
.
getEntityList
();
List
<
TCertInfo
>
list
=
util
.
getEntityList
();
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
a4cc8055
...
@@ -118,7 +118,7 @@ public class SocialDaprUtils {
...
@@ -118,7 +118,7 @@ public class SocialDaprUtils {
* @return
* @return
**/
**/
public
R
<
TPaymentVo
>
getPaymentSocialAndFound
(
TPaymentInfo
infoVo
)
{
public
R
<
TPaymentVo
>
getPaymentSocialAndFound
(
TPaymentInfo
infoVo
)
{
R
<
TPaymentVo
>
listVo
=
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tincomedetail/inner/getPaymentSocialAndFound"
,
JSON
.
toJSONString
(
infoVo
),
TPayment
Inf
o
.
class
,
SecurityConstants
.
FROM_IN
);
R
<
TPaymentVo
>
listVo
=
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tincomedetail/inner/getPaymentSocialAndFound"
,
JSON
.
toJSONString
(
infoVo
),
TPayment
V
o
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
listVo
)){
if
(
Common
.
isEmpty
(
listVo
)){
return
R
.
failed
(
"查询人员缴费库数据失败!"
);
return
R
.
failed
(
"查询人员缴费库数据失败!"
);
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpSocialInfoController.java
View file @
a4cc8055
...
@@ -60,7 +60,8 @@ public class TEkpSocialInfoController {
...
@@ -60,7 +60,8 @@ public class TEkpSocialInfoController {
@PostMapping
(
"/updateScoialStatus"
)
@PostMapping
(
"/updateScoialStatus"
)
public
R
updateScoialStatus
(
@RequestBody
String
jsonStr
)
{
public
R
updateScoialStatus
(
@RequestBody
String
jsonStr
)
{
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/controller/SysUserPermissionController.java
View file @
a4cc8055
...
@@ -174,7 +174,8 @@ public class SysUserPermissionController {
...
@@ -174,7 +174,8 @@ public class SysUserPermissionController {
@PostMapping
(
"/autoCreateAuth"
)
@PostMapping
(
"/autoCreateAuth"
)
public
R
<
String
>
autoCreateAuth
(
@RequestBody
String
jsonStr
)
{
public
R
<
String
>
autoCreateAuth
(
@RequestBody
String
jsonStr
)
{
try
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonStr
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonStr
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
a4cc8055
...
@@ -181,7 +181,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -181,7 +181,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
}
}
}
try
{
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
"UTF-8"
).
replace
(
"="
,
""
);
String
json
=
jsonString
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonString
=
URLDecoder
.
decode
(
json
,
"UTF-8"
).
replace
(
"="
,
""
);
vo
.
setJsonString
(
jsonString
);
vo
.
setJsonString
(
jsonString
);
SalaryAccountUtil
util1
=
new
SalaryAccountUtil
();
SalaryAccountUtil
util1
=
new
SalaryAccountUtil
();
...
@@ -1554,7 +1555,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1554,7 +1555,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
/**
/**
* @param savList 报账表Vo
* @param savList 报账表Vo
* @param
orderId
* @param
vo
* @Description: 保存并提交
* @Description: 保存并提交
* @Author: huyc
* @Author: huyc
* @Date: 2022/8/16
* @Date: 2022/8/16
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @
a4cc8055
...
@@ -253,7 +253,8 @@ public class TPreDispatchInfoController {
...
@@ -253,7 +253,8 @@ public class TPreDispatchInfoController {
if
(
Common
.
isNotNull
(
requestId
))
{
if
(
Common
.
isNotNull
(
requestId
))
{
ExcelUtil
<
TPreDispatchInfo
>
util1
=
null
;
ExcelUtil
<
TPreDispatchInfo
>
util1
=
null
;
try
{
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonString
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonString
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchInfo
.
class
);
util1
=
new
ExcelUtil
<>(
TPreDispatchInfo
.
class
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
List
<
TPreDispatchInfo
>
listInfo
=
util1
.
getEntityList
();
List
<
TPreDispatchInfo
>
listInfo
=
util1
.
getEntityList
();
...
@@ -303,7 +304,8 @@ public class TPreDispatchInfoController {
...
@@ -303,7 +304,8 @@ public class TPreDispatchInfoController {
}
}
ExcelUtil
<
TPreDispatchReduceVo
>
util1
=
null
;
ExcelUtil
<
TPreDispatchReduceVo
>
util1
=
null
;
try
{
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonString
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonString
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchReduceVo
.
class
);
util1
=
new
ExcelUtil
<>(
TPreDispatchReduceVo
.
class
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
List
<
TPreDispatchReduceVo
>
listInfo
=
util1
.
getEntityList
();
List
<
TPreDispatchReduceVo
>
listInfo
=
util1
.
getEntityList
();
...
@@ -348,7 +350,8 @@ public class TPreDispatchInfoController {
...
@@ -348,7 +350,8 @@ public class TPreDispatchInfoController {
R
<
List
<
SysDict
>>
res
=
null
;
R
<
List
<
SysDict
>>
res
=
null
;
Map
<
String
,
String
>
dicMap
=
new
HashMap
<>();
Map
<
String
,
String
>
dicMap
=
new
HashMap
<>();
try
{
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
String
json
=
jsonString
.
replaceAll
(
"%(?![0-9a-fA-F]{2})"
,
"%25"
);
jsonString
=
URLDecoder
.
decode
(
json
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchUpdateVo
.
class
);
util1
=
new
ExcelUtil
<>(
TPreDispatchUpdateVo
.
class
);
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
()
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
()
.
get
(
CacheConstants
.
DICT_DETAILS
.
get
(
CacheConstants
.
DICT_DETAILS
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
a4cc8055
...
@@ -525,11 +525,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -525,11 +525,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue
;
continue
;
}
}
//校验手机号准确性
//校验手机号准确性
errorMsg
=
checkMobile
(
excel
.
getPhone
());
//
errorMsg = checkMobile(excel.getPhone());
if
(!
errorMsg
.
contains
(
HouseConfigConstants
.
SUCESS
))
{
//
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMsg
,
excel
));
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
continue
;
//
continue;
}
//
}
//封装和插入数据
//封装和插入数据
household
.
setAreaCode
(
areaMap
.
get
(
household
.
getCity
()).
getAreaCode
());
household
.
setAreaCode
(
areaMap
.
get
(
household
.
getCity
()).
getAreaCode
());
household
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
household
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
...
@@ -665,13 +665,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -665,13 +665,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
//校验手机号准确性
//校验手机号准确性
if
(
Common
.
isNotNull
(
excel
.
getPhone
()))
{
//
if (Common.isNotNull(excel.getPhone())) {
errorMsg
=
checkMobile
(
excel
.
getPhone
());
//
errorMsg = checkMobile(excel.getPhone());
if
(!
errorMsg
.
contains
(
HouseConfigConstants
.
SUCESS
))
{
//
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMsg
,
excel
));
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
continue
;
//
continue;
}
//
}
}
//
}
// 新老数据审核人办理人不同,先删除,再添加
// 新老数据审核人办理人不同,先删除,再添加
if
(
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
!
excel
.
getAuditUserName
().
equals
(
info
.
getAuditUserName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
!
excel
.
getAuditUserName
().
equals
(
info
.
getAuditUserName
()))
{
tSocialfundHouseResService
.
deleteAuditUser
(
info
);
tSocialfundHouseResService
.
deleteAuditUser
(
info
);
...
...
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