Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
e51416ee
You need to sign in or sign up before continuing.
Commit
e51416ee
authored
Aug 31, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工资兼容订单接口
parent
79d0d75f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
27 deletions
+34
-27
SalaryUploadController.java
...lus/v1/yifu/salary/controller/SalaryUploadController.java
+2
-2
SysMessageSalaryMapper.xml
...-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
+31
-24
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SalaryUploadController.java
View file @
e51416ee
...
...
@@ -47,7 +47,7 @@ public class SalaryUploadController {
@SysLog
(
"上传薪资表"
)
@PostMapping
(
"/upload"
)
public
R
upload
(
@RequestBody
String
jsonString
,
@RequestParam
String
settleDepart
,
@RequestParam
(
required
=
false
)
String
configId
,
@RequestParam
String
salaryType
,
@RequestParam
String
orderId
)
{
,
@RequestParam
String
salaryType
,
@RequestParam
(
required
=
false
)
String
orderId
)
{
return
salaryUploadService
.
salaryUpload
(
jsonString
,
settleDepart
,
configId
,
salaryType
,
orderId
);
}
...
...
@@ -61,7 +61,7 @@ public class SalaryUploadController {
@Operation
(
description
=
"保存并提交"
)
@SysLog
(
"保存并提交薪资表"
)
@PostMapping
(
"/saveAndSubmit"
)
public
R
saveAndSubmit
(
@RequestBody
List
<
TSalaryAccountVo
>
savList
,
String
orderId
)
{
public
R
saveAndSubmit
(
@RequestBody
List
<
TSalaryAccountVo
>
savList
,
@RequestParam
(
required
=
false
)
String
orderId
)
{
return
salaryUploadService
.
saveAndSubmit
(
savList
,
orderId
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @
e51416ee
...
...
@@ -36,29 +36,31 @@
<result
property=
"customerName"
column=
"CUSTOMER_NAME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
a.actual_salary,
a.relay_salary,
a.salary_base,
a.salary_month,
a.settle_month,
a.employee_id,
a.employee_name,
a.employee_idnum,
a.salary_make_man,
a.province,
a.city,
a.town,
a.DEPART_ID,
a.DEPART_NAME,
a.DEPART_NO,
a.type,
a.FEED_BACK,
a.CUSTOMER_NAME,
a.CUSTOMER_ID,
a.REASON_TYPE,
a.CREATE_BY,
a.CREATE_NAME
a.id,
a.actual_salary,
a.relay_salary,
a.salary_base,
a.salary_month,
a.settle_month,
a.employee_id,
a.employee_name,
a.employee_idnum,
a.salary_make_man,
a.province,
a.city,
a.town,
a.DEPART_ID,
a.DEPART_NAME,
a.DEPART_NO,
a.type,
a.FEED_BACK,
a.CUSTOMER_NAME,
a.CUSTOMER_ID,
a.REASON_TYPE,
a.CREATE_BY,
a.CREATE_NAME
,a.CREATE_NAME,
a.CREATE_TIME
</sql>
<sql
id=
"sysMessageSalary_where"
>
<if
test=
"sysMessageSalary != null"
>
...
...
@@ -127,6 +129,7 @@
<where>
<include
refid=
"sysMessageSalarySql"
/>
<include
refid=
"sysMessageSalary_where"
/>
order by a.CREATE_TIME desc
</where>
</select>
...
...
@@ -181,7 +184,9 @@
DEPT_ID as DEPART_ID,
DEPT_NAME as DEPART_NAME,
DEPT_NO as DEPART_NO,
0 as TYPE
0 as TYPE,
CREATE_NAME,
CREATE_TIME
FROM
(
SELECT
...
...
@@ -197,6 +202,8 @@
sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary,
s.CREATE_BY AS CREATE_BY,
s.CREATE_NAME AS CREATE_NAME,
s.CREATE_TIME AS CREATE_TIME,
min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
a.PROVINCE,
a.CITY,
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
e51416ee
...
...
@@ -224,7 +224,7 @@ public class TDispatchInfoController {
@SysLog
(
"批量新增派单信息记录表"
)
@PostMapping
(
"/importListAdd"
)
//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-import')")
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
String
orderId
){
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
@RequestParam
(
required
=
false
)
String
orderId
){
return
tDispatchInfoService
.
importDiy
(
file
.
getInputStream
(),
orderId
);
}
...
...
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