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
3b7ce644
Commit
3b7ce644
authored
Sep 28, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
8eeecacb
894a17f7
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
72 additions
and
32 deletions
+72
-32
TCertRecordController.java
...us/v1/yifu/archives/controller/TCertRecordController.java
+1
-1
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+1
-0
TSettleDomainMapper.java
...oud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
+4
-1
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+5
-2
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+1
-1
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+8
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-1
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+21
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-6
TSalaryEmployeeController.java
.../v1/yifu/salary/controller/TSalaryEmployeeController.java
+1
-1
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+21
-19
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCertRecordController.java
View file @
3b7ce644
...
...
@@ -76,7 +76,7 @@ public class TCertRecordController {
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_DEPT_ID
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"dept_id"
));
}
if
(
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_CREATE_BY
))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_CREATE_BY
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
CommonConstants
.
A_CREATE_BY
,
"CREATE_BY"
));
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
3b7ce644
...
...
@@ -64,6 +64,7 @@ public class TSettleDomainController {
* @param tSettleDomain 项目表
* @return
*/
// 2022-9-27 16:36:56hgw备注:前端用这个接口模糊搜索项目信息:/yifu-archives/method/tempchangeinfo/getAllDeptPage
@Operation
(
summary
=
"分页查询"
,
description
=
"分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TSettleDomain
>>
getTSettleDomainPage
(
Page
<
TSettleDomain
>
page
,
TSettleDomain
tSettleDomain
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @
3b7ce644
...
...
@@ -18,9 +18,11 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -35,6 +37,7 @@ import java.util.List;
@Mapper
public
interface
TSettleDomainMapper
extends
BaseMapper
<
TSettleDomain
>
{
IPage
<
TSettleDomain
>
getPage
(
Page
<
TSettleDomain
>
page
,
@Param
(
"tSettleDomain"
)
TSettleDomain
tSettleDomain
);
/**
* @param departNo
* @Author: wangan
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
3b7ce644
...
...
@@ -17,16 +17,16 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
java.util.List
;
import
java.util.Map
;
/**
* 项目表
...
...
@@ -35,6 +35,9 @@ import java.util.Map;
* @date 2022-06-20 10:02:28
*/
public
interface
TSettleDomainService
extends
IService
<
TSettleDomain
>
{
IPage
<
TSettleDomain
>
getPage
(
Page
<
TSettleDomain
>
page
,
TSettleDomain
tSettleDomain
);
/**
* 清除userId的项目权限缓存
*
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
3b7ce644
...
...
@@ -308,7 +308,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
private
LambdaQueryWrapper
buildQueryWrapper
(
String
deptName
)
{
LambdaQueryWrapper
<
TSettleDomain
>
wrapper
=
Wrappers
.
lambdaQuery
();
if
(
Common
.
isNotNull
(
deptName
))
{
wrapper
.
like
Right
(
TSettleDomain:
:
getDepartName
,
deptName
);
wrapper
.
like
(
TSettleDomain:
:
getDepartName
,
deptName
);
}
wrapper
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
);
wrapper
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
ZERO_STRING
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
3b7ce644
...
...
@@ -16,7 +16,9 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo
;
...
...
@@ -62,6 +64,12 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
private
UpmsDaprUtils
upmsDaprUtils
;
private
final
TCutsomerDataPermissonMapper
permissonMapper
;
@Override
public
IPage
<
TSettleDomain
>
getPage
(
Page
<
TSettleDomain
>
page
,
TSettleDomain
tSettleDomain
)
{
return
baseMapper
.
getPage
(
page
,
tSettleDomain
);
}
/**
* @Author fxj
* @Description 清除项目缓存
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
3b7ce644
...
...
@@ -295,7 +295,7 @@
AND a.EMP_NATRUE = #{tEmployeeInfo.empNatrue}
</if>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
AND a.EMP_NAME
= #{tEmployeeInfo.empName}
AND a.EMP_NAME
like concat('%',#{tEmployeeInfo.empName},'%')
</if>
<if
test=
"tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
3b7ce644
...
...
@@ -196,6 +196,27 @@
<result
property=
"bpoFlag"
column=
"BPO_FLAG"
/>
</resultMap>
<select
id=
"getPage"
resultMap=
"tSettleDomainMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_settle_domain a
WHERE 1=1
<if
test=
"tSettleDomain != null"
>
<if
test=
"tSettleDomain.departName != null and tSettleDomain.departName.trim() != ''"
>
and a.DEPART_NAME like concat('%', #{tSettleDomain.departName} ,'%')
</if>
<if
test=
"tSettleDomain.departNo != null and tSettleDomain.departNo.trim() != ''"
>
and a.DEPART_NO = #{tSettleDomain.departNo}
</if>
<if
test=
"tSettleDomain.deleteFlag != null and tSettleDomain.deleteFlag.trim() != ''"
>
and a.DELETE_FLAG = #{tSettleDomain.deleteFlag}
</if>
<if
test=
"tSettleDomain.stopFlag != null and tSettleDomain.stopFlag.trim() != ''"
>
and a.STOP_FLAG = #{tSettleDomain.stopFlag}
</if>
</if>
</select>
<select
id=
"selectSettleDomainSelectVosById"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
SELECT
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3b7ce644
...
...
@@ -3527,12 +3527,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
R
<
SetInfoVo
>
setInfoByCodes
=
archivesDaprUtil
.
getSetInfoByCodes
(
collect
);
if
(
null
!=
setInfoByCodes
&&
setInfoByCodes
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
Common
.
isNotNull
(
setInfoByCodes
.
getData
()))
{
Map
<
String
,
ProjectSetInfoVo
>
data
=
setInfoByCodes
.
getData
().
getProjectSetInfoVoMap
();
for
(
RefundExportListVo
record
:
insuranceRefundHandlingPageList
.
getRecords
())
{
//购买月数
record
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
record
.
getPolicyStart
().
toString
(),
record
.
getPolicyEnd
().
toString
()));
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
if
(
null
!=
jsonObject
){
record
.
setProjectName
(
Optional
.
ofNullable
(
jsonObject
.
getDepartName
()).
orElse
(
""
));
if
(
data
!=
null
)
{
for
(
RefundExportListVo
record
:
insuranceRefundHandlingPageList
.
getRecords
())
{
//购买月数
record
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
record
.
getPolicyStart
().
toString
(),
record
.
getPolicyEnd
().
toString
()));
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
if
(
null
!=
jsonObject
)
{
record
.
setProjectName
(
Optional
.
ofNullable
(
jsonObject
.
getDepartName
()).
orElse
(
""
));
}
}
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java
View file @
3b7ce644
...
...
@@ -155,7 +155,7 @@ public class TSalaryEmployeeController {
if
(
user
!=
null
&&
Common
.
isNotNull
(
user
.
getId
()))
{
menuUtil
.
setAuthSql
(
user
,
searchVo
);
}
if
(
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_CREATE_BY
))
{
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
())
&&
searchVo
.
getAuthSql
().
contains
(
CommonConstants
.
A_CREATE_BY
))
{
searchVo
.
setAuthSql
(
searchVo
.
getAuthSql
().
replace
(
CommonConstants
.
A_CREATE_BY
,
"CREATE_BY"
));
}
tSalaryEmployeeService
.
listExport
(
response
,
searchVo
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
3b7ce644
...
...
@@ -757,25 +757,27 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @Date: 2020/11/25 15:51
* @return: void
**/
private
void
initLibraryBigMoneyBySocial
(
TForecastLibrary
library
,
TSocialFundInfo
socialInfo
)
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getPaymentType
()))
{
// 自定义类型大病随基数配置变化:0不随配置 1随配置 2.单位大病随配置 3个人大病随配置
// 2022-7-20 11:46:32 与房工沟通,派单没这个逻辑,所以都是随配置直接计算
// 直接计算单位大病
library
.
setUnitBitailmentFee
(
socialInfo
.
getUnitBigailmentMoney
());
library
.
setPersonalBigailmentFee
(
socialInfo
.
getPersonalBigailmentMoney
());
// 非自定义,从社保基数配置取信息
}
else
{
// 大病处理: 0 收取 按派单的社保里的基数和比例来
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()))
{
// 大病收取方式 0.按年 判断当前月份是否收取大病 按年收大病起缴月份收取一次,非当年的 大病 按实际收取月份收取大病金额
this
.
setBigMoney
(
library
,
socialInfo
,
socialInfo
.
getPaymentType
());
// 大病处理: 1 不收取
private
void
initLibraryBigMoneyBySocial
(
TForecastLibrary
library
,
TSocialFundInfo
socialInfo
)
{
int
libraryPayMonth
=
Integer
.
parseInt
(
library
.
getSocialPayMonth
());
if
(
socialInfo
.
getBigailmentStart
()
!=
null
&&
libraryPayMonth
>=
DateUtil
.
formatDateInt
(
socialInfo
.
getBigailmentStart
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getPaymentType
()))
{
// 自定义类型大病随基数配置变化:0不随配置 1随配置 2.单位大病随配置 3个人大病随配置
// 2022-7-20 11:46:32 与房工沟通,派单没这个逻辑,所以都是随配置直接计算
// 直接计算单位大病
library
.
setUnitBitailmentFee
(
socialInfo
.
getUnitBigailmentMoney
());
library
.
setPersonalBigailmentFee
(
socialInfo
.
getPersonalBigailmentMoney
());
// 非自定义,从社保基数配置取信息
}
else
{
library
.
setUnitBitailmentFee
(
BigDecimal
.
ZERO
);
library
.
setPersonalBigailmentFee
(
BigDecimal
.
ZERO
);
// 大病处理: 0 收取 按派单的社保里的基数和比例来
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getIsIllness
()))
{
// 大病收取方式 0.按年 判断当前月份是否收取大病 按年收大病起缴月份收取一次,非当年的 大病 按实际收取月份收取大病金额
this
.
setBigMoney
(
library
,
socialInfo
,
socialInfo
.
getPaymentType
());
// 大病处理: 1 不收取
}
else
{
library
.
setUnitBitailmentFee
(
BigDecimal
.
ZERO
);
library
.
setPersonalBigailmentFee
(
BigDecimal
.
ZERO
);
}
}
}
}
...
...
@@ -1997,7 +1999,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//封装社保预估数据
if
(
Common
.
isNotNull
(
socialInfoList
))
{
for
(
TSocialFundInfo
tSocialInfo
:
socialInfoList
)
{
minStartDate
=
this
.
getMinDate
(
tSocialInfo
);
minStartDate
=
this
.
getMin
Social
Date
(
tSocialInfo
);
createMonth
=
ServiceUtil
.
initCreateMonth
(
tSocialInfo
.
getCreateTime
(),
payMonth
);
sfMapKey
=
this
.
getMapKey
(
tSocialInfo
.
getEmpIdcard
(),
tSocialInfo
.
getSettleDomain
(),
payMonth
,
createMonth
,
CommonConstants
.
ZERO_STRING
);
...
...
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