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
75b0185f
Commit
75b0185f
authored
Aug 15, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资审核页面接口修改
parent
829737d6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
1025 additions
and
755 deletions
+1025
-755
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+1
-0
TStatisticsBonus.java
...fu/cloud/plus/v1/yifu/salary/entity/TStatisticsBonus.java
+126
-0
TStatisticsAnnualBonusImportVo.java
...lus/v1/yifu/salary/vo/TStatisticsAnnualBonusImportVo.java
+0
-108
TStatisticsBonusSearchVo.java
...loud/plus/v1/yifu/salary/vo/TStatisticsBonusSearchVo.java
+5
-5
TStatisticsBonusVo.java
...yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsBonusVo.java
+142
-0
TStatisticsDeclarerVo.java
...u/cloud/plus/v1/yifu/salary/vo/TStatisticsDeclarerVo.java
+0
-4
TStatisticsAnnualBonusController.java
...u/salary/controller/TStatisticsAnnualBonusController.java
+0
-148
TStatisticsBonusController.java
...v1/yifu/salary/controller/TStatisticsBonusController.java
+142
-0
TStatisticsDeclarerController.java
...yifu/salary/controller/TStatisticsDeclarerController.java
+1
-1
TStatisticsBonusMapper.java
...ud/plus/v1/yifu/salary/mapper/TStatisticsBonusMapper.java
+10
-9
TStatisticsBonusService.java
.../plus/v1/yifu/salary/service/TStatisticsBonusService.java
+15
-17
TStatisticsAnnualBonusServiceImpl.java
...alary/service/impl/TStatisticsAnnualBonusServiceImpl.java
+0
-340
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+269
-0
TStatisticsBonusMapper.xml
...-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
+104
-0
TPaymentHeFeiVo.java
...om/yifu/cloud/plus/v1/yifu/social/vo/TPaymentHeFeiVo.java
+1
-1
TPaymentInfoVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
+1
-1
TPreDispatchInfoController.java
...v1/yifu/social/controller/TPreDispatchInfoController.java
+37
-27
TPreDispatchInfoService.java
.../plus/v1/yifu/social/service/TPreDispatchInfoService.java
+6
-3
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+126
-68
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+39
-23
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
75b0185f
...
...
@@ -300,6 +300,7 @@ public interface CommonConstants {
public
static
final
String
ZIP_TYPE
=
"zip"
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT1
=
1000
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
String
ID
=
"ID"
;
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatistics
Annual
Bonus.java
→
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsBonus.java
View file @
75b0185f
...
...
@@ -21,62 +21,43 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.baomidou.mybatisplus.annotation.IdType
;
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
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
/**
*
统计-全年一次性奖金
*
全年一次性奖金申报表
*
* @author h
gw
* @date 2022-08-
05 11:40
:15
* @author h
uyc
* @date 2022-08-
14 21:31
:15
*/
@Data
@TableName
(
"t_statistics_annual_bonus"
)
@Schema
(
description
=
"统计-全年一次性奖金"
)
public
class
TStatisticsAnnualBonus
{
@TableName
(
"t_statistics_bonus"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"全年一次性奖金申报表"
)
public
class
TStatisticsBonus
extends
BaseEntity
{
/**
*
id
*
ID
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelProperty
(
"id"
)
@ExcelProperty
(
"ID"
)
@Schema
(
description
=
"ID"
)
private
String
id
;
/**
*
税务主体(封面抬头)
*
申报单位
*/
@ExcelAttribute
(
name
=
"税务主体(封面抬头)"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"税务主体(封面抬头)不能超过50个字符"
)
@ExcelProperty
(
"税务主体(封面抬头)"
)
private
String
invoiceTitle
;
/**
* 结算部门id
*/
@ExcelAttribute
(
name
=
"结算部门id"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"结算部门id不能为空"
)
@Length
(
max
=
32
,
message
=
"结算部门id不能超过32个字符"
)
@ExcelProperty
(
"结算部门id"
)
private
String
settleDepartId
;
/**
* 结算部门no
*/
@ExcelAttribute
(
name
=
"结算部门no"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门no不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"结算部门no不能为空"
)
@Length
(
max
=
50
,
message
=
"结算部门no不能超过50个字符"
)
@ExcelProperty
(
"结算部门no"
)
private
String
settleDepartNo
;
/**
* 结算部门name
*/
@ExcelAttribute
(
name
=
"结算部门name"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门name不能为空"
,
maxLength
=
50
)
@NotBlank
(
message
=
"结算部门name不能为空"
)
@Length
(
max
=
50
,
message
=
"结算部门name不能超过50个字符"
)
@ExcelProperty
(
"结算部门name"
)
private
String
settleDepartName
;
@ExcelAttribute
(
name
=
"申报单位"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"申报单位不能超过32个字符"
)
@ExcelProperty
(
"申报单位"
)
@Schema
(
description
=
"申报单位"
)
private
String
declareUnit
;
/**
* 申报月份(YYYYMM)
*/
...
...
@@ -84,60 +65,62 @@ public class TStatisticsAnnualBonus {
@NotBlank
(
message
=
"申报月份(YYYYMM)不能为空"
)
@Length
(
max
=
6
,
message
=
"申报月份(YYYYMM)不能超过6个字符"
)
@ExcelProperty
(
"申报月份(YYYYMM)"
)
@Schema
(
description
=
"申报月份(YYYYMM)"
)
private
String
declareMonth
;
/**
* 员工 ID
*/
@ExcelAttribute
(
name
=
"员工 ID"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"员工 ID不能超过32个字符"
)
@ExcelProperty
(
"员工 ID"
)
private
String
empId
;
/**
* 员工姓名
*/
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"员工姓名不能超过50
个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"员工姓名不能超过32
个字符"
)
@ExcelProperty
(
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
/**
*
员工
身份证号
* 身份证号
*/
@ExcelAttribute
(
name
=
"员工身份证号"
,
maxLength
=
25
)
@Length
(
max
=
25
,
message
=
"员工身份证号不能超过25个字符"
)
@ExcelProperty
(
"员工身份证号"
)
@ExcelAttribute
(
name
=
"身份证号"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@ExcelProperty
(
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
/**
* 年终奖
*/
@ExcelAttribute
(
name
=
"年终奖"
)
@ExcelProperty
(
"年终奖"
)
@Schema
(
description
=
"年终奖(元)"
)
private
BigDecimal
annualBonus
;
/**
* 年终奖单独税
* 年终奖单独扣税应缴税额
*/
@ExcelAttribute
(
name
=
"年终奖单独扣税应缴税额"
)
@ExcelProperty
(
"年终奖单独扣税应缴税额"
)
@Schema
(
description
=
"年终奖单独扣税应缴税额"
)
private
BigDecimal
bonusTax
;
/**
* 项目id
*/
@Schema
(
description
=
"项目id"
)
private
String
deptId
;
/**
* 项目编码
*/
@ExcelAttribute
(
name
=
"年终奖单独税"
)
@ExcelProperty
(
"年终奖单独税"
)
private
BigDecimal
tax
;
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
/**
* 项目名称
*/
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 单位id
*/
@ExcelAttribute
(
name
=
"单位id"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"单位id不能超过32个字符"
)
@ExcelProperty
(
"单位id"
)
@Schema
(
description
=
"单位id"
)
private
String
unitId
;
/**
* 单位
no
* 单位
编码
*/
@ExcelAttribute
(
name
=
"单位no"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"单位no不能超过50个字符"
)
@ExcelProperty
(
"单位no"
)
@Schema
(
description
=
"单位编码"
)
private
String
unitNo
;
/**
* 单位name
*/
@ExcelAttribute
(
name
=
"单位name"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"单位name不能超过50个字符"
)
@ExcelProperty
(
"单位name"
)
private
String
unitName
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsAnnualBonusImportVo.java
deleted
100644 → 0
View file @
829737d6
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* 统计-全年一次性奖金
*
* @author huyc
* @date 2022-08-05 11:40:15
*/
@Data
public
class
TStatisticsAnnualBonusImportVo
extends
RowIndex
implements
Serializable
{
/**
* 员工姓名
*/
@Length
(
max
=
50
,
message
=
"员工姓名 不能超过50 个字符"
)
@NotNull
(
message
=
"员工姓名不可为空"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
50
,
isNotEmpty
=
true
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
/**
* 员工身份证号
*/
@Length
(
max
=
25
,
message
=
"身份证号不能超过25个字符"
)
@NotNull
(
message
=
"身份证号不可为空"
)
@ExcelAttribute
(
name
=
"身份证号"
,
maxLength
=
25
,
isNotEmpty
=
true
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
/**
* 年终奖
*/
@ExcelAttribute
(
name
=
"待发年终奖"
,
isNotEmpty
=
true
)
@NotNull
(
message
=
"待发年终奖不可为空"
)
@Schema
(
description
=
"待发年终奖"
)
@ExcelProperty
(
"待发年终奖"
)
private
BigDecimal
preAnnualBonus
;
/**
* 年终奖单独税
*/
@ExcelAttribute
(
name
=
"待发12月工资"
,
isNotEmpty
=
true
)
@NotNull
(
message
=
"待发12月工资不可为空"
)
@Schema
(
description
=
"待发12月工资"
)
@ExcelProperty
(
"待发12月工资"
)
private
BigDecimal
preDecSalary
;
/**
* 年终奖单独扣税12月税费
*/
@ExcelAttribute
(
name
=
"年终奖单独扣税12月税费"
)
@Schema
(
description
=
"年终奖单独扣税12月税费"
)
@ExcelProperty
(
"年终奖单独扣税12月税费"
)
private
BigDecimal
onlyTax
;
/**
* 年终奖合并扣税12月税费
*/
@ExcelAttribute
(
name
=
"年终奖合并扣税12月税费"
)
@Schema
(
description
=
"年终奖合并扣税12月税费"
)
@ExcelProperty
(
"年终奖合并扣税12月税费"
)
private
BigDecimal
sumTax
;
/**
* 最优方案-年终奖
*/
@ExcelAttribute
(
name
=
"最优方案-年终奖"
)
@Schema
(
description
=
"最优方案-年终奖"
)
@ExcelProperty
(
"最优方案-年终奖"
)
private
BigDecimal
bestSolutionTax
;
/**
* 最优方案-12月扣税
*/
@ExcelAttribute
(
name
=
"最优方案-12月扣税"
)
@Schema
(
description
=
"最优方案-12月扣税"
)
@ExcelProperty
(
"最优方案-12月扣税"
)
private
BigDecimal
bestSolutionDecTax
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatistics
Annual
BonusSearchVo.java
→
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsBonusSearchVo.java
View file @
75b0185f
...
...
@@ -16,20 +16,20 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsAnnualBonus
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsBonus
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
/**
*
统计-全年一次性奖金
*
全年一次性奖金申报表
*
* @author h
gw
* @date 2022-08-
05 11:40
:15
* @author h
uyc
* @date 2022-08-
14 21:31
:15
*/
@Data
public
class
TStatistics
AnnualBonusSearchVo
extends
TStatisticsAnnual
Bonus
{
public
class
TStatistics
BonusSearchVo
extends
TStatistics
Bonus
{
/**
* 多选导出或删除等操作
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatistics
Annual
BonusVo.java
→
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsBonusVo.java
View file @
75b0185f
...
...
@@ -19,10 +19,13 @@ package com.yifu.cloud.plus.v1.yifu.salary.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.
yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribut
e
;
import
com.
baomidou.mybatisplus.annotation.TableNam
e
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
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
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
...
...
@@ -30,49 +33,32 @@ import java.io.Serializable;
import
java.math.BigDecimal
;
/**
*
统计-全年一次性奖金
*
全年一次性奖金申报表
*
* @author h
gw
* @date 2022-08-
05 11:40
:15
* @author h
uyc
* @date 2022-08-
14 21:31
:15
*/
@Data
public
class
TStatistics
Annual
BonusVo
extends
RowIndex
implements
Serializable
{
public
class
TStatisticsBonusVo
extends
RowIndex
implements
Serializable
{
/**
* 税务主体(封面抬头)
*/
@Length
(
max
=
50
,
message
=
"税务主体(封面抬头) 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"税务主体(封面抬头)"
,
maxLength
=
50
)
@Schema
(
description
=
"税务主体(封面抬头)"
)
@ExcelProperty
(
"税务主体(封面抬头)"
)
private
String
invoiceTitle
;
/**
* 结算部门id
* ID
*/
@NotBlank
(
message
=
"结算部门id 不能为空"
)
@Length
(
max
=
32
,
message
=
"结算部门id 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"结算部门id"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门id 不能为空"
,
maxLength
=
32
)
@Schema
(
description
=
"结算部门id"
)
@ExcelProperty
(
"结算部门id"
)
private
String
settleDepartId
;
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@NotBlank
(
message
=
"ID 不能为空"
)
@Length
(
max
=
32
,
message
=
"ID 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"ID"
,
isNotEmpty
=
true
,
errorInfo
=
"ID 不能为空"
,
maxLength
=
32
)
@Schema
(
description
=
"ID"
)
@ExcelProperty
(
"ID"
)
private
String
id
;
/**
*
结算部门no
*
申报单位
*/
@NotBlank
(
message
=
"结算部门no 不能为空"
)
@Length
(
max
=
50
,
message
=
"结算部门no 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"结算部门no"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门no 不能为空"
,
maxLength
=
50
)
@Schema
(
description
=
"结算部门no"
)
@ExcelProperty
(
"结算部门no"
)
private
String
settleDepartNo
;
/**
* 结算部门name
*/
@NotBlank
(
message
=
"结算部门name 不能为空"
)
@Length
(
max
=
50
,
message
=
"结算部门name 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"结算部门name"
,
isNotEmpty
=
true
,
errorInfo
=
"结算部门name 不能为空"
,
maxLength
=
50
)
@Schema
(
description
=
"结算部门name"
)
@ExcelProperty
(
"结算部门name"
)
private
String
settleDepartName
;
@Length
(
max
=
32
,
message
=
"申报单位 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"申报单位"
,
maxLength
=
32
)
@Schema
(
description
=
"申报单位"
)
@ExcelProperty
(
"申报单位"
)
private
String
declareUnit
;
/**
* 申报月份(YYYYMM)
*/
...
...
@@ -82,29 +68,21 @@ public class TStatisticsAnnualBonusVo extends RowIndex implements Serializable {
@Schema
(
description
=
"申报月份(YYYYMM)"
)
@ExcelProperty
(
"申报月份(YYYYMM)"
)
private
String
declareMonth
;
/**
* 员工 ID
*/
@Length
(
max
=
32
,
message
=
"员工 ID 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"员工 ID"
,
maxLength
=
32
)
@Schema
(
description
=
"员工 ID"
)
@ExcelProperty
(
"员工 ID"
)
private
String
empId
;
/**
* 员工姓名
*/
@Length
(
max
=
50
,
message
=
"员工姓名 不能超过50
个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
50
)
@Length
(
max
=
32
,
message
=
"员工姓名 不能超过32
个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
32
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
/**
*
员工
身份证号
* 身份证号
*/
@Length
(
max
=
25
,
message
=
"员工身份证号 不能超过25
个字符"
)
@ExcelAttribute
(
name
=
"
员工身份证号"
,
maxLength
=
25
)
@Schema
(
description
=
"
员工
身份证号"
)
@ExcelProperty
(
"
员工
身份证号"
)
@Length
(
max
=
32
,
message
=
"身份证号 不能超过32
个字符"
)
@ExcelAttribute
(
name
=
"
身份证号"
,
maxLength
=
32
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
/**
* 年终奖
...
...
@@ -114,12 +92,36 @@ public class TStatisticsAnnualBonusVo extends RowIndex implements Serializable {
@ExcelProperty
(
"年终奖"
)
private
BigDecimal
annualBonus
;
/**
* 年终奖单独
税
* 年终奖单独
扣税应缴税额
*/
@ExcelAttribute
(
name
=
"年终奖单独税"
)
@Schema
(
description
=
"年终奖单独税"
)
@ExcelProperty
(
"年终奖单独税"
)
private
BigDecimal
tax
;
@ExcelAttribute
(
name
=
"年终奖单独扣税应缴税额"
)
@Schema
(
description
=
"年终奖单独扣税应缴税额"
)
@ExcelProperty
(
"年终奖单独扣税应缴税额"
)
private
BigDecimal
bonusTax
;
/**
* 项目id
*/
@Length
(
max
=
32
,
message
=
"项目id 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"项目id"
,
maxLength
=
32
)
@Schema
(
description
=
"项目id"
)
@ExcelProperty
(
"项目id"
)
private
String
deptId
;
/**
* 项目编码
*/
@Length
(
max
=
50
,
message
=
"项目编码 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"项目编码"
,
maxLength
=
50
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
/**
* 项目名称
*/
@Length
(
max
=
50
,
message
=
"项目名称 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"项目名称"
,
maxLength
=
50
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
/**
* 单位id
*/
...
...
@@ -129,20 +131,12 @@ public class TStatisticsAnnualBonusVo extends RowIndex implements Serializable {
@ExcelProperty
(
"单位id"
)
private
String
unitId
;
/**
* 单位
no
* 单位
编码
*/
@Length
(
max
=
50
,
message
=
"单位
no
不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"单位
no
"
,
maxLength
=
50
)
@Schema
(
description
=
"单位
no
"
)
@ExcelProperty
(
"单位
no
"
)
@Length
(
max
=
50
,
message
=
"单位
编码
不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"单位
编码
"
,
maxLength
=
50
)
@Schema
(
description
=
"单位
编码
"
)
@ExcelProperty
(
"单位
编码
"
)
private
String
unitNo
;
/**
* 单位name
*/
@Length
(
max
=
50
,
message
=
"单位name 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"单位name"
,
maxLength
=
50
)
@Schema
(
description
=
"单位name"
)
@ExcelProperty
(
"单位name"
)
private
String
unitName
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsDeclarerVo.java
View file @
75b0185f
...
...
@@ -17,15 +17,11 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
/**
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsAnnualBonusController.java
deleted
100644 → 0
View file @
829737d6
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
controller
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsAnnualBonus
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsAnnualBonusService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsAnnualBonusSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.util.List
;
/**
* 统计-全年一次性奖金
*
* @author hgw
* @date 2022-08-05 11:40:15
*/
@RestController
@RequiredArgsConstructor
@RequestMapping
(
"/tstatisticsannualbonus"
)
@Tag
(
name
=
"统计-全年一次性奖金管理"
)
@Slf4j
public
class
TStatisticsAnnualBonusController
{
private
final
TStatisticsAnnualBonusService
tStatisticsAnnualBonusService
;
/**
* 简单分页查询
*
* @param page 分页对象
* @param tStatisticsAnnualBonus 统计-全年一次性奖金
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TStatisticsAnnualBonus
>>
getTStatisticsAnnualBonusPage
(
Page
<
TStatisticsAnnualBonus
>
page
,
TStatisticsAnnualBonusSearchVo
tStatisticsAnnualBonus
)
{
return
new
R
<>(
tStatisticsAnnualBonusService
.
getTStatisticsAnnualBonusPage
(
page
,
tStatisticsAnnualBonus
));
}
/**
* 不分页查询
*
* @param tStatisticsAnnualBonus 统计-全年一次性奖金
* @return
*/
@Operation
(
summary
=
"不分页查询"
,
description
=
"不分页查询"
)
@PostMapping
(
"/noPage"
)
public
R
<
List
<
TStatisticsAnnualBonus
>>
getTStatisticsAnnualBonusNoPage
(
@RequestBody
TStatisticsAnnualBonusSearchVo
tStatisticsAnnualBonus
)
{
return
R
.
ok
(
tStatisticsAnnualBonusService
.
noPageDiy
(
tStatisticsAnnualBonus
));
}
/**
* 通过id查询统计-全年一次性奖金
*
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
public
R
<
TStatisticsAnnualBonus
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tStatisticsAnnualBonusService
.
getById
(
id
));
}
/**
* 新增统计-全年一次性奖金
*
* @param tStatisticsAnnualBonus 统计-全年一次性奖金
* @return R
*/
@Operation
(
summary
=
"新增统计-全年一次性奖金"
,
description
=
"新增统计-全年一次性奖金:hasPermission('salary_tstatisticsannualbonus_add')"
)
@SysLog
(
"新增统计-全年一次性奖金"
)
@PostMapping
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsannualbonus_add')"
)
public
R
<
Boolean
>
save
(
@RequestBody
TStatisticsAnnualBonus
tStatisticsAnnualBonus
)
{
return
R
.
ok
(
tStatisticsAnnualBonusService
.
save
(
tStatisticsAnnualBonus
));
}
/**
* 通过id删除统计-全年一次性奖金
*
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id删除统计-全年一次性奖金"
,
description
=
"通过id删除统计-全年一次性奖金:hasPermission('salary_tstatisticsannualbonus_del')"
)
@SysLog
(
"通过id删除统计-全年一次性奖金"
)
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsannualbonus_del')"
)
public
R
<
Boolean
>
removeById
(
@PathVariable
String
id
)
{
return
R
.
ok
(
tStatisticsAnnualBonusService
.
removeById
(
id
));
}
/**
* 统计-全年一次性奖金 批量导出
*
* @author hgw
* @date 2022-08-05 11:40:15
**/
@Operation
(
description
=
"导出统计-全年一次性奖金 hasPermission('salary_tstatisticsannualbonus-export')"
)
@PostMapping
(
"/export"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsannualbonus-export')"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsAnnualBonusSearchVo
searchVo
)
{
tStatisticsAnnualBonusService
.
listExport
(
response
,
searchVo
);
}
/**
* 年终奖分配方案导入导出
*
* @author huyc
* @date 2022-08-08
**/
@Operation
(
description
=
"年终奖分配方案导入导出 hasPermission('salary_tstatisticsannualbonus_import')"
)
@PostMapping
(
"/bestSolutionExport"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsannualbonus_import')"
)
public
R
<
List
<
ErrorMessage
>>
bestSolutionExport
(
@RequestBody
MultipartFile
file
,
HttpServletResponse
response
,
List
<
String
>
exportFields
)
throws
IOException
{
return
tStatisticsAnnualBonusService
.
bestSendExport
(
file
.
getInputStream
(),
response
,
exportFields
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsBonusController.java
0 → 100644
View file @
75b0185f
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
controller
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
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.salary.entity.TStatisticsBonus
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsBonusService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsBonusSearchVo
;
import
lombok.SneakyThrows
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
* 全年一次性奖金申报表
*
* @author huyc
* @date 2022-08-14 21:31:15
*/
@RestController
@RequiredArgsConstructor
@RequestMapping
(
"/tstatisticsbonus"
)
@Tag
(
name
=
"全年一次性奖金申报表管理"
)
public
class
TStatisticsBonusController
{
private
final
TStatisticsBonusService
tStatisticsBonusService
;
/**
* 简单分页查询
* @param page 分页对象
* @param tStatisticsBonus 全年一次性奖金申报表
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TStatisticsBonus
>>
getTStatisticsBonusPage
(
Page
<
TStatisticsBonus
>
page
,
TStatisticsBonusSearchVo
tStatisticsBonus
)
{
return
new
R
<>(
tStatisticsBonusService
.
getTStatisticsBonusPage
(
page
,
tStatisticsBonus
));
}
/**
* 不分页查询
* @param tStatisticsBonus 全年一次性奖金申报表
* @return
*/
@Operation
(
summary
=
"不分页查询"
,
description
=
"不分页查询"
)
@PostMapping
(
"/noPage"
)
public
R
<
List
<
TStatisticsBonus
>>
getTStatisticsBonusNoPage
(
@RequestBody
TStatisticsBonusSearchVo
tStatisticsBonus
)
{
return
R
.
ok
(
tStatisticsBonusService
.
noPageDiy
(
tStatisticsBonus
));
}
/**
* 新增全年一次性奖金申报表
* @param tStatisticsBonus 全年一次性奖金申报表
* @return R
*/
@Operation
(
summary
=
"新增全年一次性奖金申报表"
,
description
=
"新增全年一次性奖金申报表:hasPermission('salary_tstatisticsbonus_add')"
)
@SysLog
(
"新增全年一次性奖金申报表"
)
@PostMapping
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_add')"
)
public
R
<
Boolean
>
save
(
@RequestBody
TStatisticsBonus
tStatisticsBonus
)
{
return
R
.
ok
(
tStatisticsBonusService
.
save
(
tStatisticsBonus
));
}
/**
* 通过id删除全年一次性奖金申报表
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id删除全年一次性奖金申报表"
,
description
=
"通过id删除全年一次性奖金申报表:hasPermission('salary_tstatisticsbonus_del')"
)
@SysLog
(
"通过id删除全年一次性奖金申报表"
)
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_del')"
)
public
R
<
Boolean
>
removeById
(
@PathVariable
String
id
)
{
return
R
.
ok
(
tStatisticsBonusService
.
removeById
(
id
));
}
/**
* 全年一次性奖金申报表 批量导入
*
* @author huyc
* @date 2022-08-14 21:31:15
**/
@SneakyThrows
@Operation
(
description
=
"批量新增全年一次性奖金申报表 hasPermission('salary_tstatisticsbonus-batch-import')"
)
@SysLog
(
"批量新增全年一次性奖金申报表"
)
@PostMapping
(
"/importListAdd"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus-batch-import')"
)
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
){
return
tStatisticsBonusService
.
importDiy
(
file
.
getInputStream
());
}
/**
* 全年一次性奖金申报表 批量导出
* @author huyc
* @date 2022-08-14 21:31:15
**/
@Operation
(
description
=
"导出全年一次性奖金申报表 hasPermission('salary_tstatisticsbonus-export')"
)
@PostMapping
(
"/export"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus-export')"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsBonusSearchVo
searchVo
)
{
tStatisticsBonusService
.
listExport
(
response
,
searchVo
);
}
/**
* 全年一次性奖金申报表 批量删除
*
* @author huyc
* @date 2022-08-14 21:31:15
**/
@Operation
(
description
=
"批量删除全年一次性奖金申报表 hasPermission('salary_tstatisticsbonus_del')"
)
@SysLog
(
"批量删除全年一次性奖金申报表"
)
@PostMapping
(
"/batchDelete"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsbonus_del')"
)
public
R
batchDelete
(
@RequestBody
String
declareMonth
){
return
tStatisticsBonusService
.
batchDelete
(
declareMonth
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TStatisticsDeclarerController.java
View file @
75b0185f
...
...
@@ -147,7 +147,7 @@ public class TStatisticsDeclarerController {
**/
@Operation
(
description
=
"导出申报对象表 hasPermission('salary_tstatisticsdeclarer-export')"
)
@PostMapping
(
"/export"
)
@PreAuthorize
(
"@pms.hasPermission('salary_tstatisticsdeclarer-export')"
)
//
@PreAuthorize("@pms.hasPermission('salary_tstatisticsdeclarer-export')")
public
void
export
(
HttpServletResponse
response
,
@RequestBody
TStatisticsDeclarerSearchVo
searchVo
)
{
tStatisticsDeclarerService
.
listExport
(
response
,
searchVo
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatistics
Annual
BonusMapper.java
→
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsBonusMapper.java
View file @
75b0185f
...
...
@@ -18,23 +18,24 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsAnnualBonus
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsBonus
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
*
统计-全年一次性奖金
*
全年一次性奖金申报表
*
* @author h
gw
* @date 2022-08-
05 11:40
:15
* @author h
uyc
* @date 2022-08-
14 21:31
:15
*/
@Mapper
public
interface
TStatistics
AnnualBonusMapper
extends
BaseMapper
<
TStatisticsAnnual
Bonus
>
{
public
interface
TStatistics
BonusMapper
extends
BaseMapper
<
TStatistics
Bonus
>
{
/**
*
统计-全年一次性奖金
简单分页查询
* @param tStatistics
AnnualBonus 统计-全年一次性奖金
*
全年一次性奖金申报表
简单分页查询
* @param tStatistics
Bonus 全年一次性奖金申报表
* @return
*/
IPage
<
TStatistics
AnnualBonus
>
getTStatisticsAnnualBonusPage
(
Page
<
TStatisticsAnnualBonus
>
page
,
@Param
(
"tStatisticsAnnualBonus"
)
TStatisticsAnnualBonus
tStatisticsAnnual
Bonus
);
IPage
<
TStatistics
Bonus
>
getTStatisticsBonusPage
(
Page
<
TStatisticsBonus
>
page
,
@Param
(
"tStatisticsBonus"
)
TStatisticsBonus
tStatistics
Bonus
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TStatistics
Annual
BonusService.java
→
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TStatisticsBonusService.java
View file @
75b0185f
...
...
@@ -17,43 +17,41 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsBonus
;
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.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsAnnualBonus
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsAnnualBonusSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsBonusSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
/**
*
统计-全年一次性奖金
*
全年一次性奖金申报表
*
* @author h
gw
* @date 2022-08-
05 11:40
:15
* @author h
uyc
* @date 2022-08-
14 21:31
:15
*/
public
interface
TStatistics
AnnualBonusService
extends
IService
<
TStatisticsAnnual
Bonus
>
{
public
interface
TStatistics
BonusService
extends
IService
<
TStatistics
Bonus
>
{
/**
*
统计-全年一次性奖金
简单分页查询
* @param tStatistics
AnnualBonus 统计-全年一次性奖金
*
全年一次性奖金申报表
简单分页查询
* @param tStatistics
Bonus 全年一次性奖金申报表
* @return
*/
IPage
<
TStatisticsAnnualBonus
>
getTStatisticsAnnualBonusPage
(
Page
<
TStatisticsAnnualBonus
>
page
,
TStatisticsAnnualBonusSearchVo
tStatisticsAnnualBonus
);
IPage
<
TStatisticsBonus
>
getTStatisticsBonusPage
(
Page
<
TStatisticsBonus
>
page
,
TStatisticsBonusSearchVo
tStatisticsBonus
);
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
);
void
listExport
(
HttpServletResponse
response
,
TStatistics
Annual
BonusSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TStatisticsBonusSearchVo
searchVo
);
List
<
TStatistics
AnnualBonus
>
noPageDiy
(
TStatisticsAnnual
BonusSearchVo
searchVo
);
List
<
TStatistics
Bonus
>
noPageDiy
(
TStatistics
BonusSearchVo
searchVo
);
/**
*
年终奖分配方案导入导出
* @param
inputStream
*
批量删除全年一次性奖金申报表
* @param
declareMonth 申报月份
* @return
*/
R
<
List
<
ErrorMessage
>>
bestSendExport
(
InputStream
inputStream
,
HttpServletResponse
response
,
List
<
String
>
exportFields
);
R
batchDelete
(
String
declareMonth
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsAnnualBonusServiceImpl.java
deleted
100644 → 0
View file @
829737d6
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/TStatisticsBonusServiceImpl.java
0 → 100644
View file @
75b0185f
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatistics
Annual
BonusMapper.xml
→
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
View file @
75b0185f
...
...
@@ -21,94 +21,84 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatistics
Annual
BonusMapper"
>
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsBonusMapper"
>
<resultMap
id=
"tStatisticsAnnualBonusMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsAnnualBonus"
>
<id
property=
"id"
column=
"id"
/>
<result
property=
"invoiceTitle"
column=
"INVOICE_TITLE"
/>
<result
property=
"settleDepartId"
column=
"SETTLE_DEPART_ID"
/>
<result
property=
"settleDepartNo"
column=
"SETTLE_DEPART_NO"
/>
<result
property=
"settleDepartName"
column=
"SETTLE_DEPART_NAME"
/>
<result
property=
"declareMonth"
column=
"declare_MONTH"
/>
<result
property=
"empId"
column=
"EMP_ID"
/>
<resultMap
id=
"tStatisticsBonusMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsBonus"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"declareUnit"
column=
"DECLARE_UNIT"
/>
<result
property=
"declareMonth"
column=
"DECLARE_MONTH"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"annualBonus"
column=
"annual_bonus"
/>
<result
property=
"tax"
column=
"tax"
/>
<result
property=
"annualBonus"
column=
"ANNUAL_BONUS"
/>
<result
property=
"bonusTax"
column=
"BONUS_TAX"
/>
<result
property=
"deptId"
column=
"DEPT_ID"
/>
<result
property=
"deptNo"
column=
"DEPT_NO"
/>
<result
property=
"deptName"
column=
"DEPT_NAME"
/>
<result
property=
"unitId"
column=
"UNIT_ID"
/>
<result
property=
"unitNo"
column=
"UNIT_NO"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
a.INVOICE_TITLE,
a.SETTLE_DEPART_ID,
a.SETTLE_DEPART_NO,
a.SETTLE_DEPART_NAME,
a.declare_MONTH,
a.EMP_ID,
a.ID,
a.DECLARE_UNIT,
a.DECLARE_MONTH,
a.EMP_NAME,
a.EMP_IDCARD,
a.annual_bonus,
a.tax,
a.ANNUAL_BONUS,
a.BONUS_TAX,
a.DEPT_ID,
a.DEPT_NO,
a.DEPT_NAME,
a.UNIT_ID,
a.UNIT_NO,
a.UNIT_NAME
a.UNIT_NO
</sql>
<sql
id=
"tStatistics
Annual
Bonus_where"
>
<if
test=
"tStatistics
Annual
Bonus != null"
>
<if
test=
"tStatistics
AnnualBonus.id != null and tStatisticsAnnual
Bonus.id.trim() != ''"
>
AND a.
id = #{tStatisticsAnnual
Bonus.id}
<sql
id=
"tStatisticsBonus_where"
>
<if
test=
"tStatisticsBonus != null"
>
<if
test=
"tStatistics
Bonus.id != null and tStatistics
Bonus.id.trim() != ''"
>
AND a.
ID = #{tStatistics
Bonus.id}
</if>
<if
test=
"tStatistics
AnnualBonus.invoiceTitle != null and tStatisticsAnnualBonus.invoiceTitle
.trim() != ''"
>
AND a.
INVOICE_TITLE = #{tStatisticsAnnualBonus.invoiceTitle
}
<if
test=
"tStatistics
Bonus.declareUnit != null and tStatisticsBonus.declareUnit
.trim() != ''"
>
AND a.
DECLARE_UNIT = #{tStatisticsBonus.declareUnit
}
</if>
<if
test=
"tStatistics
AnnualBonus.settleDepartId != null and tStatisticsAnnualBonus.settleDepartId
.trim() != ''"
>
AND a.
SETTLE_DEPART_ID = #{tStatisticsAnnualBonus.settleDepartId
}
<if
test=
"tStatistics
Bonus.declareMonth != null and tStatisticsBonus.declareMonth
.trim() != ''"
>
AND a.
DECLARE_MONTH = #{tStatisticsBonus.declareMonth
}
</if>
<if
test=
"tStatistics
AnnualBonus.settleDepartNo != null and tStatisticsAnnualBonus.settleDepartNo
.trim() != ''"
>
AND a.
SETTLE_DEPART_NO = #{tStatisticsAnnualBonus.settleDepartNo
}
<if
test=
"tStatistics
Bonus.empName != null and tStatisticsBonus.empName
.trim() != ''"
>
AND a.
EMP_NAME = #{tStatisticsBonus.empName
}
</if>
<if
test=
"tStatistics
AnnualBonus.settleDepartName != null and tStatisticsAnnualBonus.settleDepartName
.trim() != ''"
>
AND a.
SETTLE_DEPART_NAME = #{tStatisticsAnnualBonus.settleDepartName
}
<if
test=
"tStatistics
Bonus.empIdcard != null and tStatisticsBonus.empIdcard
.trim() != ''"
>
AND a.
EMP_IDCARD = #{tStatisticsBonus.empIdcard
}
</if>
<if
test=
"tStatistics
AnnualBonus.declareMonth != null and tStatisticsAnnualBonus.declareMonth.trim() != ''
"
>
AND a.
declare_MONTH = #{tStatisticsAnnualBonus.declareMonth
}
<if
test=
"tStatistics
Bonus.annualBonus != null
"
>
AND a.
ANNUAL_BONUS = #{tStatisticsBonus.annualBonus
}
</if>
<if
test=
"tStatistics
AnnualBonus.empId != null and tStatisticsAnnualBonus.empId.trim() != ''
"
>
AND a.
EMP_ID = #{tStatisticsAnnualBonus.empId
}
<if
test=
"tStatistics
Bonus.bonusTax != null
"
>
AND a.
BONUS_TAX = #{tStatisticsBonus.bonusTax
}
</if>
<if
test=
"tStatistics
AnnualBonus.empName != null and tStatisticsAnnualBonus.empName
.trim() != ''"
>
AND a.
EMP_NAME = #{tStatisticsAnnualBonus.empName
}
<if
test=
"tStatistics
Bonus.deptId != null and tStatisticsBonus.deptId
.trim() != ''"
>
AND a.
DEPT_ID = #{tStatisticsBonus.deptId
}
</if>
<if
test=
"tStatistics
AnnualBonus.empIdcard != null and tStatisticsAnnualBonus.empIdcard
.trim() != ''"
>
AND a.
EMP_IDCARD = #{tStatisticsAnnualBonus.empIdcard
}
<if
test=
"tStatistics
Bonus.deptNo != null and tStatisticsBonus.deptNo
.trim() != ''"
>
AND a.
DEPT_NO = #{tStatisticsBonus.deptNo
}
</if>
<if
test=
"tStatistics
AnnualBonus.annualBonus != null
"
>
AND a.
annual_bonus = #{tStatisticsAnnualBonus.annualBonus
}
<if
test=
"tStatistics
Bonus.deptName != null and tStatisticsBonus.deptName.trim() != ''
"
>
AND a.
DEPT_NAME = #{tStatisticsBonus.deptName
}
</if>
<if
test=
"tStatistics
AnnualBonus.tax != null
"
>
AND a.
tax = #{tStatisticsAnnualBonus.tax
}
<if
test=
"tStatistics
Bonus.unitId != null and tStatisticsBonus.unitId.trim() != ''
"
>
AND a.
UNIT_ID = #{tStatisticsBonus.unitId
}
</if>
<if
test=
"tStatisticsAnnualBonus.unitId != null and tStatisticsAnnualBonus.unitId.trim() != ''"
>
AND a.UNIT_ID = #{tStatisticsAnnualBonus.unitId}
</if>
<if
test=
"tStatisticsAnnualBonus.unitNo != null and tStatisticsAnnualBonus.unitNo.trim() != ''"
>
AND a.UNIT_NO = #{tStatisticsAnnualBonus.unitNo}
</if>
<if
test=
"tStatisticsAnnualBonus.unitName != null and tStatisticsAnnualBonus.unitName.trim() != ''"
>
AND a.UNIT_NAME = #{tStatisticsAnnualBonus.unitName}
<if
test=
"tStatisticsBonus.unitNo != null and tStatisticsBonus.unitNo.trim() != ''"
>
AND a.UNIT_NO = #{tStatisticsBonus.unitNo}
</if>
</if>
</sql>
<!--tStatistics
Annual
Bonus简单分页查询-->
<select
id=
"getTStatistics
AnnualBonusPage"
resultMap=
"tStatisticsAnnual
BonusMap"
>
<!--tStatisticsBonus简单分页查询-->
<select
id=
"getTStatistics
BonusPage"
resultMap=
"tStatistics
BonusMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_statistics_
annual_
bonus a
FROM t_statistics_bonus a
<where>
1=1
<include
refid=
"tStatistics
Annual
Bonus_where"
/>
<include
refid=
"tStatisticsBonus_where"
/>
</where>
</select>
</mapper>
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentHeFeiVo.java
View file @
75b0185f
...
...
@@ -22,7 +22,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
* 员工姓名
*/
@Length
(
max
=
20
,
message
=
"员工姓名不能超过20个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
20
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
20
,
isNotEmpty
=
true
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
View file @
75b0185f
...
...
@@ -51,7 +51,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
* 员工姓名
*/
@Length
(
max
=
20
,
message
=
"员工姓名 不能超过20 个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
20
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
20
,
isNotEmpty
=
true
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @
75b0185f
...
...
@@ -44,10 +44,8 @@ import org.springframework.web.bind.annotation.*;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLDecoder
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -226,8 +224,10 @@ public class TPreDispatchInfoController {
@SysLog
(
"预派单批量新增派增"
)
@PostMapping
(
"/analysisJsonStringImportAdd"
)
@PreAuthorize
(
"@pms.hasPermission('social_tpredispatchinfo_importAddList')"
)
public
R
analysisJsonStringImportAdd
(
@RequestBody
String
jsonString
,
@RequestParam
(
value
=
"socialHouse"
,
required
=
false
)
String
socialHouse
,
@RequestParam
(
value
=
"fundHouse"
,
required
=
false
)
String
fundHouse
,
@RequestParam
String
departId
)
{
public
R
analysisJsonStringImportAdd
(
@RequestBody
String
jsonString
,
@RequestParam
(
value
=
"socialHouse"
,
required
=
false
)
String
socialHouse
,
@RequestParam
(
value
=
"fundHouse"
,
required
=
false
)
String
fundHouse
,
@RequestParam
String
departId
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
...
@@ -241,15 +241,19 @@ public class TPreDispatchInfoController {
//用于返回错误信息
List
<
ErrorMessage
>
errorInfo
=
new
ArrayList
<>();
if
(
null
!=
util1
.
getErrorInfo
()
&&
!
util1
.
getErrorInfo
().
isEmpty
())
{
return
R
.
failed
(
util1
.
getErrorInfo
(),
PreDispatchConstants
.
DATA_CHECK
);
}
else
{
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchSavePreDisPatchAdd
(
listInfo
,
user
,
socialHouse
,
fundHouse
,
departId
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
for
(
ErrorMessage
errorMessage:
util1
.
getErrorInfo
())
{
errorInfo
.
add
(
errorMessage
);
}
return
R
.
ok
(
errorInfo
);
}
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchSavePreDisPatchAdd
(
listInfo
,
user
,
socialHouse
,
fundHouse
,
departId
,
errorInfo
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
}
List
<
ErrorMessage
>
newErrorList
=
errorInfo
.
stream
().
sorted
(
Comparator
.
comparing
(
ErrorMessage:
:
getLineNum
))
.
collect
(
Collectors
.
toList
());
return
R
.
ok
(
newErrorList
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
...
...
@@ -281,15 +285,18 @@ public class TPreDispatchInfoController {
//用于返回错误信息
List
<
ErrorMessage
>
errorInfo
=
new
ArrayList
<>();
if
(
null
!=
util1
.
getErrorInfo
()
&&
!
util1
.
getErrorInfo
().
isEmpty
())
{
return
R
.
failed
(
util1
.
getErrorInfo
());
}
else
{
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchSavePreDisPatchReduce
(
listInfo
,
user
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
for
(
ErrorMessage
errorMessage:
util1
.
getErrorInfo
())
{
errorInfo
.
add
(
errorMessage
);
}
return
R
.
ok
(
errorInfo
);
}
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
tPreDispatchInfoService
.
batchSavePreDisPatchReduce
(
listInfo
,
user
,
errorInfo
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
}
List
<
ErrorMessage
>
newErrorList
=
errorInfo
.
stream
().
sorted
(
Comparator
.
comparing
(
ErrorMessage:
:
getLineNum
))
.
collect
(
Collectors
.
toList
());
return
R
.
ok
(
newErrorList
);
}
catch
(
Exception
e
)
{
log
.
error
(
"预派单批量导入派减"
,
e
);
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
...
...
@@ -332,15 +339,18 @@ public class TPreDispatchInfoController {
//用于返回错误信息
List
<
ErrorMessage
>
errorInfo
=
new
ArrayList
<>();
if
(
null
!=
util1
.
getErrorInfo
()
&&
!
util1
.
getErrorInfo
().
isEmpty
())
{
return
R
.
failed
(
util1
.
getErrorInfo
(),
PreDispatchConstants
.
DATA_CHECK
);
}
else
{
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchUpdatePreDisPatch
(
listInfo
,
user
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
for
(
ErrorMessage
errorMessage:
util1
.
getErrorInfo
())
{
errorInfo
.
add
(
errorMessage
);
}
return
R
.
ok
(
errorInfo
);
}
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
tPreDispatchInfoService
.
batchUpdatePreDisPatch
(
listInfo
,
user
,
errorInfo
);
}
else
{
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
));
}
List
<
ErrorMessage
>
newErrorList
=
errorInfo
.
stream
().
sorted
(
Comparator
.
comparing
(
ErrorMessage:
:
getLineNum
))
.
collect
(
Collectors
.
toList
());
return
R
.
ok
(
newErrorList
);
}
catch
(
Exception
e
)
{
log
.
error
(
"预派单批量更新"
,
e
);
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPreDispatchInfoService.java
View file @
75b0185f
...
...
@@ -109,7 +109,8 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @param departId
* @return
**/
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
socialHouse
,
String
fundHouse
,
String
departId
);
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
socialHouse
,
String
fundHouse
,
String
departId
,
List
<
ErrorMessage
>
errorInfo
);
/**
* 预派单批量新增派减
...
...
@@ -119,7 +120,8 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @param user
* @return
**/
List
<
ErrorMessage
>
batchSavePreDisPatchReduce
(
List
<
TPreDispatchReduceVo
>
listInfo
,
YifuUser
user
);
List
<
ErrorMessage
>
batchSavePreDisPatchReduce
(
List
<
TPreDispatchReduceVo
>
listInfo
,
YifuUser
user
,
List
<
ErrorMessage
>
errorInfo
);
/**
* 预派单批量更新
...
...
@@ -129,7 +131,8 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @param user
* @return
**/
List
<
ErrorMessage
>
batchUpdatePreDisPatch
(
List
<
TPreDispatchUpdateVo
>
listInfo
,
YifuUser
user
);
List
<
ErrorMessage
>
batchUpdatePreDisPatch
(
List
<
TPreDispatchUpdateVo
>
listInfo
,
YifuUser
user
,
List
<
ErrorMessage
>
messageList
);
/**
* 预派单导出
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
75b0185f
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/TPreDispatchInfoServiceImpl.java
View file @
75b0185f
...
...
@@ -641,17 +641,17 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
@Override
public
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
socialHouse
,
String
fundHouse
,
String
departId
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
,
String
fundHouse
,
String
departId
,
List
<
ErrorMessage
>
errList
)
{
R
<
TSettleDomainSelectVo
>
domainR
=
archivesDaprUtil
.
getSettleDomainSelectVoById
(
departId
);
// 获取区域数据MAP
HashMap
<
String
,
SysArea
>
areaHashMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
HashMap
<
String
,
SysArea
>
areaIdMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
if
(
dataCheck
(
listInfo
,
err
or
List
,
areaHashMap
,
areaIdMap
))
{
return
err
or
List
;
if
(
dataCheck
(
listInfo
,
errList
,
areaHashMap
,
areaIdMap
))
{
return
errList
;
}
if
(
dataCheckDepart
(
err
or
List
,
domainR
))
{
return
err
or
List
;
if
(
dataCheckDepart
(
errList
,
domainR
))
{
return
errList
;
}
TSettleDomainSelectVo
selectVo
=
domainR
.
getData
();
// 获取基数配置信息
...
...
@@ -671,11 +671,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
i
++;
if
(
Common
.
isNotNull
(
info
.
getTelNotice
())
&&
(!
CommonConstants
.
IS_TRUE
.
equals
(
info
.
getTelNotice
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
info
.
getTelNotice
())))
{
err
or
List
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
errList
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
continue
;
}
// 1.验重
if
(
checkAddRepeat
(
err
or
List
,
existsMap
,
i
,
info
))
{
if
(
checkAddRepeat
(
errList
,
existsMap
,
i
,
info
))
{
continue
;
}
// 基础封装 其他
...
...
@@ -698,11 +698,22 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if
(!
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
}
baseMapper
.
insert
(
info
);
int
finalI
=
i
;
if
(!
errList
.
stream
().
anyMatch
(
e
->
hasError
(
e
,
finalI
)))
{
baseMapper
.
insert
(
info
);
}
}
return
err
or
List
;
return
errList
;
}
public
Boolean
hasError
(
ErrorMessage
errorMessage
,
int
i
)
{
if
(
Common
.
isNotNull
(
errorMessage
.
getMessage
())
&&
errorMessage
.
getLineNum
()
==
i
)
{
return
true
;
}
return
false
;
}
/**
* 预派单批量新增派减
* @param list
...
...
@@ -713,9 +724,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
**/
@Transactional
@Override
public
List
<
ErrorMessage
>
batchSavePreDisPatchReduce
(
List
<
TPreDispatchReduceVo
>
list
,
YifuUser
user
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
public
List
<
ErrorMessage
>
batchSavePreDisPatchReduce
(
List
<
TPreDispatchReduceVo
>
list
,
YifuUser
user
,
List
<
ErrorMessage
>
errorList
)
{
// 获取区域数据MAP
HashMap
<
String
,
SysArea
>
areaIdMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
HashMap
<
String
,
SysArea
>
areaHashMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
...
...
@@ -768,7 +778,10 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if
(!
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
}
baseMapper
.
insert
(
info
);
int
finalI
=
i
;
if
(!
errorList
.
stream
().
anyMatch
(
e
->
hasError
(
e
,
finalI
)))
{
baseMapper
.
insert
(
info
);
}
}
return
errorList
;
}
...
...
@@ -782,8 +795,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @return
**/
@Override
public
List
<
ErrorMessage
>
batchUpdatePreDisPatch
(
List
<
TPreDispatchUpdateVo
>
list
,
YifuUser
user
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
public
List
<
ErrorMessage
>
batchUpdatePreDisPatch
(
List
<
TPreDispatchUpdateVo
>
list
,
YifuUser
user
,
List
<
ErrorMessage
>
errorList
)
{
// 获取区域数据MAP
HashMap
<
String
,
SysArea
>
areaHashMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
HashMap
<
String
,
SysArea
>
areaIdMap
=
new
HashMap
<>(
CommonConstants
.
SIXTEEN_INT
);
...
...
@@ -808,40 +821,43 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
TPreDispatchInfo
repeat
=
null
;
int
i
=
1
;
String
str
=
null
;
for
(
TPreDispatchInfo
info:
listInfo
){
for
(
TPreDispatchInfo
info:
listInfo
)
{
i
++;
if
(
Common
.
isNotNull
(
info
.
getTelNotice
())
&&
(!
CommonConstants
.
IS_TRUE
.
equals
(
info
.
getTelNotice
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
info
.
getTelNotice
())))
{
errorList
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
errorList
.
add
(
new
ErrorMessage
(
i
,
"是否电话通知不允许导入【是】和【否】之外的内容"
));
continue
;
}
// 重置异常状态
info
.
setExceptionContent
(
""
);
info
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
temp
=
existsMap
.
get
(
info
.
getId
());
repeat
=
repeatMap
.
get
(
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getPayAddress
());
repeat
=
repeatMap
.
get
(
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getPayAddress
());
// 判重 及身份证不可更新
if
(
checkRepeatOrIdcard
(
errorList
,
temp
,
i
+
1
,
info
,
repeat
))
{
if
(
checkRepeatOrIdcard
(
errorList
,
temp
,
i
+
1
,
info
,
repeat
))
{
continue
;
}
// 验证派单类型
checkDispatchType
(
info
);
// 1.先校验已有数据
str
=
checkBatchSave
(
info
,
info
.
getType
());
str
=
checkBatchSave
(
info
,
info
.
getType
());
if
(
null
!=
str
)
{
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
info
.
setExceptionContent
(
str
);
}
// 2.封装 社保缴纳地 公积金缴纳地
initBatchUpdateArea
(
areaHashMap
,
areaIdMap
,
info
);
if
(
Common
.
isEmpty
(
info
.
getExceptionContent
())){
if
(
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
// 3.验证补缴时间是否异常 派增验证 派减日期不处理
checkStartTime
(
baseSocialSetMap
,
baseFundSetMap
,
temp
,
info
);
}
// 4.如果派增缴纳地有变更重新变更派单限制日期
initDayLimitForUpdate
(
dayConfMap
,
temp
,
info
);
// 5.更新
updateInfoByIdSub
(
errorList
,
temp
,
i
,
info
);
int
finalI
=
i
;
if
(!
errorList
.
stream
().
anyMatch
(
e
->
hasError
(
e
,
finalI
)))
{
updateInfoByIdSub
(
errorList
,
temp
,
i
,
info
);
}
}
return
errorList
;
}
...
...
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