|
@@ -3,10 +3,7 @@ package cn.com.ctop.common.module.service.impl;
|
|
import cn.com.ctop.common.module.constant.CosConstant;
|
|
import cn.com.ctop.common.module.constant.CosConstant;
|
|
import cn.com.ctop.common.module.entity.*;
|
|
import cn.com.ctop.common.module.entity.*;
|
|
import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
|
|
import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
|
|
-import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
|
|
|
|
-import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
|
|
|
|
-import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
|
|
|
|
-import cn.com.ctop.common.module.mapper.MaterialTagMapper;
|
|
|
|
|
|
+import cn.com.ctop.common.module.mapper.*;
|
|
import cn.com.ctop.common.module.service.*;
|
|
import cn.com.ctop.common.module.service.*;
|
|
import cn.com.ctop.common.module.utils.*;
|
|
import cn.com.ctop.common.module.utils.*;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -502,7 +499,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
try {
|
|
try {
|
|
String type = json.getString("type");
|
|
String type = json.getString("type");
|
|
-
|
|
|
|
String url = "";
|
|
String url = "";
|
|
if (!Check.isNull(json.getString("url"))) {
|
|
if (!Check.isNull(json.getString("url"))) {
|
|
url = "https:" + json.getString("url");
|
|
url = "https:" + json.getString("url");
|
|
@@ -569,10 +565,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
if (!Check.isNull(ascription)) {
|
|
if (!Check.isNull(ascription)) {
|
|
MaterialAscription materialAscription = new MaterialAscription();
|
|
MaterialAscription materialAscription = new MaterialAscription();
|
|
materialAscription.setMaterialId(info.getCode());
|
|
materialAscription.setMaterialId(info.getCode());
|
|
- materialAscription.setClipId(ascription.getString("clipId"));
|
|
|
|
|
|
+ String clipId = ascription.getString("clipId");
|
|
|
|
+ if(null!=clipId&&!"".equals(clipId.trim())){
|
|
|
|
+ materialAscription.setClipId(clipId);
|
|
|
|
+ }
|
|
materialAscription.setShotId(ascription.getString("shotId"));
|
|
materialAscription.setShotId(ascription.getString("shotId"));
|
|
materialAscription.setPlanId(ascription.getString("planId"));
|
|
materialAscription.setPlanId(ascription.getString("planId"));
|
|
materialAscription.setPlaneId(ascription.getString("planeId"));
|
|
materialAscription.setPlaneId(ascription.getString("planeId"));
|
|
|
|
+ materialAscription.setCode(info.getCode());
|
|
materialAscriptionMapper.deleteByMap(deleteMap);
|
|
materialAscriptionMapper.deleteByMap(deleteMap);
|
|
int result = materialAscriptionMapper.insert(materialAscription);
|
|
int result = materialAscriptionMapper.insert(materialAscription);
|
|
if (result > 0) {
|
|
if (result > 0) {
|