|
@@ -315,7 +315,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- getFile(info);
|
|
|
+ getFile(info);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -531,12 +531,12 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
info.setUpdateTime(new Date());
|
|
|
info.setType(type);
|
|
|
//TODO 此处逻辑待调整
|
|
|
-// Project project = projectService.getById(projectId);
|
|
|
-// if (!Check.isNull(project)) {
|
|
|
-// if (!Check.isNull(project.getSupplierCode())) {
|
|
|
-// info.setSupplierCode(project.getSupplierCode());
|
|
|
-// }
|
|
|
-// }
|
|
|
+ // Project project = projectService.getById(projectId);
|
|
|
+ if (!Check.isNull(project)) {
|
|
|
+ if (!Check.isNull(project.getSupplierCode())) {
|
|
|
+ info.setSupplierCode(project.getSupplierCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
MaterialCutFrame cutFrame = materialCutFrameService.getCutFrameByCode(code);
|
|
|
if (Check.isNull(cutFrame)) {
|
|
|
String videoUrl = URLDecoder.decode(info.getUrl()).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
|