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
7da84ed7
Commit
7da84ed7
authored
Nov 23, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目限制 & 薪资人员导出优化
parent
4de518f8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
505 additions
and
23 deletions
+505
-23
TSettleDomainEkpVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java
+443
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+12
-5
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+2
-1
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+18
-12
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+2
-2
TSalaryEmployeeMapper.xml
...y-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
+27
-1
AreaController.java
...u/cloud/plus/v1/yifu/admin/controller/AreaController.java
+1
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java
0 → 100644
View file @
7da84ed7
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.DecimalMax
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
/**
* @Author fxj
* @Date 2022/11/23
* @Description
* @Version 1.0
*/
@Data
public
class
TSettleDomainEkpVo
implements
Serializable
{
/**
* 主键
*/
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
private
String
departNo
;
/**
* 项目名称
*/
@Schema
(
description
=
"项目名称"
)
private
String
departName
;
/**
* 是否是新业务(0是/1否)
*/
@Schema
(
description
=
"是否是新业务(0是/1否)"
)
private
String
isNew
;
/**
* 新业务备注
*/
@Schema
(
description
=
"新业务备注"
)
private
String
newRemark
;
/**
* 是否删除(0否/1是)
*/
@Schema
(
description
=
"是否删除(0否/1是)"
)
private
String
deleteFlag
;
/**
* 服务审核标识(0是通过,1是不通过,2待审核,3待提交,4经理通过,5经理不通过)默认2
*/
@Schema
(
description
=
"服务审核标识(0是通过,1是不通过,2待审核,3待提交,4经理通过,5经理不通过)默认2"
)
private
String
dpAuditFlag
;
/**
* 原ID
*/
@Schema
(
description
=
"原ID"
)
private
String
oldId
;
/**
* 合同主体
*/
@Schema
(
description
=
"合同主体"
)
private
String
belongContract
;
/**
* 业务经理审核意见
*/
@Schema
(
description
=
"业务经理审核意见"
)
private
String
dpAuditOpinion
;
/**
* 审核人id
*/
@Schema
(
description
=
"审核人id"
)
private
String
dpAuditMan
;
/**
* 审核人名称
*/
@Schema
(
description
=
"审核人名称"
)
private
String
dpAuditManName
;
/**
* 最后审核时间
*/
@Schema
(
description
=
"最后审核时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
lastAuditDate
;
/**
* 服务项目
*/
@Schema
(
description
=
"服务项目"
)
private
String
serverItem
;
/**
* 收入归属
*/
@Schema
(
description
=
"收入归属"
)
private
String
incomeBelong
;
/**
* 收入归属细分
*/
@Schema
(
description
=
"收入归属细分"
)
private
String
incomeBelongSub
;
/**
* 所属客户
*/
@Schema
(
description
=
"所属客户"
)
private
String
customerId
;
/**
* 创建者姓名
*/
@Schema
(
description
=
"创建者姓名"
)
private
String
createUserName
;
/**
* 最后提交人
*/
@Schema
(
description
=
"最后提交人"
)
private
String
commitUser
;
/**
* 最后提交人姓名
*/
@Schema
(
description
=
"最后提交人姓名"
)
private
String
commitUserName
;
/**
* 账户余额
*/
@Schema
(
description
=
"账户余额"
)
private
BigDecimal
balance
;
/**
* 开票余额
*/
@Schema
(
description
=
"开票余额"
)
private
BigDecimal
invoiceBalance
;
/**
* 首次审核通过标志0审核通过1未审核通过
*/
@Schema
(
description
=
"首次审核通过标志0审核通过1未审核通过"
)
private
String
firstPassFlag
;
/**
* 首次审核通过时间
*/
@Schema
(
description
=
"首次审核通过时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
firstPassTime
;
/**
* 省
*/
@Schema
(
description
=
"省"
)
private
Integer
province
;
/**
* 市
*/
@Schema
(
description
=
"市"
)
private
Integer
city
;
/**
* 县
*/
@Schema
(
description
=
"县"
)
private
Integer
town
;
/**
* 服务状态:0正常 1停止服务
*/
@Schema
(
description
=
"服务状态:0正常 1停止服务"
)
private
String
stopFlag
;
/**
* 在职人数(正式加临时)
*/
@Schema
(
description
=
"在职人数(正式加临时)"
)
private
Integer
employeeNum
;
/**
* 停止时间
*/
@Schema
(
description
=
"停止时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
stopDate
;
/**
* stopReason
*/
@Schema
(
description
=
"stopReason"
)
private
String
stopReason
;
/**
* stopUser
*/
@Schema
(
description
=
"stopUser"
)
private
String
stopUser
;
/**
* stopUserName
*/
@Schema
(
description
=
"stopUserName"
)
private
String
stopUserName
;
/**
* 0:人事;1:非人事
*/
@Schema
(
description
=
"0:人事;1:非人事"
)
private
Integer
type
;
/**
* 业务类型分类
*/
@Schema
(
description
=
"业务类型分类"
)
private
String
businessPrimaryType
;
/**
* 业务类型二级分类
*/
@Schema
(
description
=
"业务类型二级分类"
)
private
String
businessSecondType
;
/**
* 业务类型三级分类
*/
@Schema
(
description
=
"业务类型三级分类"
)
private
String
businessThirdType
;
/**
* 业务经理审核意见
*/
@Schema
(
description
=
"业务经理审核意见"
)
private
String
managerAuditOpinion
;
/**
* 审核人id
*/
@Schema
(
description
=
"审核人id"
)
private
String
managerAuditMan
;
/**
* 审核人名称
*/
@Schema
(
description
=
"审核人名称"
)
private
String
managerAuditManName
;
/**
* 审核人审核的时间
*/
@Schema
(
description
=
"审核人审核的时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
auditTime
;
/**
* 经理审核时间
*/
@Schema
(
description
=
"经理审核时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
managerAuditTime
;
/**
* 创建类型:0 合同之后 1 合同之前
*/
@Schema
(
description
=
"创建类型:0 合同之后 1 合同之前"
)
private
String
createType
;
/**
* 关联合同:0是1否
*/
@Schema
(
description
=
"关联合同:0是1否"
)
private
String
relateFlag
;
/**
* 异常说明
*/
@Schema
(
description
=
"异常说明"
)
private
String
exceptionRemark
;
/**
* 是否存在垫付 0 不存在,1存在
*/
@Schema
(
description
=
"是否存在垫付 0 不存在,1存在"
)
private
String
existAdvancePayment
;
/**
* 回款周期1-12
*/
@Schema
(
description
=
"回款周期1-12"
)
private
String
backPayCycle
;
/**
* 社保类型0:缴费库;1:预估库
*/
@Schema
(
description
=
"社保类型0:缴费库;1:预估库"
)
private
String
socialType
;
/**
* 公积金类型0:缴费库;1:预估库
*/
@Schema
(
description
=
"公积金类型0:缴费库;1:预估库"
)
private
String
fundType
;
/**
* 商险结算类型0 合并(预估) 1 单独(实缴)
*/
@Schema
(
description
=
"商险结算类型0 合并 1 单独"
)
private
String
insuranceSettleType
;
/**
* 封面抬头-薪资
*/
@Schema
(
description
=
"封面抬头-薪资"
)
private
String
invoiceTitleSalary
;
/**
* 封面抬头-商险
*/
@Schema
(
description
=
"封面抬头-商险"
)
private
String
invoiceTitleInsurance
;
/**
* 我司到款单位
*/
@Schema
(
description
=
"我司到款单位"
)
private
String
unitOfOurCompany
;
/**
* 所属客户编码
*/
@Schema
(
description
=
"所属客户编码"
)
private
String
customerNo
;
/**
* 所属客户名称
*/
@Schema
(
description
=
"所属客户名称"
)
private
String
customerName
;
/**
* 省
*/
@Schema
(
description
=
"省"
)
private
String
eProvince
;
/**
* 市
*/
@Schema
(
description
=
"市"
)
private
String
eCity
;
/**
* 县
*/
@Schema
(
description
=
"县"
)
private
String
eTown
;
/**
* 管理费风险金的结算方式:1预估2实缴
*/
@Schema
(
description
=
"管理费风险金的结算方式:1预估2实缴"
)
private
String
mrSettleType
;
/**
* 管理费是否收费(0收费/1不收费)
*/
@Schema
(
description
=
"管理费是否收费(0收费/1不收费)"
)
private
String
managementTag
;
/**
* 管理费费率/管理费金额
*/
@Schema
(
description
=
"管理费费率/管理费金额"
)
private
BigDecimal
managementFee
;
/**
* 管理费收费方式:1按比例2金额-人数3金额-人次
*/
@Schema
(
description
=
"管理费收费方式:1按比例2金额-人数3金额-人次"
)
private
String
managementType
;
/**
* 风险金是否收取
*/
@Schema
(
description
=
"风险金是否收取"
)
private
String
riskFundTag
;
/**
* 风险金收取费用/税率
*/
@Schema
(
description
=
"风险金收取费用/税率"
)
private
BigDecimal
riskFundFee
;
/**
* 风险金收费方式:1按比例2金额-人数3金额-人次
*/
@Schema
(
description
=
"风险金收费方式:1按比例2金额-人数3金额-人次"
)
private
String
riskFundType
;
/**
* 管理费的收取服务项目:1社保2公积金3商险4薪酬
*/
@Schema
(
description
=
"管理费的收取服务项目:1社保2公积金3商险4薪酬"
)
private
String
manageServerItem
;
/**
* 风险金的收取服务项目:1社保2公积金3商险4薪酬
*/
@Schema
(
description
=
"风险金的收取服务项目:1社保2公积金3商险4薪酬"
)
private
String
riskServerItem
;
/**
* 单位大病比例
* hgw 2022-9-8 15:40:18
* 从t_depart_settlement_info表迁移过来的
*/
@Schema
(
description
=
"单位大病比例"
,
name
=
"unitSeriousIllnessProp"
)
private
BigDecimal
unitSeriousIllnessProp
;
/**
* EKP的 是否BPO: 是 否
*/
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
private
String
bpoFlag
;
/**
* EKP的服务团队 : 存
*/
@Schema
(
description
=
"EKP的服务团队"
,
name
=
"serviceTeam"
)
private
String
serviceTeam
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
7da84ed7
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
controller
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
...
@@ -26,10 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
...
@@ -26,10 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
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.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
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.log.annotation.SysLog
;
...
@@ -41,7 +39,10 @@ import org.springframework.beans.BeanUtils;
...
@@ -41,7 +39,10 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLDecoder
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -272,7 +273,13 @@ public class TSettleDomainController {
...
@@ -272,7 +273,13 @@ public class TSettleDomainController {
@Operation
(
summary
=
"修改项目表--EKP调用接口"
,
description
=
"修改项目表--EKP调用接口"
)
@Operation
(
summary
=
"修改项目表--EKP调用接口"
,
description
=
"修改项目表--EKP调用接口"
)
@SysLog
(
"修改项目表--EKP调用接口"
)
@SysLog
(
"修改项目表--EKP调用接口"
)
@PostMapping
(
"/updateProjectInfo"
)
@PostMapping
(
"/updateProjectInfo"
)
public
R
updateProjectInfo
(
@RequestBody
List
<
TSettleDomain
>
list
)
{
public
R
updateProjectInfo
(
@RequestBody
String
jsonStr
)
{
try
{
jsonStr
=
URLDecoder
.
decode
(
jsonStr
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
}
List
<
TSettleDomainEkpVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TSettleDomainEkpVo
.
class
);
return
tSettleDomainService
.
updateProjectInfo
(
list
);
return
tSettleDomainService
.
updateProjectInfo
(
list
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
7da84ed7
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainEkpVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
@@ -84,6 +85,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
...
@@ -84,6 +85,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
**/
**/
List
<
TSettleDomainSelectVo
>
selectAllSettleDomainSelectVos
();
List
<
TSettleDomainSelectVo
>
selectAllSettleDomainSelectVos
();
R
updateProjectInfo
(
List
<
TSettleDomain
>
list
);
R
updateProjectInfo
(
List
<
TSettleDomain
EkpVo
>
list
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
7da84ed7
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
*/
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -31,10 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
...
@@ -31,10 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
@@ -141,7 +139,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -141,7 +139,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Transactional
@Transactional
@Override
@Override
public
R
updateProjectInfo
(
List
<
TSettleDomain
>
list
)
{
public
R
updateProjectInfo
(
List
<
TSettleDomain
EkpVo
>
list
)
{
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
R
<
AreaMap
>
areaListR
;
R
<
AreaMap
>
areaListR
;
TSettleDomain
tSettleDomainInfo
;
TSettleDomain
tSettleDomainInfo
;
...
@@ -155,7 +153,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -155,7 +153,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
Map
<
String
,
String
>
areaMap
=
areaListR
.
getData
().
getLabelIdMap
();
Map
<
String
,
String
>
areaMap
=
areaListR
.
getData
().
getLabelIdMap
();
R
<
SysUserListVo
>
res
;
R
<
SysUserListVo
>
res
;
String
errorStr
;
String
errorStr
;
for
(
TSettleDomain
domain:
list
)
{
TSettleDomain
domain
;
for
(
TSettleDomainEkpVo
vo:
list
)
{
domain
=
new
TSettleDomain
();
BeanUtil
.
copyProperties
(
vo
,
domain
);
// 校验必填项
// 校验必填项
errorStr
=
checkInfo
(
domain
);
errorStr
=
checkInfo
(
domain
);
if
(
Common
.
isNotNull
(
errorStr
)){
if
(
Common
.
isNotNull
(
errorStr
)){
...
@@ -196,7 +197,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -196,7 +197,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
private
String
checkInfo
(
TSettleDomain
domain
)
{
private
String
checkInfo
(
TSettleDomain
domain
)
{
if
(
Common
.
isEmpty
(
domain
.
get
M
Id
())){
if
(
Common
.
isEmpty
(
domain
.
getId
())){
return
"id 不可为空"
;
return
"id 不可为空"
;
}
}
if
(
Common
.
isEmpty
(
domain
.
getDepartName
())||
Common
.
isEmpty
(
domain
.
getDepartNo
())){
if
(
Common
.
isEmpty
(
domain
.
getDepartName
())||
Common
.
isEmpty
(
domain
.
getDepartNo
())){
...
@@ -217,9 +218,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -217,9 +218,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
||
Common
.
isEmpty
(
domain
.
getEProvince
())){
||
Common
.
isEmpty
(
domain
.
getEProvince
())){
return
"省市不可为空"
;
return
"省市不可为空"
;
}
}
if
(
Common
.
isEmpty
(
domain
.
getCreateType
())){
/*
if ( Common.isEmpty(domain.getCreateType())){
return "创建类型不可为空";
return "创建类型不可为空";
}
}
*/
if
(
Common
.
isEmpty
(
domain
.
getBusinessPrimaryType
())
if
(
Common
.
isEmpty
(
domain
.
getBusinessPrimaryType
())
||
Common
.
isEmpty
(
domain
.
getBusinessSecondType
())
||
Common
.
isEmpty
(
domain
.
getBusinessSecondType
())
||
Common
.
isEmpty
(
domain
.
getBusinessThirdType
())){
||
Common
.
isEmpty
(
domain
.
getBusinessThirdType
())){
...
@@ -232,7 +233,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -232,7 +233,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
我司到款单位名称 条件:当服务项目中有社保或公积金时必填
我司到款单位名称 条件:当服务项目中有社保或公积金时必填
封面抬头-薪资 条件:当服务项目中有薪资时必填
封面抬头-薪资 条件:当服务项目中有薪资时必填
封面抬头-商险 条件:当服务项目中有商险时必填 */
封面抬头-商险 条件:当服务项目中有商险时必填 */
if
(
Common
.
is
Empty
(
domain
.
getServerItem
())){
if
(
Common
.
is
NotNull
(
domain
.
getServerItem
())){
if
(
domain
.
getServerItem
().
indexOf
(
"社保"
)
!=
CommonConstants
.
ONE_INT_NEGATE
){
if
(
domain
.
getServerItem
().
indexOf
(
"社保"
)
!=
CommonConstants
.
ONE_INT_NEGATE
){
if
(
Common
.
isEmpty
(
domain
.
getSocialType
())){
if
(
Common
.
isEmpty
(
domain
.
getSocialType
())){
return
"社保结算类型不可为空"
;
return
"社保结算类型不可为空"
;
...
@@ -249,6 +250,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -249,6 +250,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return
"我司到款单位不可为空"
;
return
"我司到款单位不可为空"
;
}
}
}
}
if
(
domain
.
getServerItem
().
indexOf
(
"薪资"
)
!=
CommonConstants
.
ONE_INT_NEGATE
){
if
(
Common
.
isEmpty
(
domain
.
getInvoiceTitleSalary
())){
return
"封面台头-薪资不可为空"
;
}
}
if
(
domain
.
getServerItem
().
indexOf
(
"商险"
)
!=
CommonConstants
.
ONE_INT_NEGATE
){
if
(
domain
.
getServerItem
().
indexOf
(
"商险"
)
!=
CommonConstants
.
ONE_INT_NEGATE
){
if
(
Common
.
isEmpty
(
domain
.
getInsuranceSettleType
())){
if
(
Common
.
isEmpty
(
domain
.
getInsuranceSettleType
())){
return
"商险结算类型不可为空"
;
return
"商险结算类型不可为空"
;
...
@@ -287,7 +293,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -287,7 +293,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
}
}
if
(
Common
.
isNotNull
(
tSettleDomain
.
getECity
())){
if
(
Common
.
isNotNull
(
tSettleDomain
.
getECity
())){
areaId
=
areaMap
.
get
(
tSettleDomain
.
getECity
());
areaId
=
areaMap
.
get
(
tSettleDomain
.
getECity
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSettleDomain
.
getEProvince
()
);
if
(
Common
.
isNotNull
(
areaId
)){
if
(
Common
.
isNotNull
(
areaId
)){
tSettleDomain
.
setCity
(
Integer
.
parseInt
(
areaId
));
tSettleDomain
.
setCity
(
Integer
.
parseInt
(
areaId
));
}
else
{
}
else
{
...
@@ -295,7 +301,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -295,7 +301,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
}
}
if
(
Common
.
isNotNull
(
tSettleDomain
.
getETown
())){
if
(
Common
.
isNotNull
(
tSettleDomain
.
getETown
())){
areaId
=
areaMap
.
get
(
tSettleDomain
.
getETown
());
areaId
=
areaMap
.
get
(
tSettleDomain
.
getETown
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSettleDomain
.
getECity
()
);
if
(
Common
.
isNotNull
(
areaId
)){
if
(
Common
.
isNotNull
(
areaId
)){
tSettleDomain
.
setTown
(
Integer
.
parseInt
(
areaId
));
tSettleDomain
.
setTown
(
Integer
.
parseInt
(
areaId
));
}
else
{
}
else
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
7da84ed7
...
@@ -117,12 +117,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -117,12 +117,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitStart
(
i
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
searchVo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
noPageDiy
(
searchVo
);
list
=
noPageDiy
(
searchVo
);
if
(
Common
.
isNotNull
(
list
))
{
/*
if (Common.isNotNull(list)) {
util = new ExcelUtil<>(TSalaryEmployeeExportVo.class);
util = new ExcelUtil<>(TSalaryEmployeeExportVo.class);
for (TSalaryEmployeeExportVo vo : list) {
for (TSalaryEmployeeExportVo vo : list) {
util.convertEntity(vo, null, null, null);
util.convertEntity(vo, null, null, null);
}
}
}
}
*/
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
writeSheet
=
EasyExcel
.
writerSheet
(
"薪酬人员表"
+
index
).
build
();
writeSheet
=
EasyExcel
.
writerSheet
(
"薪酬人员表"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml
View file @
7da84ed7
...
@@ -182,8 +182,34 @@
...
@@ -182,8 +182,34 @@
<select
id=
"noPageDiy"
resultMap=
"salaryEmployeeExportMap"
parameterType=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo"
>
<select
id=
"noPageDiy"
resultMap=
"salaryEmployeeExportMap"
parameterType=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
a.ID,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
a.DEPT_ID,
a.DEPT_NAME,
a.DEPT_NO,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.BANK_NAME,
a.BANK_SUB_NAME,
a.BANK_NO,
a.INVOICE_TITLE,
a1.area_name as "BANK_PROVINCE",
a2.area_name as "BANK_CITY",
a.EMP_PHONE,
a.TAX_MONTH,
case when a.FILE_STATUS = 0 then "在职"
when a.FILE_STATUS = 1 then "离职"
else null end as "FILE_STATUS"
FROM t_salary_employee a
FROM t_salary_employee a
left join sys_area a1 on a1.id=a.BANK_PROVINCE
left join sys_area a2 on a2.id=a.BANK_CITY
<where>
<where>
1=1
1=1
<include
refid=
"where_export"
/>
<include
refid=
"where_export"
/>
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/AreaController.java
View file @
7da84ed7
...
@@ -150,8 +150,7 @@ public class AreaController {
...
@@ -150,8 +150,7 @@ public class AreaController {
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
(
Common
.
isNotNull
(
temp
)
?
temp
.
getAreaName
()
:
""
),
area
.
getId
().
toString
());
+
(
Common
.
isNotNull
(
temp
)
?
temp
.
getAreaName
()
:
""
),
area
.
getId
().
toString
());
}
else
{
}
else
{
labelIdMap
.
put
(
CacheConstants
.
AREA_VALUE
labelIdMap
.
put
(
area
.
getAreaName
(),
area
.
getId
().
toString
());
+
area
.
getAreaName
(),
area
.
getId
().
toString
());
}
}
}
}
redisUtil
.
set
(
CacheConstants
.
AREA_VALUE_GROUP
,
labelIdMap
);
redisUtil
.
set
(
CacheConstants
.
AREA_VALUE_GROUP
,
labelIdMap
);
...
...
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