Commit 8c53c08d by huluobin

冲送info

parent 35d44f5e
......@@ -55,5 +55,5 @@ public interface TakeLeaveEventCmdService {
*
* @param takeLeaveEventId
*/
void adminRefuseTakeLeaveEvent(Integer takeLeaveEventId);
void adminRefuseTakeLeaveEvent(Long takeLeaveEventId);
}
......@@ -260,9 +260,11 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
}
@Override
public void adminRefuseTakeLeaveEvent(Integer takeLeaveEventId) {
public void adminRefuseTakeLeaveEvent(Long takeLeaveEventId) {
TakeLeaveEvent takeLeaveEvent = takeLeaveEventRepository.selectById(takeLeaveEventId);
takeLeaveEvent
//如果是通过的加班申请被驳回
if (takeLeaveEvent.getType().equals(TakeLeaveEvent.TYPE_OVER_TIME) &&
takeLeaveEvent.getStatus().equals(TakeLeaveEvent.STATUS_APPROVAL_PASS)) {
......
......@@ -37,4 +37,6 @@ public class DiscountConfig implements Serializable {
@ApiModelProperty("免单券id(充送免单券)")
private Integer couponId;
private String info;
}
......@@ -79,7 +79,7 @@ public class TakeLeaveEventController {
@ApiOperation("/总后台审批请假")
@PostMapping("/admin/takeLeave/adminRefuseTakeLeaveEvent/{takeLeaveEventId}")
public JsonResult<Void> adminRefuseTakeLeaveEvent(@PathVariable Integer takeLeaveEventId) {
public JsonResult<Void> adminRefuseTakeLeaveEvent(@PathVariable Long takeLeaveEventId) {
takeLeaveEventCmdService.adminRefuseTakeLeaveEvent(takeLeaveEventId);
return JsonResult.success();
}
......
package com.gogirl.application.store.store.impl;
import com.gogirl.application.store.store.TakeLeaveEventCmdService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/10/23 2:54 下午
*/
@RunWith(SpringRunner.class)
@SpringBootTest
@Slf4j
@ActiveProfiles("prod")
public class TakeLeaveEventCmdServiceImplTest {
@Resource
TakeLeaveEventCmdService takeLeaveEventCmdService;
@Test
public void adminRefuseTakeLeaveEvent() {
takeLeaveEventCmdService.adminRefuseTakeLeaveEvent(1241694148554134617L);
}
}
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