fix:DM页面手动同步利元亨用户
This commit is contained in:
@@ -49,6 +49,7 @@ import org.apache.commons.collections4.CollectionUtils;
|
|||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
@@ -91,10 +92,12 @@ public class SpdmFlowController {
|
|||||||
@Operation(summary = "流程结束评审状态通知SPDM")
|
@Operation(summary = "流程结束评审状态通知SPDM")
|
||||||
@PostMapping(value = "/flowEndStatusNotice")
|
@PostMapping(value = "/flowEndStatusNotice")
|
||||||
public void flowEndStatusNotice(@RequestBody Map<String,Object> approveResultDto) {
|
public void flowEndStatusNotice(@RequestBody Map<String,Object> approveResultDto) {
|
||||||
|
CompletableFuture.runAsync(() -> {
|
||||||
R result = spdmServiceFeignClient.approveStatusNotice(ApproveResultDto.builder()
|
R result = spdmServiceFeignClient.approveStatusNotice(ApproveResultDto.builder()
|
||||||
.approveStatus(SpdmApproveStatusEnum.getSpdmStatus((Integer) approveResultDto.get("approveStatus")))
|
.approveStatus(SpdmApproveStatusEnum.getSpdmStatus((Integer) approveResultDto.get("approveStatus")))
|
||||||
.cidFlowId((String) approveResultDto.get("cidFlowId")).build());
|
.cidFlowId((String) approveResultDto.get("cidFlowId")).build());
|
||||||
log.info("[flowEndStatusNotice] param:{}, result:{}", JSONUtil.toJsonStr(approveResultDto), JSONUtil.toJsonStr(result));
|
log.info("[flowEndStatusNotice] param:{}, result:{}", JSONUtil.toJsonStr(approveResultDto), JSONUtil.toJsonStr(result));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "根据组名查询组内流程模板")
|
@Operation(summary = "根据组名查询组内流程模板")
|
||||||
|
|||||||
@@ -106,5 +106,12 @@ public class SpdmTenantController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "同步利元亨用户" , description = "同步利元亨用户" )
|
||||||
|
@GetMapping("/allSyncLyricUsers" )
|
||||||
|
public ResponseR allSyncLyricUsers() {
|
||||||
|
remoteTenantServiceFeign.allSyncLyricUsers(new ArrayList<>());
|
||||||
|
return ResponseR.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import com.honeycombis.honeycom.tenant.entity.SysStaffEntity;
|
|||||||
import com.honeycombis.honeycom.tenant.vo.SysDeptVO;
|
import com.honeycombis.honeycom.tenant.vo.SysDeptVO;
|
||||||
import com.honeycombis.honeycom.tenant.vo.SysRoleVO;
|
import com.honeycombis.honeycom.tenant.vo.SysRoleVO;
|
||||||
import com.honeycombis.honeycom.tenant.vo.SysStaffVO;
|
import com.honeycombis.honeycom.tenant.vo.SysStaffVO;
|
||||||
|
import com.honeycombis.honeycom.tenant.vo.lyric.LyricUserDto;
|
||||||
import com.honeycombis.honeycom.tenant.vo.tenant.SysTenantVO;
|
import com.honeycombis.honeycom.tenant.vo.tenant.SysTenantVO;
|
||||||
import com.honeycombis.honeycom.tenant.vo.tenant.TenantVO;
|
import com.honeycombis.honeycom.tenant.vo.tenant.TenantVO;
|
||||||
import com.honeycombis.honeycom.tenant.vo.tenant.TenantViewVO;
|
import com.honeycombis.honeycom.tenant.vo.tenant.TenantViewVO;
|
||||||
@@ -60,4 +61,7 @@ public interface RemoteTenantServiceFeign {
|
|||||||
@GetMapping("/sysTenant/getAll" )
|
@GetMapping("/sysTenant/getAll" )
|
||||||
R<List<TenantVO>> getAll();
|
R<List<TenantVO>> getAll();
|
||||||
|
|
||||||
|
@PostMapping("/hrSync/allSyncLyricUsers" )
|
||||||
|
R<Boolean> allSyncLyricUsers(@RequestBody List<LyricUserDto> userDtoList);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user