Commit e51416ee authored by fangxinjiang's avatar fangxinjiang

工资兼容订单接口

parent 79d0d75f
...@@ -47,7 +47,7 @@ public class SalaryUploadController { ...@@ -47,7 +47,7 @@ public class SalaryUploadController {
@SysLog("上传薪资表") @SysLog("上传薪资表")
@PostMapping("/upload") @PostMapping("/upload")
public R upload(@RequestBody String jsonString, @RequestParam String settleDepart, @RequestParam(required = false) String configId 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); return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType,orderId);
} }
...@@ -61,7 +61,7 @@ public class SalaryUploadController { ...@@ -61,7 +61,7 @@ public class SalaryUploadController {
@Operation(description = "保存并提交") @Operation(description = "保存并提交")
@SysLog("保存并提交薪资表") @SysLog("保存并提交薪资表")
@PostMapping("/saveAndSubmit") @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); return salaryUploadService.saveAndSubmit(savList,orderId);
} }
......
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
a.REASON_TYPE, a.REASON_TYPE,
a.CREATE_BY, a.CREATE_BY,
a.CREATE_NAME a.CREATE_NAME
,a.CREATE_NAME,
a.CREATE_TIME
</sql> </sql>
<sql id="sysMessageSalary_where"> <sql id="sysMessageSalary_where">
<if test="sysMessageSalary != null"> <if test="sysMessageSalary != null">
...@@ -127,6 +129,7 @@ ...@@ -127,6 +129,7 @@
<where> <where>
<include refid="sysMessageSalarySql"/> <include refid="sysMessageSalarySql"/>
<include refid="sysMessageSalary_where"/> <include refid="sysMessageSalary_where"/>
order by a.CREATE_TIME desc
</where> </where>
</select> </select>
...@@ -181,7 +184,9 @@ ...@@ -181,7 +184,9 @@
DEPT_ID as DEPART_ID, DEPT_ID as DEPART_ID,
DEPT_NAME as DEPART_NAME, DEPT_NAME as DEPART_NAME,
DEPT_NO as DEPART_NO, DEPT_NO as DEPART_NO,
0 as TYPE 0 as TYPE,
CREATE_NAME,
CREATE_TIME
FROM FROM
( (
SELECT SELECT
...@@ -197,6 +202,8 @@ ...@@ -197,6 +202,8 @@
sum(i.SALARY_MONEY) AS actual_salary, sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary, sum(l.SALARY_MONEY) AS relay_Salary,
s.CREATE_BY AS CREATE_BY, 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, min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
a.PROVINCE, a.PROVINCE,
a.CITY, a.CITY,
......
...@@ -224,7 +224,7 @@ public class TDispatchInfoController { ...@@ -224,7 +224,7 @@ public class TDispatchInfoController {
@SysLog("批量新增派单信息记录表") @SysLog("批量新增派单信息记录表")
@PostMapping("/importListAdd") @PostMapping("/importListAdd")
//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-import')") //@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); return tDispatchInfoService.importDiy(file.getInputStream(),orderId);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment