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
ef20be85
Commit
ef20be85
authored
Aug 26, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
92f86cc7
658d41f0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
36 changed files
with
711 additions
and
59 deletions
+711
-59
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+3
-0
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+44
-2
IdCardUtil.java
.../yifu/cloud/plus/v1/yifu/common/core/util/IdCardUtil.java
+6
-6
SocialDaprUtils.java
.../cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
+34
-0
TSalaryAccount.java
...yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
+4
-1
TStatisticsDeclarer.java
...cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
+0
-8
TStatisticsBonusImportVo.java
...loud/plus/v1/yifu/salary/vo/TStatisticsBonusImportVo.java
+8
-1
UpdateSocialFoundVo.java
...ifu/cloud/plus/v1/yifu/salary/vo/UpdateSocialFoundVo.java
+29
-0
TSalaryAccountMapper.java
...loud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
+1
-2
TSalaryAccountService.java
...ud/plus/v1/yifu/salary/service/TSalaryAccountService.java
+1
-2
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+8
-5
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+2
-2
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+16
-0
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+340
-10
TStatisticsDeclarerServiceImpl.java
...u/salary/service/impl/TStatisticsDeclarerServiceImpl.java
+23
-0
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+5
-0
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+13
-2
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+19
-3
TStatisticsCurrentReportMapper.xml
.../main/resources/mapper/TStatisticsCurrentReportMapper.xml
+3
-1
TStatisticsDeclarerMapper.xml
...z/src/main/resources/mapper/TStatisticsDeclarerMapper.xml
+3
-8
TForecastLibraryController.java
...v1/yifu/social/controller/TForecastLibraryController.java
+14
-0
TPaymentInfoController.java
...lus/v1/yifu/social/controller/TPaymentInfoController.java
+14
-0
TSocialFundInfoController.java
.../v1/yifu/social/controller/TSocialFundInfoController.java
+15
-0
TForecastLibraryMapper.java
...ud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
+3
-0
TPaymentInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
+3
-0
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+5
-0
TForecastLibraryService.java
.../plus/v1/yifu/social/service/TForecastLibraryService.java
+3
-0
TPaymentInfoService.java
...loud/plus/v1/yifu/social/service/TPaymentInfoService.java
+3
-0
TSocialFundInfoService.java
...d/plus/v1/yifu/social/service/TSocialFundInfoService.java
+3
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+8
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+18
-3
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+1
-0
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+12
-2
TForecastLibraryMapper.xml
...-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
+13
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+15
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+19
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
ef20be85
...
...
@@ -343,6 +343,9 @@ public class TEmployeeProject extends BaseEntity {
@Schema
(
description
=
"社保-县"
)
private
Integer
socialTown
;
@TableField
(
exist
=
false
)
private
String
changeStartMonth
;
/**
* 员工合同状态(字典)
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
ef20be85
...
...
@@ -36,6 +36,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.MsgUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
import
org.springframework.validation.BindingResult
;
...
...
@@ -61,6 +63,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
private
final
TEmployeeLogServiceImpl
tEmployeeLogService
;
private
final
SocialDaprUtils
socialDaprUtils
;
public
static
final
Pattern
PATTERN
=
Pattern
.
compile
(
"^[-\\+]?[\\d]*$"
);
/**
...
...
@@ -78,11 +82,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if
(
Common
.
isNotNull
(
tEmployeeProject
))
{
return
R
.
failed
(
"待划转员工已在目标项目下不可划转"
);
}
//TODO
//划转+已产生未结算金额划转,并且选择了划转月份
//社保公积金派单处需要直接修改为最新的项目
//社保预估库、缴费库、对比库、代理差额库,需要同步修改未结算(并且满足这个条件:数据 生成月≥此处划转起始月)的数据,已结算数据不变更;
//划转,更新项目信息
TEmployeeProject
updateTEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
tEmpChangeInfo
.
getEmpIdcard
()).
eq
(
TEmployeeProject:
:
getDeptName
,
tEmpChangeInfo
.
getOldSettle
())
...
...
@@ -111,7 +113,27 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
tEmpChangeInfo
.
setProId
(
updateTEmployeeProject
.
getId
());
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
updateTEmployeeProject
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeeProject
);
UpdateSocialFoundVo
updateSocialFoundVo
=
new
UpdateSocialFoundVo
();
updateSocialFoundVo
.
setEmpIdcard
(
tEmpChangeInfo
.
getEmpIdcard
());
updateSocialFoundVo
.
setSettleDomainCode
(
tEmpChangeInfo
.
getDeptNo
());
updateSocialFoundVo
.
setSettleDomainId
(
tEmpChangeInfo
.
getDeptId
());
updateSocialFoundVo
.
setUnitId
(
tEmpChangeInfo
.
getUnitId
());
updateSocialFoundVo
.
setUnitName
(
tEmpChangeInfo
.
getNewDept
());
updateSocialFoundVo
.
setSocialCreateMonth
(
tEmpChangeInfo
.
getChangeStartMonth
());
socialDaprUtils
.
updatePaymentSocialAndFound
(
updateSocialFoundVo
);
socialDaprUtils
.
updateForSocialAndFound
(
updateSocialFoundVo
);
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
updateTEmployeeProject
.
getSocialStatus
()))
{
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
updateTEmployeeProject
.
getFundStatus
()))
{
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
}
//保存档案划转记录
this
.
save
(
tEmpChangeInfo
);
return
R
.
ok
();
...
...
@@ -197,6 +219,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setUnitNo
(
tCustomerInfo
.
getCustomerCode
());
updateTEmployeePro
.
setUnitName
(
tCustomerInfo
.
getCustomerName
());
}
updateTEmployeePro
.
setChangeStartMonth
(
excel
.
getChangeStartMonth
());
updateList
.
add
(
updateTEmployeePro
);
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
],
""
,
tEmployeeProjectOld
.
getId
(),
tEmployeeProjectOld
,
updateTEmployeePro
);
...
...
@@ -214,6 +237,25 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
return
R
.
failed
(
errorMessageList
);
}
else
{
tEmployeeProjectService
.
updateBatchById
(
updateList
);
for
(
TEmployeeProject
tEmployeeProject:
updateList
)
{
UpdateSocialFoundVo
updateSocialFoundVo
=
new
UpdateSocialFoundVo
();
updateSocialFoundVo
.
setEmpIdcard
(
tEmployeeProject
.
getEmpIdcard
());
updateSocialFoundVo
.
setSettleDomainCode
(
tEmployeeProject
.
getDeptNo
());
updateSocialFoundVo
.
setSettleDomainId
(
tEmployeeProject
.
getDeptId
());
updateSocialFoundVo
.
setUnitId
(
tEmployeeProject
.
getUnitId
());
updateSocialFoundVo
.
setUnitName
(
tEmployeeProject
.
getUnitName
());
updateSocialFoundVo
.
setSocialCreateMonth
(
tEmployeeProject
.
getChangeStartMonth
());
socialDaprUtils
.
updatePaymentSocialAndFound
(
updateSocialFoundVo
);
socialDaprUtils
.
updateForSocialAndFound
(
updateSocialFoundVo
);
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
tEmployeeProject
.
getSocialStatus
()))
{
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
tEmployeeProject
.
getFundStatus
()))
{
updateSocialFoundVo
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updateSocialFoundVo
);
}
}
}
return
R
.
ok
();
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/IdCardUtil.java
View file @
ef20be85
...
...
@@ -33,7 +33,6 @@ public class IdCardUtil {
/**
* 根据身份证号计算周岁
* 例如:当前时间是2022-08-22,那么2007-08-22算15周岁,2007-08-23才算16周岁
*
* @author licancan
* @param idNO
...
...
@@ -58,11 +57,12 @@ public class IdCardUtil {
int
yearBirth
=
bir
.
get
(
Calendar
.
YEAR
);
int
monthBirth
=
bir
.
get
(
Calendar
.
MONTH
);
int
dayBirth
=
bir
.
get
(
Calendar
.
DAY_OF_MONTH
);
// 大概年龄是当前年减去出生年
int
age
=
yearNow
-
yearBirth
;
// 如果出当前月大于出生月,或者当前月等于出生月但是当前日大于出生日,那么年龄age就加一岁
if
(
monthNow
>
monthBirth
||
(
monthNow
==
monthBirth
&&
dayNow
>
dayBirth
))
{
age
++;
int
age
;
// 如果当前月大于出生月,或者当前月等于出生月但是当前日大于出生日 直接减,否则再减1
if
((
monthBirth
<
monthNow
)
||
(
monthBirth
==
monthNow
&&
dayBirth
<
dayNow
))
{
age
=
yearNow
-
yearBirth
;
}
else
{
age
=
yearNow
-
yearBirth
-
1
;
}
return
age
;
}
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java
View file @
ef20be85
...
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
...
...
@@ -43,4 +44,37 @@ public class SocialDaprUtils {
}
return
noSocialVoR
;
}
/**
* @Author huyc
* @Description 去缴费库查询查询这些人社保是否存在
* @Date 17:38 2022/8/15
* @Param
* @return
**/
public
void
updatePaymentSocialAndFound
(
UpdateSocialFoundVo
infoVo
)
{
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tpaymentinfo/inner/updatePaymentSocialAndFound"
,
JSON
.
toJSONString
(
infoVo
),
UpdateSocialFoundVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 去缴费库查询查询这些人社保是否存在
* @Date 17:38 2022/8/15
* @Param
* @return
**/
public
void
updateForSocialAndFound
(
UpdateSocialFoundVo
infoVo
)
{
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tpaymentinfo/inner/updateForSocialAndFound"
,
JSON
.
toJSONString
(
infoVo
),
UpdateSocialFoundVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 去缴费库查询查询这些人社保是否存在
* @Date 17:38 2022/8/15
* @Param
* @return
**/
public
void
updateSocialAndFoundInfo
(
UpdateSocialFoundVo
infoVo
)
{
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tsocialfundinfo/inner/updateSocialAndFoundInfo"
,
JSON
.
toJSONString
(
infoVo
),
UpdateSocialFoundVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java
View file @
ef20be85
...
...
@@ -23,8 +23,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
...
...
@@ -40,8 +42,9 @@ import java.util.List;
*/
@Data
@TableName
(
"t_salary_account"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"工资报账主表(工资条)"
)
public
class
TSalaryAccount
{
public
class
TSalaryAccount
extends
BaseEntity
{
/**
* 主键
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
View file @
ef20be85
...
...
@@ -46,7 +46,6 @@ public class TStatisticsDeclarer {
* ID
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelProperty
(
"ID"
)
private
String
id
;
/**
* 申报单位
...
...
@@ -84,13 +83,6 @@ public class TStatisticsDeclarer {
@Length
(
max
=
11
,
message
=
"手机号码不能超过11个字符"
)
@ExcelProperty
(
"手机号码"
)
private
String
empPhone
;
/**
* 人员状态
*/
@ExcelAttribute
(
name
=
"人员状态"
,
maxLength
=
2
,
readConverterExp
=
"0=在职,1=离职"
)
@Length
(
max
=
2
,
message
=
"人员状态不能超过2个字符"
)
@ExcelProperty
(
"人员状态"
)
private
String
empStatus
;
/**
* 任职受雇从业类型
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsBonusImportVo.java
View file @
ef20be85
...
...
@@ -33,7 +33,7 @@ import java.math.BigDecimal;
* @date 2022-08-14 21:31:15
*/
@Data
public
class
TStatisticsBonusImportVo
extends
RowIndex
implements
Serializable
{
public
class
TStatisticsBonusImportVo
implements
Serializable
{
/**
* 员工姓名
...
...
@@ -107,6 +107,13 @@ public class TStatisticsBonusImportVo extends RowIndex implements Serializable {
@Schema
(
description
=
"最优方案-12月扣税"
)
@ExcelProperty
(
"最优方案-12月扣税"
)
private
BigDecimal
bestPlanTax
;
/**
* 12月份应纳税所得额扣除费用
*/
@ExcelAttribute
(
name
=
"12月份应纳税所得额扣除费用"
)
@Schema
(
description
=
"12月份应纳税所得额扣除费用"
)
@ExcelProperty
(
"12月份应纳税所得额扣除费用"
)
private
BigDecimal
deductTaxSalary
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/UpdateSocialFoundVo.java
0 → 100644
View file @
ef20be85
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
lombok.Data
;
/**
* @Author huyc
* @Date 2022/8/25
* @Description
* @Version 1.0
*/
@Data
public
class
UpdateSocialFoundVo
{
private
String
empIdcard
;
private
String
unitName
;
private
String
unitId
;
private
String
settleDomainId
;
private
String
settleDomainName
;
private
String
settleDomainCode
;
private
String
socialCreateMonth
;
private
String
flag
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
View file @
ef20be85
...
...
@@ -82,13 +82,12 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
@Param
(
"month3"
)
String
month3
);
/**
* @param settleId
* @Description: 薪资类型互斥校验 获取本年度身份证号列表
* @Author: huyc
* @Date: 2022/8/18
* @return:
**/
List
<
String
>
getAccountYearCheckList
(
@Param
(
"settleId"
)
String
settleId
);
List
<
String
>
getAccountYearCheckList
();
List
<
TSalaryAccount
>
noPageDiy
(
@Param
(
"searchVo"
)
TSalaryAccountSearchVo
searchVo
,
@Param
(
"idList"
)
List
<
String
>
idList
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java
View file @
ef20be85
...
...
@@ -80,11 +80,10 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
List
<
THaveSalaryNosocial
>
getLastMonthTHaveSalaryNosocial
(
String
month
);
/**
* @param settleId
* @Description: 薪资类型互斥校验 获取本年度身份证号列表
* @Author: huyc
* @Date: 2022/8/18
* @return:
**/
List
<
String
>
getAccountYearCheckMap
(
String
settleId
);
List
<
String
>
getAccountYearCheckMap
();
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
ef20be85
...
...
@@ -187,7 +187,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
// 劳务费和稿酬 薪资类型互斥校验Map格式:本年度#身份证号
if
(
CommonConstants
.
THREE_STRING
.
equals
(
salaryType
)
||
CommonConstants
.
FOUR_STRING
.
equals
(
salaryType
))
{
if
(
Common
.
isNotNull
(
configSalary
))
{
checkListY
=
tSalaryAccountService
.
getAccountYearCheckMap
(
dept
.
getId
()
);
checkListY
=
tSalaryAccountService
.
getAccountYearCheckMap
();
}
}
...
...
@@ -772,6 +772,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
SalaryConstants
.
ACTUAL_SALARY_SUM_JAVA
,
calculation
(
a
,
relaySalary
,
saiList
),
CommonConstants
.
ZERO_INT
);
}
if
(
relaySalary
.
compareTo
(
BigDecimal
.
ZERO
)
<=
0
)
{
relaySalary
=
a
.
getRelaySalary
();
}
//计算个人社保、公积金欠款————工资不够扣缴社保的
if
(
relaySalary
.
compareTo
(
personalDebt
)
==
SalaryConstants
.
LESS_THAN
)
{
this
.
saveNewItems
(
sai
,
saiList
,
SalaryConstants
.
PERSONAL_DEBT
,
...
...
@@ -1964,9 +1967,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
nowTaxT
=
getNowTaxRemu
(
actualSalarySumNow
);
relaySalary
=
BigDecimalUtils
.
safeAdd
(
actualSalarySumNow
,
nowTaxT
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
a
.
setSalaryTax
Unit
(
nowTaxT
);
a
.
setActualSalary
(
actualSalarySumNow
);
a
.
setRelaySalaryUnit
(
relaySalary
);
a
.
setSalaryTax
(
nowTaxT
);
a
.
setActualSalary
(
relaySalary
);
a
.
setRelaySalaryUnit
(
actualSalarySumNow
);
a
.
setRelaySalary
(
actualSalarySumNow
);
if
(
sumTax
.
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
nowTaxT
=
BigDecimalUtils
.
safeSubtract
(
nowTaxT
,
sumTax
).
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
...
...
@@ -1976,7 +1979,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
sai
.
setCnName
(
SalaryConstants
.
RELAY_SALARY
);
sai
.
setJavaFiedName
(
SalaryConstants
.
RELAY_SALARY_JAVA
);
sai
.
setIsTax
(
CommonConstants
.
ZERO_INT
);
sai
.
setSalaryMoney
(
relaySalary
);
sai
.
setSalaryMoney
(
actualSalarySumNow
);
saiList
.
add
(
sai
);
return
nowTaxT
;
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
ef20be85
...
...
@@ -197,7 +197,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
}
@Override
public
List
<
String
>
getAccountYearCheckMap
(
String
settleId
)
{
return
baseMapper
.
getAccountYearCheckList
(
settleId
);
public
List
<
String
>
getAccountYearCheckMap
()
{
return
baseMapper
.
getAccountYearCheckList
();
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
ef20be85
...
...
@@ -292,6 +292,22 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return
SalaryConstants
.
CHECK_NO_RESPONSE
;
}
}
// if (Common.isNotNull(employee.getBankNo())) {
// // 调用校验服务
// TCheckBankNo checkIdCard = new TCheckBankNo();
// checkIdCard.setName(employee.getEmpName());
// checkIdCard.setBankNo(employee.getBankNo());
// R<TCheckBankNo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
// , "/tcheckbankno/inner/checkBankNo", checkIdCard, TCheckBankNo.class, SecurityConstants.FROM_IN);
// if (checkListR != null && checkListR.getData() != null) {
// TCheckBankNo check = checkListR.getData();
// if (!CommonConstants.ONE_STRING.equals(check.getResult())) {
// return check.getMessage();
// }
// } else {
// return "校验服务未找到银行卡,请联系管理员";
// }
// }
// 手机号
if
(
Common
.
isNotNull
(
employee
.
getEmpPhone
()))
{
// 调用校验服务-校验手机号
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
ef20be85
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsDeclarerServiceImpl.java
View file @
ef20be85
...
...
@@ -29,14 +29,20 @@ 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.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsDeclarerService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsDeclarerSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsDeclarerVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.stereotype.Service
;
import
javax.servlet.ServletOutputStream
;
...
...
@@ -54,7 +60,12 @@ import java.util.List;
*/
@Log4j2
@Service
@EnableConfigurationProperties
(
DaprArchivesProperties
.
class
)
public
class
TStatisticsDeclarerServiceImpl
extends
ServiceImpl
<
TStatisticsDeclarerMapper
,
TStatisticsDeclarer
>
implements
TStatisticsDeclarerService
{
@Autowired
private
DaprArchivesProperties
archivesProperties
;
/**
* 申报对象表简单分页查询
* @param tStatisticsDeclarer 申报对象表
...
...
@@ -175,6 +186,18 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
String
lastYear
=
lastMonth
.
substring
(
0
,
4
);
List
<
TStatisticsDeclarer
>
stdvoList
=
baseMapper
.
doStatisticsTaxDeclarer
(
nowMonth
,
lastYear
);
for
(
TStatisticsDeclarer
declarer
:
stdvoList
)
{
if
(
Common
.
isNotNull
(
declarer
.
getDeclareUnit
()))
{
R
<
TSettleDomainSelectVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/tsettledomain/inner/getSettleDomainVoById"
,
declarer
.
getDeclareUnit
(),
TSettleDomainSelectVo
.
class
,
SecurityConstants
.
FROM_IN
);
// 结算主体
TSettleDomainSelectVo
dept
=
null
;
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
dept
=
sdr
.
getData
();
}
if
(
Common
.
isNotNull
(
dept
))
{
declarer
.
setDeclareUnit
(
dept
.
getBusinessSubjectName
());
}
}
this
.
save
(
declarer
);
}
return
R
.
ok
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
ef20be85
...
...
@@ -254,6 +254,11 @@ public class SalaryAccountUtil implements Serializable {
cellValueBig
=
new
BigDecimal
(
cellValueStr
);
cellValueBig
=
cellValueBig
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
//四舍五入
if
(
cellValueBig
.
toString
().
length
()
>
11
)
{
if
(
cellValueBig
.
toString
().
length
()
>
500
)
{
errorFlag
=
false
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
"文本超长!"
));
continue
;
}
sai
.
setTextValue
(
cellValueBig
.
toString
());
}
else
{
sai
.
setSalaryMoney
(
cellValueBig
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
ef20be85
...
...
@@ -67,6 +67,11 @@
<result
property=
"salaryTaxUnit"
column=
"SALARY_TAX_UNIT"
/>
<result
property=
"haveSalaryFlag"
column=
"HAVE_SALARY_FLAG"
/>
<result
property=
"haveSpecialFlag"
column=
"HAVE_SPECIAL_FLAG"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -111,7 +116,12 @@
a.RELAY_SALARY_UNIT,
a.SALARY_TAX_UNIT,
a.HAVE_SALARY_FLAG,
a.HAVE_SPECIAL_FLAG
a.HAVE_SPECIAL_FLAG,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
</sql>
<sql
id=
"tSalaryAccount_where"
>
<if
test=
"tSalaryAccount != null"
>
...
...
@@ -250,6 +260,7 @@
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include
refid=
"tSalaryAccount_where"
/>
</where>
order by a.CREATE_TIME desc
</select>
<!-- 获取校验的报账明细 ### 格式:身份证号_工资月份_报表类型_应发金额 -->
...
...
@@ -340,7 +351,7 @@
<select
id=
"getAccountYearCheckList"
resultType=
"java.lang.String"
>
select a.EMP_IDCARD
from t_salary_account a
where a.DELETE_FLAG = 0 and a.
DEPT_ID = #{settleId} and a.
FORM_TYPE = '0' and a.SALARY_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%')
where a.DELETE_FLAG = 0 and a.FORM_TYPE = '0' and a.SALARY_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%')
</select>
<select
id=
"noPageDiy"
resultMap=
"tSalaryAccountMap"
parameterType=
"com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount"
>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
ef20be85
...
...
@@ -271,10 +271,26 @@
<include
refid=
"Base_Column_List"
/>
FROM t_salary_standard a
<where>
a.DELETE_FLAG = 0
<include
refid=
"where_page"
/>
1=1
AND a.DELETE_FLAG = 0
<if
test=
"tSalaryStandard != null"
>
<if
test=
"tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''"
>
AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%')
</if>
<if
test=
"tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''"
>
AND a.DEPT_NO = #{tSalaryStandard.deptNo}
</if>
<if
test=
"tSalaryStandard.salaryMonth != null and tSalaryStandard.salaryMonth.trim() != ''"
>
AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
</if>
<if
test=
"tSalaryStandard.status == null"
>
AND a.STATUS = 1 OR a.STATUS = 2 or a.STATUS = 5
</if>
<if
test=
"tSalaryStandard.status != null"
>
AND a.STATUS = #{tSalaryStandard.status}
</if>
</if>
</where>
ORDER BY a.CREATE_TIME desc
</select>
<resultMap
id=
"salaryStandardExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo"
>
<result
property=
"status"
column=
"STATUS"
/>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsCurrentReportMapper.xml
View file @
ef20be85
...
...
@@ -201,6 +201,7 @@
1=1
<include
refid=
"tStatisticsCurrentReport_where"
/>
</where>
order by a.DECLARE_MONTH desc
</select>
<!-- 本期申报 -->
...
...
@@ -257,7 +258,8 @@
where m.declare_MONTH
<![CDATA[<=]]>
#{lastMonth} and m.declare_MONTH like '${nowYear}%'
GROUP BY m.EMP_IDCARD,m.INVOICE_TITLE
) m on m.EMP_IDCARD=s.EMP_IDCARD and m.INVOICE_TITLE = s.INVOICE_TITLE
where s.DECLARE_MONTH = #{nowMonth}
left join t_statistics_declarer d on d.EMP_IDCARD=s.EMP_IDCARD and d.DECLARE_MONTH=#{nowMonth}
where s.DECLARE_MONTH = #{nowMonth} and (d.id is null or d.IS_DECLARE = '0')
)
</insert>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsDeclarerMapper.xml
View file @
ef20be85
...
...
@@ -30,7 +30,6 @@
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"empPhone"
column=
"EMP_PHONE"
/>
<result
property=
"empStatus"
column=
"EMP_STATUS"
/>
<result
property=
"occupationType"
column=
"OCCUPATION_TYPE"
/>
<result
property=
"occupationMonth"
column=
"OCCUPATION_MONTH"
/>
<result
property=
"isDeclare"
column=
"IS_DECLARE"
/>
...
...
@@ -43,7 +42,6 @@
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_PHONE,
a.EMP_STATUS,
a.OCCUPATION_TYPE,
a.OCCUPATION_MONTH,
a.IS_DECLARE,
...
...
@@ -69,9 +67,6 @@
<if
test=
"tStatisticsDeclarer.empPhone != null and tStatisticsDeclarer.empPhone.trim() != ''"
>
AND a.EMP_PHONE = #{tStatisticsDeclarer.empPhone}
</if>
<if
test=
"tStatisticsDeclarer.empStatus != null and tStatisticsDeclarer.empStatus.trim() != ''"
>
AND a.EMP_STATUS = #{tStatisticsDeclarer.empStatus}
</if>
<if
test=
"tStatisticsDeclarer.occupationType != null and tStatisticsDeclarer.occupationType.trim() != ''"
>
AND a.OCCUPATION_TYPE = #{tStatisticsDeclarer.occupationType}
</if>
...
...
@@ -101,11 +96,11 @@
<!--统计-->
<select
id=
"doStatisticsTaxDeclarer"
resultMap=
"tStatisticsDeclarerMap"
>
select
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,b.
FILE_STATUS EMP_STATUS
,
b.UNIT_NAME DECLARE_UNIT,'雇员'
OCCUPATION_TYPE
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,b.
UNIT_ID DECLARE_UNIT
,
if(a.FORM_TYPE=0,'雇员',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'其他','-'))
OCCUPATION_TYPE
from t_salary_account a
left join t_salary_employee b on b.id = a.EMP_ID
where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH like '${lastYear}%'
GROUP BY a.EMP_IDCARD
GROUP BY a.EMP_IDCARD
,OCCUPATION_TYPE,b.UNIT_ID,a.SETTLEMENT_MONTH
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java
View file @
ef20be85
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService
;
import
io.swagger.v3.oas.annotations.Operation
;
...
...
@@ -247,4 +248,17 @@ public class TForecastLibraryController {
return
tForecastLibraryService
.
updateForecastFundStatusToNoSettle
(
idList
);
}
/**
* @param list
* @Description: 更新项目单位信息
* @Author: huyc
* @Date: 2022/8/25
* @return: int
**/
@Inner
@PostMapping
(
"/inner/updateForSocialAndFound"
)
public
void
updateForSocialAndFound
(
@RequestBody
UpdateSocialFoundVo
list
)
{
tForecastLibraryService
.
updateForSocialAndFound
(
list
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @
ef20be85
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.HaveSalaryNoSocialSearchVo
;
...
...
@@ -297,4 +298,17 @@ public class TPaymentInfoController {
)
.
groupBy
(
TPaymentInfo:
:
getEmpIdcard
)));
}
/**
* @param list
* @Description: 更新项目单位信息
* @Author: huyc
* @Date: 2022/8/25
* @return: int
**/
@Inner
@PostMapping
(
"/inner/updatePaymentSocialAndFound"
)
public
void
updatePaymentSocialAndFound
(
@RequestBody
UpdateSocialFoundVo
list
)
{
tPaymentInfoService
.
updatePaymentSocialAndFound
(
list
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java
View file @
ef20be85
...
...
@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo
;
...
...
@@ -127,4 +129,17 @@ public class TSocialFundInfoController {
return
R
.
ok
(
tSocialFundInfoService
.
getDetailById
(
id
));
}
/**
* @param list
* @Description: 更新项目单位信息
* @Author: huyc
* @Date: 2022/8/25
* @return: int
**/
@Inner
@PostMapping
(
"/inner/updateSocialAndFoundInfo"
)
public
void
updateSocialAndFoundInfo
(
@RequestBody
UpdateSocialFoundVo
list
)
{
tSocialFundInfoService
.
updateSocialAndFoundInfo
(
list
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @
ef20be85
...
...
@@ -21,6 +21,7 @@ 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.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
@@ -66,4 +67,6 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
int
updateForecastFundStatusByIdList
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"status"
)
String
status
);
void
updateForSocialAndFound
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @
ef20be85
...
...
@@ -21,6 +21,7 @@ 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.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo
;
...
...
@@ -106,4 +107,6 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
int
updatePaymentFundStatusByIdList
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"status"
)
String
status
);
void
updatePaymentSocialAndFound
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
ef20be85
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.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.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo
;
...
...
@@ -62,4 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
List
<
TSocialFundInfoExportVo
>
exportList
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfoSearchVo
tSocialFundInfo
);
void
updateSocialAndFoundInfo
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
void
updateSocialAndFoundInfoF
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java
View file @
ef20be85
...
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
...
...
@@ -122,4 +123,6 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
int
updateForecastFundStatusToSettle
(
List
<
String
>
idList
);
int
updateForecastFundStatusToNoSettle
(
List
<
String
>
idList
);
void
updateForSocialAndFound
(
UpdateSocialFoundVo
list
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java
View file @
ef20be85
...
...
@@ -22,6 +22,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo
;
...
...
@@ -128,5 +129,7 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
int
updatePaymentFundStatusToSettle
(
List
<
String
>
idList
);
int
updatePaymentFundStatusToNoSettle
(
List
<
String
>
idList
);
void
updatePaymentSocialAndFound
(
UpdateSocialFoundVo
list
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFundInfoService.java
View file @
ef20be85
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoSearchVo
;
...
...
@@ -71,5 +72,7 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
* @return: com.yifu.cloud.plus.v1.yifu.social.vo.TSocialFundInfoDetailVo
**/
TSocialFundInfoDetailVo
getDetailById
(
String
id
);
void
updateSocialAndFoundInfo
(
UpdateSocialFoundVo
list
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
ef20be85
...
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAgentConfig
;
...
...
@@ -2134,4 +2135,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
return
0
;
}
@Override
public
void
updateForSocialAndFound
(
UpdateSocialFoundVo
infoVo
)
{
if
(
Common
.
isNotNull
(
infoVo
))
{
baseMapper
.
updateForSocialAndFound
(
infoVo
);
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
ef20be85
...
...
@@ -18,12 +18,9 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;/*
import
cn.hutool.core.collection.CollUtil
;
import
com.alibaba.excel.read.listener.ReadListener
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
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.AreaVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
...
@@ -32,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.concurrent.threadpool.YFSocialImportThreadPoolExecutor
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PaymentConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
...
...
@@ -201,6 +199,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
paymentInfo
.
getPushStatus
()))
{
return
R
.
failed
(
"已推送至结算平台禁止删除!"
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getSalaryFundFlag
())
||
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getSalarySocialFlag
()))
{
return
R
.
failed
(
"该数据已与薪资结算,禁止删除"
);
}
baseMapper
.
deleteById
(
id
);
return
R
.
ok
();
}
...
...
@@ -222,6 +225,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
CommonConstants
.
ZERO_STRING
.
equals
(
paymentInfo
.
getPushStatus
()))
{
return
R
.
failed
(
"存在不符合条件的数据(已推送至结算平台或非本人创建),禁止删除!"
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getSalaryFundFlag
())
||
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getSalarySocialFlag
()))
{
return
R
.
failed
(
"存在不符合条件的数据(已与薪资结算),禁止删除"
);
}
baseMapper
.
deleteById
(
id
);
}
}
...
...
@@ -2192,4 +2199,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
return
0
;
}
@Override
public
void
updatePaymentSocialAndFound
(
UpdateSocialFoundVo
infoVo
)
{
if
(
Common
.
isNotNull
(
infoVo
))
{
baseMapper
.
updatePaymentSocialAndFound
(
infoVo
);
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
ef20be85
...
...
@@ -2258,6 +2258,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
importVo
.
setWorkingHours
(
preInfo
.
getWorkingHoursAdd
());
importVo
.
setEmpNational
(
CommonConstants
.
ONE_STRING
);
importVo
.
setEducationName
(
CommonConstants
.
FIVE_STRING
);
importVo
.
setTrustRemark
(
"预派单"
);
if
(
null
!=
preInfo
.
getPensionBase
()){
importVo
.
setRecordBase
(
preInfo
.
getPensionBase
());
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
ef20be85
...
...
@@ -32,16 +32,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFundInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
import
com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
...
...
@@ -775,4 +774,15 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
return
detailVo
;
}
@Override
public
void
updateSocialAndFoundInfo
(
UpdateSocialFoundVo
infoVo
)
{
if
(
Common
.
isNotNull
(
infoVo
)
&&
Common
.
isNotNull
(
infoVo
.
getFlag
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
infoVo
.
getFlag
()))
{
baseMapper
.
updateSocialAndFoundInfo
(
infoVo
);
}
else
{
baseMapper
.
updateSocialAndFoundInfoF
(
infoVo
);
}
}
}
}
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @
ef20be85
...
...
@@ -661,4 +661,17 @@
</foreach>
</update>
<!-- 更改薪资公积金结算状态 -->
<update
id=
"updateForSocialAndFound"
>
update t_forecast_library
set UNIT_ID = #{infoVo.unitId},
UNIT_NAME = #{infoVo.unitName},
DEPT_NAME = #{infoVo.settleDomainName},
DEPT_NO = #{infoVo.settleDomainCode},
SETTLE_DOMAIN_ID = #{infoVo.settleDomainId}
where
(SALARY_SOCIAL_FLAG = '0' and SOCIAL_CREATE_MONTH >= #{infoVo.socialCreateMonth}) and DATA_PUSH = '0' and EMP_IDCARD = #{infoVo.empIdcard}
or (SALARY_FUND_FLAG = '0' and PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
</update>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
ef20be85
...
...
@@ -1062,7 +1062,8 @@
<!-- 更改薪资公积金结算状态 -->
<update
id=
"updatePaymentFundStatusByIdList"
>
update t_payment_info set SALARY_FUND_FLAG = #{status}
update t_payment_info
set SALARY_FUND_FLAG = #{status}
where
ID in
<foreach
item=
"item"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
...
...
@@ -1070,4 +1071,17 @@
</foreach>
</update>
<!-- 更改薪资公积金结算状态 -->
<update
id=
"updatePaymentSocialAndFound"
>
update t_payment_info
set UNIT_ID = #{infoVo.unitId},
UNIT_NAME = #{infoVo.unitName},
SETTLE_DOMAIN_NAME = #{infoVo.settleDomainName},
SETTLE_DOMAIN_CODE = #{infoVo.settleDomainCode},
SETTLE_DOMAIN_ID = #{infoVo.settleDomainId}
where
(SALARY_SOCIAL_FLAG = '0' or SALARY_FUND_FLAG = '0') and PUSH_STATUS = '1' and EMP_IDCARD = #{infoVo.empIdcard}
and (SOCIAL_CREATE_MONTH >= #{infoVo.socialCreateMonth} or PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
</update>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
ef20be85
...
...
@@ -1039,4 +1039,23 @@
limit #{tSocialFundInfo.limitStart},#{tSocialFundInfo.limitEnd}
</if>
</select>
<update
id=
"updateSocialAndFoundInfo"
>
update t_social_fund_info
set UNIT_ID = #{infoVo.unitId},
UNIT_NAME = #{infoVo.unitName},
SETTLE_DOMAIN_NAME = #{infoVo.settleDomainName},
SETTLE_DOMAIN_CODE = #{infoVo.settleDomainCode},
SETTLE_DOMAIN = #{infoVo.settleDomainId}
where EMP_IDCARD = #{infoVo.empIdcard}
</update>
<update
id=
"updateSocialAndFoundInfoF"
>
update t_social_fund_info
set UNIT_ID_FUND = #{infoVo.unitId},
UNIT_NAME_FUND = #{infoVo.unitName},
SETTLE_DOMAIN_NAME_FUND = #{infoVo.settleDomainName},
SETTLE_DOMAIN_CODE_FUND = #{infoVo.settleDomainCode},
SETTLE_DOMAIN_FUND = #{infoVo.settleDomainId}
where EMP_IDCARD = #{infoVo.empIdcard}
</update>
</mapper>
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