Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
c359779a
You need to sign in or sign up before continuing.
Commit
c359779a
authored
Aug 31, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
42622ddf
3a81dd3b
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
447 additions
and
19 deletions
+447
-19
EkpIncomeProperties.java
...fu.cloud.plus.v1/yifu/ekp/config/EkpIncomeProperties.java
+33
-0
EkpIncomeUtil.java
...a/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpIncomeUtil.java
+67
-0
EkpIncomeParam.java
...va/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpIncomeParam.java
+252
-0
ekpIncomeConfig.properties
...-common-ekp/src/main/resources/ekpIncomeConfig.properties
+8
-0
OrderConstants.java
...fu/cloud/plus/v1/yifu/order/constants/OrderConstants.java
+8
-0
TOrderMapper.java
...om/yifu/cloud/plus/v1/yifu/order/mapper/TOrderMapper.java
+4
-2
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+28
-2
TOrderMapper.xml
...yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
+5
-3
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+1
-0
TStatisticsLaborServiceImpl.java
...yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
+16
-2
TStatisticsRemunerationServiceImpl.java
...lary/service/impl/TStatisticsRemunerationServiceImpl.java
+15
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+2
-2
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+2
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+4
-3
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+2
-2
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpIncomeProperties.java
0 → 100644
View file @
c359779a
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
config
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.stereotype.Component
;
/**
* @Author fxj
* @Description 薪资明细对接
* @Date 11:57 2022/8/22
* @Param
* @return
**/
@Data
@Component
@PropertySource
(
"classpath:ekpIncomeConfig.properties"
)
@ConfigurationProperties
(
value
=
"income"
,
ignoreInvalidFields
=
false
)
public
class
EkpIncomeProperties
{
String
url
;
String
fdModelId
;
String
fdFlowId
;
String
docStatus
;
String
LoginName
;
String
docSubject
;
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpIncomeUtil.java
0 → 100644
View file @
c359779a
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
util
;
import
cn.hutool.json.JSONObject
;
import
com.yifu.cloud.plus.v1.yifu.ekp.config.EkpIncomeProperties
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParam
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
lombok.extern.log4j.Log4j2
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.http.*
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
/**
* @Author hgw
* @Date 2022-8-31 12:00:07
* @Description
* @Version 1.0
*/
@Log4j2
@EnableConfigurationProperties
(
EkpIncomeProperties
.
class
)
public
class
EkpIncomeUtil
{
@Autowired
private
EkpIncomeProperties
ekpProperties
;
public
String
sendToEKP
(
EkpIncomeParam
param
)
{
log
.
info
(
"推送EKP开始--收入明细数据"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
//指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject
loginName
=
new
JSONObject
();
loginName
.
append
(
"LoginName"
,
ekpProperties
.
getLoginName
());
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getDocSubject
());
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getDocStatus
());
wholeForm
.
add
(
"fdModelId"
,
ekpProperties
.
getFdModelId
());
wholeForm
.
add
(
"fdFlowId"
,
ekpProperties
.
getFdFlowId
());
wholeForm
.
add
(
"formValues"
,
formValues
);
HttpHeaders
headers
=
new
HttpHeaders
();
//如果EKP对该接口启用了Basic认证,那么客户端需要加入
//addAuth(headers,"yourAccount"+":"+"yourPassword") 是VO,则使用APPLICATION_JSON
headers
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA
);
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<>(
wholeForm
,
headers
);
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpProperties
.
getUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
if
(
StringUtils
.
isBlank
(
body
))
{
log
.
error
(
EkpConstants
.
SEND_FAILED
);
return
null
;
}
else
{
log
.
info
(
EkpConstants
.
SEND_SUCCESS
+
body
);
return
body
;
}
}
catch
(
Exception
e
)
{
log
.
info
(
e
.
getMessage
());
return
null
;
}
}
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpIncomeParam.java
0 → 100644
View file @
c359779a
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hgw
* @Date 2022-8-31 12:02:06
* @Description 收入明细对应参数
* @Version 1.0
*/
@Data
public
class
EkpIncomeParam
implements
Serializable
{
/**
* 项目编码
**/
private
String
fd_3adfedf98ccba2
;
/**
* 项目名称
**/
private
String
fd_3adfedf9d2bf1c
;
/**
* 单号
**/
private
String
fd_3adfedfa4410aa
;
/**
* 客户编码
**/
private
String
fd_3adfedfacd65d6
;
/**
* 客户名称
**/
private
String
fd_3adfedfb174068
;
/**
* 姓名
**/
private
String
fd_3adfedfb5a68a2
;
/**
* 身份证号
**/
private
String
fd_3adfedfb8f76d4
;
/**
* 手机号
**/
private
String
fd_3adfedfbd23ab8
;
/**
* 银行卡号
**/
private
String
fd_3adfedfcb17f1e
;
/**
* 开户行
**/
private
String
fd_3adfedfc453cc4
;
/**
* 工资月份
**/
private
String
fd_3adfee063acff0
;
/**
* 结算月份
**/
private
String
fd_3adfee0690737c
;
/**
* 是否薪资扣税
**/
private
String
fd_3adfee01668666
;
/**
* 社保优先级
**/
private
String
fd_3adfedfed8bb28
;
/**
* 公积金优先级
**/
private
String
fd_3adfedff3a7430
;
/**
* 是否自有员工
**/
private
String
fd_3adfee0009d070
;
/**
* 年终奖扣税方案
**/
private
String
fd_3adfee01dea2fa
;
/**
* 应发工资
**/
private
String
fd_3adfee12cb8840
;
/**
* 个人代扣
**/
private
String
fd_3adfee1374ed7a
;
/**
* 单位社保
**/
private
String
fd_3adfee1e2b2f78
;
/**
* 个人社保
**/
private
String
fd_3adfee1e88723e
;
/**
* 单位公积金
**/
private
String
fd_3adfee1ee24680
;
/**
* 个人公积金
**/
private
String
fd_3adfee1f32fa24
;
/**
* 个税
**/
private
String
fd_3adfee1f901c46
;
/**
* 企业年金单位
**/
private
String
fd_3adfee1ff1ca6a
;
/**
* 企业年金个人
**/
private
String
fd_3adfee203f86b2
;
/**
* 实发合计
**/
private
String
fd_3adfee20fe5ba4
;
/**
* 应收
**/
private
String
fd_3adfee21802434
;
/**
* 收入结算状态
**/
private
String
fd_3adfee4ba5ad36
;
/**
* 收款状态
**/
private
String
fd_3adfee4c0c59ee
;
/**
* 收入结算单号
**/
private
String
fd_3adfee5dd14866
;
/**
* 收款单号
**/
private
String
fd_3adfee5e3d1638
;
/**
* 代扣费用应支出
**/
private
String
fd_3adfeeb34ea0ea
;
/**
* 代扣费用结算状态
**/
private
String
fd_3adfeededfb5a6
;
/**
* 代扣费用付款状态
**/
private
String
fd_3adfeed3a20598
;
/**
* 代扣费用结算单号
**/
private
String
fd_3aea30866d0c30
;
/**
* 代扣费用付款单号
**/
private
String
fd_3aea309696d32e
;
/**
* 个税应支出
**/
private
String
fd_3adfeec6db8766
;
/**
* 个税结算状态
**/
private
String
fd_3adfeef8ef38fc
;
/**
* 个税付款状态
**/
private
String
fd_3adfeedd08222c
;
/**
* 个税支出结算单号
**/
private
String
fd_3aeadede4cea84
;
/**
* 个税支出付款单号
**/
private
String
fd_3aeadee1cf1266
;
/**
* 实发合计应支出
**/
private
String
fd_3adfeec730ec44
;
/**
* 工资实发结算状态
**/
private
String
fd_3adfeef9440ab2
;
/**
* 实发合计付款状态
**/
private
String
fd_3adfeedd5f3cb2
;
/**
* 实发结算单号
**/
private
String
fd_3aeadf17522642
;
/**
* 实发付款单号
**/
private
String
fd_3aeadf17b7d03a
;
/**
* 企业年金单位应支出
**/
private
String
fd_3adfeec782070a
;
/**
* 企业年金单位应结算状态
**/
private
String
fd_3adfeef9b9fb3e
;
/**
* 企业年金单位付款状态
**/
private
String
fd_3adfeeddacf6d4
;
/**
* 年金单位结算单号
**/
private
String
fd_3aeadf182ef6a2
;
/**
* 年金单位付款单号
**/
private
String
fd_3aeadf1892fdb2
;
/**
* 企业年金个人应支出
**/
private
String
fd_3adfeec7ccdd1c
;
/**
* 企业年金个人结算状态
**/
private
String
fd_3adfeefa1eba32
;
/**
* 企业年金个人付款状态
**/
private
String
fd_3adfeede08d430
;
/**
* 年金个人结算单号
**/
private
String
fd_3aeadf191c62a0
;
/**
* 年金个人付款单号
**/
private
String
fd_3aeadf1992544c
;
/**
* 暂停发
**/
private
String
fd_3af9d49d165e90
;
/**
* 税务主体
**/
private
String
fd_3afab1895feea2
;
}
yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties
0 → 100644
View file @
c359779a
ekp.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekp.fdModelId
=
181d7633ff8bc797276d0d3a54e80ad6
ekp.fdFlowId
=
182b40249c1bc940d7226b941c7a4183
ekp.docStatus
=
20
ekp.LoginName
=
admin
ekp.docSubject
=
\u6536\u5165\u
660E
\u
7EC6
\u6570\u
636E
\u
63A5
\u
53E3
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/constants/OrderConstants.java
View file @
c359779a
...
...
@@ -38,6 +38,14 @@ public class OrderConstants {
* 订单编号不能为空
*/
public
static
final
String
ORDER_NO_IS_EMPTY
=
"订单编号不能为空"
;
/**
* 订单不存在
*/
public
static
final
String
ORDER_NO_NOT_EXIST
=
"订单不存在"
;
/**
* 订单已存在
*/
public
static
final
String
ORDER_NO_IS_EXIST
=
"订单已存在"
;
/**
* 下单人不能为空
*/
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/mapper/TOrderMapper.java
View file @
c359779a
...
...
@@ -28,9 +28,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
* @author licancan
* @param page
* @param param
* @param userName
* @return {@link IPage<OrderListVO>}
*/
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
@Param
(
"param"
)
OrderListParam
param
);
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
@Param
(
"param"
)
OrderListParam
param
,
@Param
(
"userName"
)
String
userName
);
/**
* 导出勾选查询结果
...
...
@@ -46,9 +47,10 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
*
* @author licancan
* @param param
* @param userName
* @return {@link List< OrderListVO>}
*/
List
<
OrderListVO
>
getOrderList
(
@Param
(
"param"
)
OrderListParam
param
);
List
<
OrderListVO
>
getOrderList
(
@Param
(
"param"
)
OrderListParam
param
,
@Param
(
"userName"
)
String
userName
);
/**
* 通过id查询详情
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
c359779a
...
...
@@ -67,7 +67,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
*/
@Override
public
IPage
<
OrderListVO
>
getOrderPageList
(
Page
<
OrderListParam
>
page
,
OrderListParam
param
)
{
IPage
<
OrderListVO
>
orderList
=
baseMapper
.
getOrderPageList
(
page
,
param
);
YifuUser
user
=
SecurityUtils
.
getUser
();
IPage
<
OrderListVO
>
orderList
=
baseMapper
.
getOrderPageList
(
page
,
param
,
user
.
getUsername
());
return
orderList
;
}
...
...
@@ -80,11 +81,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
*/
@Override
public
List
<
OrderListVO
>
getOrderList
(
OrderListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
List
<
OrderListVO
>
list
;
if
(
CollectionUtils
.
isNotEmpty
(
param
.
getIdList
())){
list
=
baseMapper
.
getOrderListBySelect
(
param
.
getIdList
());
}
else
{
list
=
baseMapper
.
getOrderList
(
param
);
list
=
baseMapper
.
getOrderList
(
param
,
user
.
getUsername
()
);
}
return
list
;
}
...
...
@@ -191,6 +193,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if
(
Common
.
isEmpty
(
orderNo
)){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_IS_EMPTY
);
}
TOrder
one
=
this
.
getOne
(
Wrappers
.<
TOrder
>
query
().
lambda
()
.
eq
(
TOrder:
:
getOrderNo
,
orderNo
)
.
eq
(
TOrder:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
if
(!
Optional
.
ofNullable
(
one
).
isPresent
()){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_NOT_EXIST
);
}
if
(
Common
.
isEmpty
(
replyContent
)
&&
ArrayUtils
.
isEmpty
(
file
)){
return
R
.
failed
(
OrderConstants
.
REPLY_CONTENT_AND_ENCLOSURE_IS_EMPTY
);
}
...
...
@@ -299,6 +309,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if
(
Common
.
isEmpty
(
vo
.
getOrderNo
())){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_IS_EMPTY
);
}
TOrder
one
=
this
.
getOne
(
Wrappers
.<
TOrder
>
query
().
lambda
()
.
eq
(
TOrder:
:
getOrderNo
,
vo
.
getOrderNo
())
.
eq
(
TOrder:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
if
(
Optional
.
ofNullable
(
one
).
isPresent
()){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_IS_EXIST
);
}
if
(
Common
.
isEmpty
(
vo
.
getCreateName
())){
return
R
.
failed
(
OrderConstants
.
ORDER_NAME_IS_EMPTY
);
}
...
...
@@ -383,6 +401,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if
(
Common
.
isEmpty
(
vo
.
getOrderNo
())){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_IS_EMPTY
);
}
TOrder
one
=
this
.
getOne
(
Wrappers
.<
TOrder
>
query
().
lambda
()
.
eq
(
TOrder:
:
getOrderNo
,
vo
.
getOrderNo
())
.
eq
(
TOrder:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
if
(!
Optional
.
ofNullable
(
one
).
isPresent
()){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_NOT_EXIST
);
}
if
(
Common
.
isEmpty
(
vo
.
getCreateName
())){
return
R
.
failed
(
OrderConstants
.
REPLY_NAME_IS_EMPTY
);
}
...
...
yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
View file @
c359779a
...
...
@@ -39,6 +39,7 @@
t.ORDER_STATUS as orderStatus
from t_order t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
and t.ORDER_NO = #{param.orderNo}
</if>
...
...
@@ -60,7 +61,7 @@
<if
test=
"param.orderStatus != null"
>
and t.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
<select
id=
"getOrderListBySelect"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
...
...
@@ -77,7 +78,7 @@
<foreach
collection=
"idList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
<select
id=
"getOrderList"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO"
>
...
...
@@ -91,6 +92,7 @@
t.ORDER_STATUS as orderStatus
from t_order t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
and t.ORDER_NO = #{param.orderNo}
</if>
...
...
@@ -112,7 +114,7 @@
<if
test=
"param.orderStatus != null"
>
and t.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.
ORDER_STATUS,t.
CREATE_TIME DESC
ORDER BY t.CREATE_TIME DESC
</select>
<select
id=
"getOrderDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.order.vo.OrderDetailVO"
>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
c359779a
...
...
@@ -150,6 +150,7 @@ public class TSalaryStandardController {
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/auditPage"
)
public
R
<
IPage
<
TSalaryStandard
>>
getTSalaryStandardAuditPage
(
Page
<
TSalaryStandard
>
page
,
TSalaryStandardSearchVo
tSalaryStandard
)
{
tSalaryStandard
.
setStatus
(
CommonConstants
.
ONE_INT
);
return
new
R
<>(
tSalaryStandardService
.
getTSalaryStandardAuditPage
(
page
,
tSalaryStandard
));
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
View file @
c359779a
...
...
@@ -32,12 +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.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsLaborMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
@@ -58,7 +61,11 @@ import java.util.stream.Collectors;
*/
@Log4j2
@Service
@RequiredArgsConstructor
public
class
TStatisticsLaborServiceImpl
extends
ServiceImpl
<
TStatisticsLaborMapper
,
TStatisticsLabor
>
implements
TStatisticsLaborService
{
private
final
TStatisticsDeclarerMapper
declarerMapper
;
/**
* 本期劳务费申报表简单分页查询
*
...
...
@@ -275,8 +282,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
}
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
List
<
TStatisticsLabor
>
stdvoList
=
baseMapper
.
doStatisticsLabor
(
declareMonth
,
lastMonth
);
for
(
TStatisticsLabor
declarer
:
stdvoList
)
{
this
.
save
(
declarer
);
for
(
TStatisticsLabor
labor
:
stdvoList
)
{
TStatisticsDeclarer
declarer
=
declarerMapper
.
selectOne
(
Wrappers
.<
TStatisticsDeclarer
>
query
().
lambda
()
.
eq
(
TStatisticsDeclarer:
:
getDeclareMonth
,
declareMonth
)
.
eq
(
TStatisticsDeclarer:
:
getEmpIdcard
,
labor
.
getEmpIdcard
())
.
eq
(
TStatisticsDeclarer:
:
getDeclareUnit
,
labor
.
getDeclareUnit
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
declarer
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
declarer
.
getIsDeclare
()))
{
this
.
save
(
labor
);
}
}
return
R
.
ok
();
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java
View file @
c359779a
...
...
@@ -30,11 +30,14 @@ 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.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
@@ -54,7 +57,11 @@ import java.util.stream.Collectors;
*/
@Log4j2
@Service
@RequiredArgsConstructor
public
class
TStatisticsRemunerationServiceImpl
extends
ServiceImpl
<
TStatisticsRemunerationMapper
,
TStatisticsRemuneration
>
implements
TStatisticsRemunerationService
{
private
final
TStatisticsDeclarerMapper
declarerMapper
;
/**
* 本期稿酬申报表简单分页查询
*
...
...
@@ -178,8 +185,15 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
List
<
TStatisticsRemuneration
>
stdvoList
=
baseMapper
.
doStatisticsRemuneration
(
declareMonth
,
lastMonth
);
for
(
TStatisticsRemuneration
remuneration
:
stdvoList
)
{
TStatisticsDeclarer
declarer
=
declarerMapper
.
selectOne
(
Wrappers
.<
TStatisticsDeclarer
>
query
().
lambda
()
.
eq
(
TStatisticsDeclarer:
:
getDeclareMonth
,
declareMonth
)
.
eq
(
TStatisticsDeclarer:
:
getEmpIdcard
,
remuneration
.
getEmpIdcard
())
.
eq
(
TStatisticsDeclarer:
:
getDeclareUnit
,
remuneration
.
getDeclareUnit
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
declarer
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
declarer
.
getIsDeclare
()))
{
this
.
save
(
remuneration
);
}
}
return
R
.
ok
();
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
c359779a
...
...
@@ -251,8 +251,8 @@ public class TDispatchInfoController {
@SysLog
(
"派单信息记录表 批量导入-派减"
)
@PostMapping
(
"/importListReduce"
)
//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-reduce')")
public
R
<
List
<
ErrorMessage
>>
importListReduce
(
@RequestBody
MultipartFile
file
){
return
tDispatchInfoService
.
importReduceDiy
(
file
.
getInputStream
());
public
R
<
List
<
ErrorMessage
>>
importListReduce
(
@RequestBody
MultipartFile
file
,
@RequestParam
(
required
=
false
)
String
orderId
){
return
tDispatchInfoService
.
importReduceDiy
(
file
.
getInputStream
()
,
orderId
);
}
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
c359779a
...
...
@@ -58,11 +58,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
);
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
);
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
,
String
orderId
);
@Transactional
@ShardingTransactionType
(
TransactionType
.
BASE
)
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
);
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
);
R
<
Boolean
>
removeByIdDiy
(
String
id
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c359779a
...
...
@@ -2312,7 +2312,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override
public
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
)
{
public
R
<
List
<
ErrorMessage
>>
importReduceDiy
(
InputStream
inputStream
,
String
orderId
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
user
)){
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
...
@@ -2361,7 +2361,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
*/
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
batchReduceDispatch
(
cachedDataList
,
errorMessageList
,
user
);
batchReduceDispatch
(
cachedDataList
,
errorMessageList
,
user
,
orderId
);
log
.
info
(
"存储数据库成功!"
);
}
}).
sheet
().
doRead
();
...
...
@@ -2375,7 +2375,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@ShardingTransactionType
(
TransactionType
.
BASE
)
public
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
)
{
public
void
batchReduceDispatch
(
List
<
TDispatchReduceVo
>
excelVOList
,
List
<
ErrorMessage
>
errorMessageList
,
YifuUser
user
,
String
orderId
)
{
if
(!
Common
.
isNotNull
(
excelVOList
)){
return
;
}
...
...
@@ -2424,6 +2424,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 初始化派单 和 社保公积金查询信息
dispatch
=
getDispatchInfo
(
empVo
,
excel
,
socialFund
,
setInfoVo
,
user
);
try
{
dispatch
.
setOrderId
(
orderId
);
dispatch
.
setApplyNo
(
getApplyCode
());
dispatch
.
setStatus
(
CommonConstants
.
ONE_STRING
);
baseMapper
.
insert
(
dispatch
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
c359779a
...
...
@@ -432,7 +432,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduceVo
.
setRowIndex
(
CommonConstants
.
ONE_INT
);
List
<
TDispatchReduceVo
>
dispatchImportList
=
new
ArrayList
<>();
dispatchImportList
.
add
(
dispatchReduceVo
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
,
orderId
);
// 处理派减结果
errorMessage
=
handleDispatchAddRes
(
preInfo
,
errorMessageList
);
if
(
null
!=
errorMessage
){
...
...
@@ -623,7 +623,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduce
(
dispatchReduceVo
,
pre
);
List
<
TDispatchReduceVo
>
dispatchImportList
=
new
ArrayList
<>();
dispatchImportList
.
add
(
dispatchReduceVo
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
,
orderId
);
//处理派减结果
handleDispatchAddRes
(
pre
,
errorMessageList
);
...
...
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