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
0a3cdcf5
Commit
0a3cdcf5
authored
2 years ago
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fdd 代码修改
parent
e8f3456c
master
MVP-1.7.3-shuiyou
MVP-1.7.7-Friend
MVP1.6.10
MVP1.6.11
MVP1.6.3-HCM
MVP1.6.4
MVP1.6.5
MVP1.6.6
MVP1.6.7
MVP1.6.8
MVP1.6.9
MVP1.7.0
MVP1.7.1
MVP1.7.2
MVP1.7.3
MVP1.7.3-wxgz
MVP1.7.4
MVP1.7.5
MVP1.7.6
MVP1.7.7
MVP1.7.8
MVP1.7.9
MVP1.7.9-fxj
develop
No related merge requests found
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
2161 additions
and
234 deletions
+2161
-234
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+5
-0
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+13
-2
TPreDispatchExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java
+2
-1
TPreDispatchImportVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchImportVo.java
+318
-0
TPreDispatchUpdateVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
+603
-0
TPreDispatchInfoController.java
...v1/yifu/social/controller/TPreDispatchInfoController.java
+148
-8
TPreDispatchInfoMapper.java
...ud/plus/v1/yifu/social/mapper/TPreDispatchInfoMapper.java
+5
-0
TPreDispatchInfoService.java
.../plus/v1/yifu/social/service/TPreDispatchInfoService.java
+40
-0
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+1019
-223
TPreDispatchInfoMapper.xml
...-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
+8
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
0a3cdcf5
...
...
@@ -25,6 +25,8 @@ 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
javax.validation.constraints.Size
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
...
...
@@ -53,6 +55,7 @@ public class TPaymentInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
@Size
(
max
=
20
,
message
=
"员工姓名不可超过20位"
)
private
String
empName
;
/**
...
...
@@ -61,6 +64,7 @@ public class TPaymentInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"员工编码"
)
@Schema
(
description
=
"员工编码"
)
@ExcelProperty
(
"员工编码"
)
@Size
(
max
=
32
,
message
=
"员工编码不可超过32位"
)
private
String
empNo
;
/**
...
...
@@ -77,6 +81,7 @@ public class TPaymentInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
@Size
(
max
=
32
,
message
=
"身份证号不可超过32位"
)
private
String
empIdcard
;
/**
...
...
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
0a3cdcf5
...
...
@@ -31,6 +31,9 @@ import javax.validation.constraints.NotNull;
import
javax.validation.constraints.Size
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Set
;
/**
* 预派单记录
...
...
@@ -118,7 +121,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 入职日期
*/
@Schema
(
description
=
"入职日期"
)
private
LocalDateTim
e
entryDate
;
private
Dat
e
entryDate
;
/**
* 正式工资
...
...
@@ -444,7 +447,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 离职日期
*/
@Schema
(
description
=
"离职日期"
)
private
LocalDateTim
e
leaveDate
;
private
Dat
e
leaveDate
;
/**
* 离职原因
...
...
@@ -662,4 +665,12 @@ public class TPreDispatchInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"创建截止时间"
)
@TableField
(
exist
=
false
)
private
LocalDateTime
createTimeEnd
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"选中的idList"
)
private
List
<
String
>
idList
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"导出的表头的Set"
)
private
Set
<
String
>
exportFields
;
}
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java
View file @
0a3cdcf5
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.social.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.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -19,7 +20,7 @@ public class TPreDispatchExportVo implements Serializable {
/**
* 0 派增 1 派减
*/
@ExcelAttribute
(
name
=
"派单类型"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"派单类型"
,
maxLength
=
2
,
isDataId
=
true
,
dataType
=
"send_order_type"
)
@Schema
(
description
=
"派单类型:0 派增 1 派减"
)
@ExcelProperty
(
"派单类型"
)
private
String
type
;
...
...
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchImportVo.java
0 → 100644
View file @
0a3cdcf5
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
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.util.LocalDateTimeUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
@Data
public
class
TPreDispatchImportVo
extends
RowIndex
implements
Serializable
{
/**
* 日期,格式:2020-12-25
*/
@ExcelAttribute
(
name
=
"日期"
)
@Schema
(
description
=
"日期,格式:2020-12-25"
)
@ExcelProperty
(
"日期,格式:2020-12-25"
)
private
String
date
;
/**
* 接单分公司
*/
@ExcelAttribute
(
name
=
"接单分公司"
)
@Schema
(
description
=
"接单分公司"
)
@ExcelProperty
(
"接单分公司"
)
@Size
(
max
=
50
,
message
=
"接单分公司不可超过50位"
)
private
String
company
;
/**
* 身份证号
*/
@ExcelAttribute
(
name
=
"身份证号"
,
isNotEmpty
=
true
,
errorInfo
=
"身份证号不能为空"
,
maxLength
=
20
,
isIdCard
=
true
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
@Size
(
max
=
20
,
message
=
"客户名称不可超过20位"
)
private
String
empIdcard
;
/**
* 客户名称
*/
@ExcelAttribute
(
name
=
"客户名称"
,
errorInfo
=
"客户名称不能为空"
,
maxLength
=
50
)
@Schema
(
description
=
"客户名称"
)
@ExcelProperty
(
"客户名称"
)
@Size
(
max
=
50
,
message
=
"客户名称不可超过50位"
)
private
String
customerName
;
/**
* 员工姓名
*/
@ExcelProperty
(
value
=
"员工姓名"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
needExport
=
true
)
private
String
empName
;
/**
* 联系电话1
*/
@ExcelProperty
(
value
=
"联系电话1"
)
@ExcelAttribute
(
name
=
"联系电话1"
,
needExport
=
true
)
private
String
telOne
;
/**
* 联系电话2
*/
@ExcelProperty
(
value
=
"联系电话2"
)
@ExcelAttribute
(
name
=
"联系电话2"
,
needExport
=
true
)
private
String
telTwo
;
/**
* 入职日期
*/
@ExcelProperty
(
value
=
"入职日期"
)
@ExcelAttribute
(
name
=
"入职日期"
,
needExport
=
true
)
private
LocalDate
entryDate
;
/**
* 正式工资
*/
@ExcelProperty
(
value
=
"正式工资"
)
@ExcelAttribute
(
name
=
"正式工资"
,
needExport
=
true
)
private
String
formalSalary
;
/**
* 派遣开始日期
*/
@ExcelProperty
(
value
=
"派遣开始日期"
)
@ExcelAttribute
(
name
=
"派遣开始日期"
,
needExport
=
true
)
private
String
dispatchStart
;
/**
* 派遣结束日期
*/
@ExcelProperty
(
value
=
"派遣结束日期"
)
@ExcelAttribute
(
name
=
"派遣结束日期"
,
needExport
=
true
)
private
String
dispatchEnd
;
/**
* 合同开始日期
*/
@ExcelProperty
(
value
=
"合同开始日期"
)
@ExcelAttribute
(
name
=
"合同开始日期"
,
needExport
=
true
)
private
String
contractStart
;
/**
* 合同终止日期
*/
@ExcelProperty
(
value
=
"合同终止日期"
)
@ExcelAttribute
(
name
=
"合同终止日期"
,
needExport
=
true
)
private
String
contractEnd
;
/**
* 试用开始日期
*/
@ExcelProperty
(
value
=
"试用开始日期"
)
@ExcelAttribute
(
name
=
"试用开始日期"
,
needExport
=
true
)
private
String
trialStart
;
/**
* 试用结束日期
*/
@ExcelProperty
(
value
=
"试用结束日期"
)
@ExcelAttribute
(
name
=
"试用结束日期"
,
needExport
=
true
)
private
String
trialEnd
;
/**
* 试用期工资
*/
@ExcelProperty
(
value
=
"试用期工资"
)
@ExcelAttribute
(
name
=
"试用期工资"
,
needExport
=
true
)
private
String
trialSalary
;
/**
* 工作制
*/
@ExcelProperty
(
value
=
"工作制"
)
@ExcelAttribute
(
name
=
"工作制"
,
needExport
=
true
)
private
String
workingSystem
;
/**
* 合同版本
*/
@ExcelProperty
(
value
=
"合同版本"
)
@ExcelAttribute
(
name
=
"合同版本"
,
needExport
=
true
)
private
String
contractVersion
;
/**
* 是否电话通知
*/
@ExcelProperty
(
value
=
"是否电话通知"
)
@ExcelAttribute
(
name
=
"是否电话通知"
,
needExport
=
true
)
private
String
telNotice
;
/**
* 实际工作地
*/
@ExcelProperty
(
value
=
"实际工作地"
)
@ExcelAttribute
(
name
=
"实际工作地"
,
needExport
=
true
)
private
String
workingAddress
;
/**
* 备注说明1
*/
@ExcelProperty
(
value
=
"备注说明1"
)
@ExcelAttribute
(
name
=
"备注说明1"
,
needExport
=
true
)
private
String
remarkOne
;
/**
* 备注说明2
*/
@ExcelProperty
(
value
=
"备注说明2"
)
@ExcelAttribute
(
name
=
"备注说明2"
,
needExport
=
true
)
private
String
remarkTwo
;
/**
* 养老城市
*/
@ExcelProperty
(
value
=
"养老城市"
)
@ExcelAttribute
(
name
=
"养老城市"
,
needExport
=
true
)
private
String
pensionAddress
;
/**
* 养老基数
*/
@ExcelProperty
(
value
=
"养老基数"
)
@ExcelAttribute
(
name
=
"养老基数"
,
needExport
=
true
)
private
BigDecimal
pensionBase
;
/**
* 养老起缴月
*/
@ExcelProperty
(
value
=
"养老起缴月"
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
needExport
=
true
)
private
String
pensionStart
;
/**
* 医疗城市
*/
@ExcelProperty
(
value
=
"医疗城市"
)
@ExcelAttribute
(
name
=
"医疗城市"
,
needExport
=
true
)
private
String
medicalAddress
;
/**
* 医疗基数
*/
@ExcelProperty
(
value
=
"医疗基数"
)
@ExcelAttribute
(
name
=
"医疗基数"
,
needExport
=
true
)
private
BigDecimal
medicalBase
;
/**
* 医疗起缴月
*/
@ExcelProperty
(
value
=
"医疗起缴月"
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
needExport
=
true
)
private
String
medicalStart
;
/**
* 工伤城市
*/
@ExcelProperty
(
value
=
"工伤城市"
)
@ExcelAttribute
(
name
=
"工伤城市"
,
needExport
=
true
)
private
String
injuryAddress
;
/**
* 工伤基数
*/
@ExcelProperty
(
value
=
"工伤基数"
)
@ExcelAttribute
(
name
=
"工伤基数"
,
needExport
=
true
)
private
BigDecimal
injuryBase
;
/**
* 工伤起缴月
*/
@ExcelProperty
(
value
=
"工伤起缴月"
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
needExport
=
true
)
private
String
injuryStart
;
/**
* 生育城市
*/
@ExcelProperty
(
value
=
"生育城市"
)
@ExcelAttribute
(
name
=
"生育城市"
,
needExport
=
true
)
private
String
birthAddress
;
/**
* 生育基数
*/
@ExcelProperty
(
value
=
"生育基数"
)
@ExcelAttribute
(
name
=
"生育基数"
,
needExport
=
true
)
private
BigDecimal
birthBase
;
/**
* 生育起缴月
*/
@ExcelProperty
(
value
=
"生育起缴月"
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
needExport
=
true
)
private
String
birthStart
;
/**
* 失业城市
*/
@ExcelProperty
(
value
=
"失业城市"
)
@ExcelAttribute
(
name
=
"失业城市"
,
needExport
=
true
)
private
String
unemploymentAddress
;
/**
* 失业基数
*/
@ExcelProperty
(
value
=
"失业基数"
)
@ExcelAttribute
(
name
=
"失业基数"
,
needExport
=
true
)
private
BigDecimal
unemploymentBase
;
/**
* 失业起缴月
*/
@ExcelProperty
(
value
=
"失业起缴月"
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
needExport
=
true
)
private
String
unemploymentStart
;
/**
* 公积金城市
*/
@ExcelProperty
(
value
=
"公积金城市"
)
@ExcelAttribute
(
name
=
"公积金城市"
,
needExport
=
true
)
private
String
fundAddress
;
/**
* 公积金基数
*/
@ExcelProperty
(
value
=
"公积金基数"
)
@ExcelAttribute
(
name
=
"公积金基数"
,
needExport
=
true
)
private
BigDecimal
fundBase
;
/**
* 公积金起缴月
*/
@ExcelProperty
(
value
=
"公积金起缴月"
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
needExport
=
true
)
private
String
fundStart
;
/**
* 公积金个人比例
*/
@ExcelProperty
(
value
=
"公积金个人比例"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
needExport
=
true
)
private
BigDecimal
fundPersonalPer
;
/**
* 公积金企业比例
*/
@ExcelProperty
(
value
=
"公积金企业比例"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
needExport
=
true
)
private
BigDecimal
fundCompanyPer
;
/**
* 派单分公司
*/
@ExcelProperty
(
value
=
"派单分公司"
)
@ExcelAttribute
(
name
=
"派单分公司"
,
needExport
=
true
)
private
String
dispatchCompany
;
/**
* 派单客服
*/
@ExcelProperty
(
value
=
"派单客服"
)
@ExcelAttribute
(
name
=
"派单客服"
,
needExport
=
true
)
private
String
customerService
;
/**
* contract
*/
@ExcelProperty
(
value
=
"小合同名称"
)
@ExcelAttribute
(
name
=
"小合同名称"
,
needExport
=
true
)
private
String
contractMinorName
;
/**
* 唯一号
*/
@ExcelProperty
(
value
=
"唯一号"
)
@ExcelAttribute
(
name
=
"唯一号"
,
needExport
=
true
)
private
String
uniqueNumber
;
/**
* 客户编号
*/
@ExcelProperty
(
value
=
"客户编号"
)
@ExcelAttribute
(
name
=
"客户编号"
,
needExport
=
true
)
private
String
customerNumber
;
/**
* 合同类型
*/
@ExcelProperty
(
value
=
"合同类型"
)
@ExcelAttribute
(
name
=
"合同类型"
,
needExport
=
true
)
private
String
contractType
;
}
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
0 → 100644
View file @
0a3cdcf5
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @
0a3cdcf5
...
...
@@ -20,16 +20,21 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDict
;
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.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
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.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchUpdateVo
;
import
lombok.extern.slf4j.Slf4j
;
import
org.ehcache.impl.internal.util.ServiceUtil
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.security.SecurityRequirement
;
...
...
@@ -38,9 +43,13 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
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
;
/**
...
...
@@ -54,6 +63,7 @@ import java.util.List;
@RequestMapping
(
"/tpredispatchinfo"
)
@Tag
(
name
=
"预派单记录管理"
)
@SecurityRequirement
(
name
=
HttpHeaders
.
AUTHORIZATION
)
@Slf4j
public
class
TPreDispatchInfoController
{
private
final
TPreDispatchInfoService
tPreDispatchInfoService
;
...
...
@@ -194,15 +204,26 @@ public class TPreDispatchInfoController {
return
tPreDispatchInfoService
.
dispatchById
(
id
);
}
/**
* 一键派单
* @Author huyc
* @Date 2022-07-18
* @return R
*/
@Operation
(
summary
=
"一键派单:按创建人查找正常未派单的数据"
,
description
=
"一键派单:按创建人查找正常未派单的数据"
)
@PostMapping
(
"/oneKeyToDispatch"
)
public
R
oneKeyToDispatch
(
@RequestParam
String
idStr
)
{
return
tPreDispatchInfoService
.
oneKeyToDispatch
(
idStr
);
}
/**
* 预派单批量新增派增
*
* @Author huyc
* @Date 2022-07-18
* @param jsonString
* @param houseId 社保户ID
* @param departId 结算主体ID
* @return
* @Author fxj
* @Date 2019-09-29
**/
@Operation
(
summary
=
"预派单批量新增派增"
,
description
=
"预派单批量新增派增"
)
@SysLog
(
"预派单批量新增派增"
)
...
...
@@ -229,12 +250,131 @@ public class TPreDispatchInfoController {
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchSavePreDisPatchAdd
(
listInfo
,
user
,
houseId
,
departId
);
}
else
{
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
errorInfo
.
add
(
new
ErrorMessage
(
null
,
CommonConstants
.
DATA_CAN_NOT_EMPTY
)
);
}
return
R
.
ok
(
errorInfo
,
""
);
return
R
.
ok
(
errorInfo
);
}
}
catch
(
Exception
e
)
{
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
}
}
/**
* 预派单批量新增派减
* @Author huyc
* @Date 2022-07-18
* @param jsonString
* @return
**/
@Operation
(
summary
=
"预派单批量新增派减"
,
description
=
"预派单批量新增派减"
)
@SysLog
(
"预派单批量新增派减"
)
@PostMapping
(
"/analysisJsonStringImportReduce"
)
@PreAuthorize
(
"@pms.hasPermission('social:tpredispatchinfo_importReduceList')"
)
public
R
analysisJsonStringImportReduce
(
@RequestBody
String
jsonString
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
ExcelUtil
<
TPreDispatchInfo
>
util1
=
null
;
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchInfo
.
class
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
List
<
TPreDispatchInfo
>
listInfo
=
util1
.
getEntityList
();
//用于返回错误信息
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
));
}
return
R
.
ok
(
errorInfo
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"预派单批量导入派减"
,
e
);
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
}
}
/**
* 预派单批量更新
* @param jsonString
* @Author huyc
* @Date 2022-07-18
* @return
**/
@Operation
(
summary
=
"预派单批量更新"
,
description
=
"预派单批量更新"
)
@SysLog
(
"预派单批量更新"
)
@PostMapping
(
"/analysisJsonStringUpdate"
)
@PreAuthorize
(
"@pms.hasPermission('social:tpredispatchinfo_updateList')"
)
public
R
analysisJsonStringUpdate
(
@RequestBody
String
jsonString
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
ExcelUtil
<
TPreDispatchUpdateVo
>
util1
=
null
;
R
<
List
<
SysDict
>>
res
=
null
;
Map
<
String
,
String
>
dicMap
=
new
HashMap
<>();
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchUpdateVo
.
class
);
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
()
.
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"status_flag"
);
if
(
Common
.
isNotNull
(
dicObj
))
{
for
(
String
key
:
dicObj
.
keySet
())
{
dicMap
.
put
(
"status_flag"
+
CommonConstants
.
DOWN_LINE_STRING
+
dicObj
.
get
(
key
),
key
);
}
}
util1
.
getJsonStringToList
(
jsonString
,
dicMap
);
List
<
TPreDispatchUpdateVo
>
listInfo
=
util1
.
getEntityList
();
//用于返回错误信息
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
));
}
return
R
.
ok
(
errorInfo
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"预派单批量更新"
,
e
);
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
}
}
/**
* 预派单查询导出数据的中文字段
* @Author huyc
* @Date 2022-07-18
* @return
**/
@Operation
(
summary
=
"预派单查询导出数据的中文字段"
,
description
=
"预派单查询导出数据的中文字段"
)
@GetMapping
(
"/getPreDispatchExportVoFieldName"
)
public
R
<
List
<
String
>>
getPreDispatchExportVoFieldName
()
{
return
ExcelUtil
.
getExportfieldsName
(
TPreDispatchExportVo
.
class
);
}
/**
* 导出预派单
* @Author huyc
* @Date 2022-07-18
* @param preDispatchInfo
* @return
**/
@PostMapping
(
"/doexportPreDispatch"
)
@Operation
(
summary
=
"导出预派单"
,
description
=
"导出预派单"
)
@SysLog
(
"导出预派单"
)
@PreAuthorize
(
"@pms.hasPermission('social:tpredispatchinfo_doexportPreDispatch')"
)
public
void
doexportPreDispatch
(
HttpServletResponse
response
,
@RequestBody
(
required
=
false
)
TPreDispatchInfo
preDispatchInfo
)
{
tPreDispatchInfoService
.
doexportPreDispatch
(
response
,
preDispatchInfo
);
}
}
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPreDispatchInfoMapper.java
View file @
0a3cdcf5
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchExportVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -46,4 +47,8 @@ public interface TPreDispatchInfoMapper extends BaseMapper<TPreDispatchInfo> {
void
modifyDataSubmitStatus
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"status"
)
String
status
);
int
updatePreDispatchInfoById
(
TPreDispatchInfo
tPreDispatchInfo
);
void
updatePreStatusById
(
TPreDispatchInfo
preInfo
);
List
<
TPreDispatchExportVo
>
getListForExport
(
@Param
(
"tPreDispatchInfo"
)
TPreDispatchInfo
tPreDispatchInfo
);
}
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPreDispatchInfoService.java
View file @
0a3cdcf5
...
...
@@ -24,7 +24,9 @@ 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.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchUpdateVo
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
...
...
@@ -80,6 +82,14 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
**/
R
<
Boolean
>
dispatchById
(
String
id
);
/**
* 一键派单
* @Author huyc
* @Date 2022-07-18
* @return
**/
R
oneKeyToDispatch
(
String
idStr
);
/**
* 修改预派单记录
* @Author huyc
...
...
@@ -99,4 +109,34 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @return
**/
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
houseId
,
String
departId
);
/**
* 预派单批量新增派减
* @Author huyc
* @Date 2022-07-18
* @param listInfo
* @param user
* @return
**/
List
<
ErrorMessage
>
batchSavePreDisPatchReduce
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
);
/**
* 预派单批量更新
* @Author huyc
* @Date 2022-07-18
* @param listInfo
* @param user
* @return
**/
List
<
ErrorMessage
>
batchUpdatePreDisPatch
(
List
<
TPreDispatchUpdateVo
>
listInfo
,
YifuUser
user
);
/**
* 预派单导出
* @Author huyc
* @Date 2022-07-18
* @param response
* @param tPreDispatchInfo
* @return
**/
void
doexportPreDispatch
(
HttpServletResponse
response
,
TPreDispatchInfo
tPreDispatchInfo
);
}
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 @
0a3cdcf5
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
View file @
0a3cdcf5
...
...
@@ -233,6 +233,13 @@
</sql>
<sql
id=
"tPreDispatchInfo_where"
>
<if
test=
"tPreDispatchInfo != null"
>
<if
test=
"tPreDispatchInfo.idList != null"
>
AND a.id in
<foreach
item=
"idStr"
index=
"index"
collection=
"tPreDispatchInfo.idList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</if>
<if
test=
"tPreDispatchInfo.idList == null"
>
<if
test=
"tPreDispatchInfo.id != null and tPreDispatchInfo.id.trim() != ''"
>
AND a.ID = #{tPreDispatchInfo.id}
</if>
...
...
@@ -543,6 +550,7 @@
AND a.UPDATE_TIME = #{tPreDispatchInfo.updateTime}
</if>
</if>
</if>
</sql>
<!--tPreDispatchInfo简单分页查询-->
<select
id=
"getTPreDispatchInfoPage"
resultMap=
"tPreDispatchInfoMap"
>
...
...
This diff is collapsed.
Click to expand it.
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