This commit is contained in:
Binary file not shown.
@@ -70,7 +70,7 @@ public class ApplyClockInController {
|
|||||||
* @param applyAttendanceChangeDto 表单对象
|
* @param applyAttendanceChangeDto 表单对象
|
||||||
* @return java.lang.Object
|
* @return java.lang.Object
|
||||||
*/
|
*/
|
||||||
@GetMapping("/clockIn")
|
@PostMapping("/clockIn")
|
||||||
public Object create(@RequestBody @Valid ApplyAttendanceChangeDto applyAttendanceChangeDto) {
|
public Object create(@RequestBody @Valid ApplyAttendanceChangeDto applyAttendanceChangeDto) {
|
||||||
|
|
||||||
log.error("出勤变更发起 -> {}", JSONUtil.toJsonStr(applyAttendanceChangeDto));
|
log.error("出勤变更发起 -> {}", JSONUtil.toJsonStr(applyAttendanceChangeDto));
|
||||||
@@ -101,7 +101,7 @@ public class ApplyClockInController {
|
|||||||
* @param id 主键
|
* @param id 主键
|
||||||
* @return java.lang.Object
|
* @return java.lang.Object
|
||||||
*/
|
*/
|
||||||
@PutMapping("/clockIn/{id}")
|
@PostMapping("/clockIn/{id}")
|
||||||
public Object update(@RequestBody @Valid ApplyAttendanceChangeDto applyAttendanceChangeDto, @PathVariable("id") String id) throws Exception {
|
public Object update(@RequestBody @Valid ApplyAttendanceChangeDto applyAttendanceChangeDto, @PathVariable("id") String id) throws Exception {
|
||||||
|
|
||||||
ApplyAttendanceChange entity = JsonUtil.getJsonToBean(applyAttendanceChangeDto, ApplyAttendanceChange.class);
|
ApplyAttendanceChange entity = JsonUtil.getJsonToBean(applyAttendanceChangeDto, ApplyAttendanceChange.class);
|
||||||
@@ -119,7 +119,7 @@ public class ApplyClockInController {
|
|||||||
* @param id 审批id
|
* @param id 审批id
|
||||||
* @return jnpf.base.ActionResult<jnpf.model.workflow.vo.ApplyAttendanceChangeVo>
|
* @return jnpf.base.ActionResult<jnpf.model.workflow.vo.ApplyAttendanceChangeVo>
|
||||||
*/
|
*/
|
||||||
@GetMapping(value = "/repair/{id}")
|
@DeleteMapping(value = "/repair/{id}")
|
||||||
public ActionResult<ApplyAttendanceRepairVo> getApplyAttendanceRepair(@PathVariable(value = "id") String id) {
|
public ActionResult<ApplyAttendanceRepairVo> getApplyAttendanceRepair(@PathVariable(value = "id") String id) {
|
||||||
|
|
||||||
ApplyAttendanceRepairVo vo = applyAttendanceRepairService.getApplyAttendanceRepair(id);
|
ApplyAttendanceRepairVo vo = applyAttendanceRepairService.getApplyAttendanceRepair(id);
|
||||||
@@ -131,7 +131,7 @@ public class ApplyClockInController {
|
|||||||
* @param applyAttendanceRepairDto 表单对象
|
* @param applyAttendanceRepairDto 表单对象
|
||||||
* @return java.lang.Object
|
* @return java.lang.Object
|
||||||
*/
|
*/
|
||||||
@PostMapping("/repair")
|
@GetMapping("/repair")
|
||||||
public ActionResult<Void> create(@RequestBody @Valid ApplyAttendanceRepairDto applyAttendanceRepairDto) {
|
public ActionResult<Void> create(@RequestBody @Valid ApplyAttendanceRepairDto applyAttendanceRepairDto) {
|
||||||
|
|
||||||
ApplyAttendanceRepair entity = JsonUtil.getJsonToBean(applyAttendanceRepairDto, ApplyAttendanceRepair.class);
|
ApplyAttendanceRepair entity = JsonUtil.getJsonToBean(applyAttendanceRepairDto, ApplyAttendanceRepair.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user