|
@@ -651,6 +651,25 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 项目同步
|
|
|
+ *
|
|
|
+ * @param projectId
|
|
|
+ * @param toProjectIds
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public void materialSync(Long projectId, JSONArray toProjectIds) {
|
|
|
+ for (int i = 0; i < toProjectIds.size(); i++) {
|
|
|
+ Long toProjectId = toProjectIds.getLong(i);
|
|
|
+ Project project = projectService.getById(toProjectId);
|
|
|
+ if (Check.isNull(project)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ materialInfoMapper.materialSync(projectId, toProjectId, project.getProductId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 素材库关联上传素材 1
|
|
|
*
|
|
|
* @param json
|
|
@@ -950,7 +969,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> getListByParams(String tagCode, String type, Integer status, String materialName, List<Long> projectIds, String code, String startDate, String endDate, String userId, String clipId, String shotId, String planId, String leaderName, Integer offlineFlag, Integer pageNo, Integer pageSize, Integer syncKuaishou, Integer syncBytedance,Integer materialInnovate) {
|
|
|
+ public Map<String, Object> getListByParams(String tagCode, String type, Integer status, String materialName, List<Long> projectIds, String code, String startDate, String endDate, String userId, String clipId, String shotId, String planId, String leaderName, Integer offlineFlag, Integer pageNo, Integer pageSize, Integer syncKuaishou, Integer syncBytedance, Integer materialInnovate) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
|
String ascription = null;
|
|
@@ -964,7 +983,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
if (!Check.isNull(endDate)) {
|
|
|
endDate = endDate + " 23:59:59";
|
|
|
}
|
|
|
- List<MaterialInfo> dailyList = materialInfoMapper.getListByParams(tagCode, type, status, materialName, code, startDate, endDate, userId, projectIds, ascription, clipId, shotId, planId, leaderName, offlineFlag, syncKuaishou, syncBytedance,materialInnovate);
|
|
|
+ List<MaterialInfo> dailyList = materialInfoMapper.getListByParams(tagCode, type, status, materialName, code, startDate, endDate, userId, projectIds, ascription, clipId, shotId, planId, leaderName, offlineFlag, syncKuaishou, syncBytedance, materialInnovate);
|
|
|
List<MaterialInfo> setList = new ArrayList<>();
|
|
|
PageInfo<MaterialInfo> pageInfo = new PageInfo<>(dailyList);
|
|
|
if (!dailyList.isEmpty()) {
|