|
@@ -95,11 +95,12 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
|
|
etlKuaishouVideoInfo.setChannelName("素造");
|
|
etlKuaishouVideoInfo.setChannelName("素造");
|
|
}
|
|
}
|
|
//查询相关设计人员信息
|
|
//查询相关设计人员信息
|
|
|
|
+
|
|
String clipId = null;
|
|
String clipId = null;
|
|
JSONObject ascription = ascriptionService.getDetailByCode(signature);
|
|
JSONObject ascription = ascriptionService.getDetailByCode(signature);
|
|
if (null != ascription) {
|
|
if (null != ascription) {
|
|
- clipId = ascription.getString("clipId");
|
|
|
|
- if (null != clipId && !"".equals(clipId.trim())) {
|
|
|
|
|
|
+
|
|
|
|
+ /*if (null != clipId && !"".equals(clipId.trim())) {
|
|
etlKuaishouVideoInfo.setClipId(clipId);
|
|
etlKuaishouVideoInfo.setClipId(clipId);
|
|
//根据id查询剪辑所属的设计负责人
|
|
//根据id查询剪辑所属的设计负责人
|
|
SysUser user = sysUserService.getById(clipId);
|
|
SysUser user = sysUserService.getById(clipId);
|
|
@@ -113,6 +114,10 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
|
|
etlKuaishouVideoInfo.setDesignTeamLeaderName(user.getLeaderName());
|
|
etlKuaishouVideoInfo.setDesignTeamLeaderName(user.getLeaderName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ }*/
|
|
|
|
+ clipId = ascription.getString("clipId");
|
|
|
|
+ if (!Check.isNull(clipId)) {
|
|
|
|
+ etlKuaishouVideoInfo.setClipId(clipId);
|
|
}
|
|
}
|
|
String clipName = ascription.getString("clipName");
|
|
String clipName = ascription.getString("clipName");
|
|
if (null != clipName && !"".equals(clipName.trim())) {
|
|
if (null != clipName && !"".equals(clipName.trim())) {
|
|
@@ -134,7 +139,26 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
|
|
if (null != shotName && !"".equals(shotName.trim())) {
|
|
if (null != shotName && !"".equals(shotName.trim())) {
|
|
etlKuaishouVideoInfo.setShotName(shotName);
|
|
etlKuaishouVideoInfo.setShotName(shotName);
|
|
}
|
|
}
|
|
|
|
+ String leaderId = ascription.getString("leaderId");
|
|
|
|
+ String leaderName = ascription.getString("leaderName");
|
|
|
|
+ if (!Check.isNull(leaderId) && !Check.isNull(leaderName)) {
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderId(leaderId);
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderName(leaderName);
|
|
|
|
+ } else {
|
|
|
|
+ SysUser user = sysUserService.getById(clipId);
|
|
|
|
+ if (null != user) {
|
|
|
|
+ String roleCode = sysUserService.getRoleCodeByUserId(user.getId());
|
|
|
|
+ if (null != roleCode && "designTeamLeader".equals(roleCode.trim())) {
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderId(user.getId());
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderName(user.getRealname());
|
|
|
|
+ } else {
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderId(user.getLeaderId());
|
|
|
|
+ etlKuaishouVideoInfo.setDesignTeamLeaderName(user.getLeaderName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
if (Check.isNull(clipId)) {
|
|
if (Check.isNull(clipId)) {
|
|
Long accountId = videoJson.getLong("accountId");
|
|
Long accountId = videoJson.getLong("accountId");
|
|
if (!Check.isNull(accountId)) {
|
|
if (!Check.isNull(accountId)) {
|