From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
index c558ea3..64b980f 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
@@ -49,8 +49,9 @@
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��")
@PostMapping("/collectWorkingHours")
- public Result collectWorkingHours(){
- return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours());
+ public Result collectWorkingHours(@RequestBody Map<String, Object> data)throws Exception{
+ AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);
+ return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours(entity));
}
--
Gitblit v1.9.3