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
2e62e6ea
Commit
2e62e6ea
authored
Aug 04, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
35e2ccae
6913034d
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
225 additions
and
128 deletions
+225
-128
TSettleDomainMapper.java
...oud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
+2
-2
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+1
-1
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+1
-1
ValidityConstants.java
....plus.v1/yifu/common/core/constant/ValidityConstants.java
+2
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+1
-1
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+1
-1
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+2
-2
ValidityUtil.java
...yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
+1
-1
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+186
-92
TAgentConfigServiceImpl.java
.../v1/yifu/social/service/impl/TAgentConfigServiceImpl.java
+1
-0
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+27
-27
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @
2e62e6ea
...
...
@@ -36,12 +36,12 @@ import java.util.List;
public
interface
TSettleDomainMapper
extends
BaseMapper
<
TSettleDomain
>
{
/**
* @param
id
* @param
departNo
* @Author: wangan
* @Date: 2019/10/18
* @Description: 通过id获取项目及单位部分信息
**/
TSettleDomainSelectVo
selectSettleDomainSelectVosById
(
@Param
(
"
id"
)
String
id
);
TSettleDomainSelectVo
selectSettleDomainSelectVosById
(
@Param
(
"
departNo"
)
String
departNo
);
/**
* 获取所有客户单位的项目信息
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
2e62e6ea
...
...
@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
**/
@Override
public
TSettleDomainSelectVo
selectSettleDomainSelectVosById
(
TSettleDomainSelectVo
settleDomainSelectVo
)
{
return
baseMapper
.
selectSettleDomainSelectVosById
(
settleDomainSelectVo
.
get
Id
());
return
baseMapper
.
selectSettleDomainSelectVosById
(
settleDomainSelectVo
.
get
DepartNo
());
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
2e62e6ea
...
...
@@ -176,7 +176,7 @@
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
WHERE a.
id=#{id} GROUP BY a.id
WHERE a.
DEPART_NO=#{departNo} GROUP BY a.DEPART_NO
</select>
<select
id=
"selectAllSettleDomainSelectVos"
resultMap=
"tSettleDomainSelectVoMap"
>
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ValidityConstants.java
View file @
2e62e6ea
...
...
@@ -69,4 +69,6 @@ public class ValidityConstants {
/** 不超过两位小数的正数 */
public
static
final
String
POSITIVE_INTEGER_PATTERN_TWO_FLOAT
=
"^[+]?([0-9]+(.[0-9]{1,2})?)$"
;
/** 身份证规则(x只能大写) */
public
static
final
String
IDCARD_UPPERCASE_PATTERN
=
"(^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9X]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)"
;
}
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
2e62e6ea
...
...
@@ -84,7 +84,7 @@ public class ArchivesDaprUtil {
**/
public
R
<
TSettleDomainSelectVo
>
getSettleDomainSelectVoById
(
String
departId
){
TSettleDomainSelectVo
settleDomainSelectVo
=
new
TSettleDomainSelectVo
();
settleDomainSelectVo
.
set
Id
(
departId
);
settleDomainSelectVo
.
set
DepartNo
(
departId
);
R
<
TSettleDomainSelectVo
>
res
=
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getSettleDomainSelectVoById"
,
settleDomainSelectVo
,
TSettleDomainSelectVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
res
)){
return
R
.
failed
(
"获取派单校验需要的档案信息失败!"
);
...
...
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
2e62e6ea
...
...
@@ -12,6 +12,6 @@ dapr.check.appId=yifu-check
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.insurances.appUrl
=
http://yifu-
insurances
.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appUrl
=
http://yifu-
auth
.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
2e62e6ea
...
...
@@ -190,9 +190,9 @@ public class InsurancesConstants {
*/
public
static
final
String
REPLACE_EMP_INFO_SAME
=
"替换信息和被替换信息一致,无法替换"
;
/**
* 替换员工身份证号格式
有
误
* 替换员工身份证号格式
错
误
*/
public
static
final
String
REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE
=
"替换员工身份证号格式
有
误"
;
public
static
final
String
REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE
=
"替换员工身份证号格式
错
误"
;
/**
* 项目编码不能为空
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @
2e62e6ea
...
...
@@ -150,7 +150,7 @@ public class ValidityUtil {
if
(
Common
.
isEmpty
(
idCard
)){
return
Boolean
.
FALSE
;
}
return
idCard
.
matches
(
ValidityConstants
.
IDCARD_PATTERN
)
;
return
idCard
.
matches
(
ValidityConstants
.
IDCARD_
UPPERCASE_
PATTERN
)
;
}
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
2e62e6ea
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAgentConfigServiceImpl.java
View file @
2e62e6ea
...
...
@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
if
(
Common
.
isNotNull
(
count
))
{
return
R
.
failed
(
"同一城市,年度的政策不能重复新增"
);
}
baseMapper
.
insert
(
tAgentConfig
);
return
R
.
ok
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
2e62e6ea
...
...
@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
}
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private
void
initSettleDomainMaps
(
List
<
TSettleDomainSelectVo
>
settleDomainList
,
Map
<
String
,
String
>
settleDomainNameMap
,
Map
<
String
,
String
>
customerNameMap
,
Map
<
String
,
String
>
settleIdAndCustomerIdMap
)
{
//map数据封装
if
(
Common
.
isNotNull
(
settleDomainList
))
{
for
(
TSettleDomainSelectVo
settleDomainSelectVo
:
settleDomainList
)
{
settleDomainNameMap
.
put
(
settleDomainSelectVo
.
getId
(),
settleDomainSelectVo
.
getDepartName
());
settleIdAndCustomerIdMap
.
put
(
settleDomainSelectVo
.
getId
(),
settleDomainSelectVo
.
getCustomerId
());
if
(!
customerNameMap
.
containsKey
(
settleDomainSelectVo
.
getCustomerName
()))
{
customerNameMap
.
put
(
settleDomainSelectVo
.
getCustomerId
(),
settleDomainSelectVo
.
getCustomerName
());
}
}
}
}
/**
* 初始化社保公积金基数
*
...
...
@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initBaseSetMap
(
baseSocialTimeMap
,
baseFundTimeMap
,
baseSocialSetMap
,
baseFundSetMap
);
}
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private
void
initSettleDomainMaps
(
List
<
TSettleDomainSelectVo
>
settleDomainList
,
Map
<
String
,
String
>
settleDomainNameMap
,
Map
<
String
,
String
>
customerNameMap
,
Map
<
String
,
String
>
settleIdAndCustomerIdMap
)
{
//map数据封装
if
(
Common
.
isNotNull
(
settleDomainList
))
{
for
(
TSettleDomainSelectVo
settleDomainSelectVo
:
settleDomainList
)
{
settleDomainNameMap
.
put
(
settleDomainSelectVo
.
getId
(),
settleDomainSelectVo
.
getDepartName
());
settleIdAndCustomerIdMap
.
put
(
settleDomainSelectVo
.
getId
(),
settleDomainSelectVo
.
getCustomerId
());
if
(!
customerNameMap
.
containsKey
(
settleDomainSelectVo
.
getCustomerName
()))
{
customerNameMap
.
put
(
settleDomainSelectVo
.
getCustomerId
(),
settleDomainSelectVo
.
getCustomerName
());
}
}
}
}
/**
* 初始化派减的相关状态及数据
*
...
...
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