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
84ce6767
Commit
84ce6767
authored
Aug 04, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
缴费库 代码修改
parent
d556b8a5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
218 additions
and
123 deletions
+218
-123
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
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 @
84ce6767
...
@@ -36,12 +36,12 @@ import java.util.List;
...
@@ -36,12 +36,12 @@ import java.util.List;
public
interface
TSettleDomainMapper
extends
BaseMapper
<
TSettleDomain
>
{
public
interface
TSettleDomainMapper
extends
BaseMapper
<
TSettleDomain
>
{
/**
/**
* @param
id
* @param
departNo
* @Author: wangan
* @Author: wangan
* @Date: 2019/10/18
* @Date: 2019/10/18
* @Description: 通过id获取项目及单位部分信息
* @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 @
84ce6767
...
@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
**/
**/
@Override
@Override
public
TSettleDomainSelectVo
selectSettleDomainSelectVosById
(
TSettleDomainSelectVo
settleDomainSelectVo
)
{
public
TSettleDomainSelectVo
selectSettleDomainSelectVosById
(
TSettleDomainSelectVo
settleDomainSelectVo
)
{
return
baseMapper
.
selectSettleDomainSelectVosById
(
settleDomainSelectVo
.
get
Id
());
return
baseMapper
.
selectSettleDomainSelectVosById
(
settleDomainSelectVo
.
get
DepartNo
());
}
}
@Override
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
84ce6767
...
@@ -176,7 +176,7 @@
...
@@ -176,7 +176,7 @@
INDUSTRY_BELONG,
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
) 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>
<select
id=
"selectAllSettleDomainSelectVos"
resultMap=
"tSettleDomainSelectVoMap"
>
<select
id=
"selectAllSettleDomainSelectVos"
resultMap=
"tSettleDomainSelectVoMap"
>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
84ce6767
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 @
84ce6767
...
@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
...
@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
if
(
Common
.
isNotNull
(
count
))
{
if
(
Common
.
isNotNull
(
count
))
{
return
R
.
failed
(
"同一城市,年度的政策不能重复新增"
);
return
R
.
failed
(
"同一城市,年度的政策不能重复新增"
);
}
}
baseMapper
.
insert
(
tAgentConfig
);
return
R
.
ok
();
return
R
.
ok
();
}
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
84ce6767
...
@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -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
...
@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initBaseSetMap
(
baseSocialTimeMap
,
baseFundTimeMap
,
baseSocialSetMap
,
baseFundSetMap
);
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