bug修改
This commit is contained in:
parent
303ca65532
commit
100d67ddf6
|
|
@ -113,10 +113,12 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi
|
||||||
tbPromotionMaterial.setCreateUser(SecurityUtils.getUserId());
|
tbPromotionMaterial.setCreateUser(SecurityUtils.getUserId());
|
||||||
tbPromotionMaterial.setCreateTime(DateUtils.getNowDate());
|
tbPromotionMaterial.setCreateTime(DateUtils.getNowDate());
|
||||||
int i = mapper.insertTbPromotionMaterial(tbPromotionMaterial);
|
int i = mapper.insertTbPromotionMaterial(tbPromotionMaterial);
|
||||||
if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty() && i > 0) {
|
if(i > 0){
|
||||||
//将产品与物料关系存到另一张表
|
if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty()) {
|
||||||
List<TbPromotionMaterial> split = tbPromotionMaterial.split(tbPromotionMaterial);
|
//将产品与物料关系存到另一张表
|
||||||
int n = mapper.insertMaterialProductRelevance(split);
|
List<TbPromotionMaterial> split = tbPromotionMaterial.split(tbPromotionMaterial);
|
||||||
|
int n = mapper.insertMaterialProductRelevance(split);
|
||||||
|
}
|
||||||
//将物料文件上传
|
//将物料文件上传
|
||||||
int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId());
|
int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId());
|
||||||
}
|
}
|
||||||
|
|
@ -135,12 +137,14 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi
|
||||||
tbPromotionMaterial.setUpdateUser(SecurityUtils.getUserId());
|
tbPromotionMaterial.setUpdateUser(SecurityUtils.getUserId());
|
||||||
tbPromotionMaterial.setUpdateTime(DateUtils.getNowDate());
|
tbPromotionMaterial.setUpdateTime(DateUtils.getNowDate());
|
||||||
int i = mapper.updateTbPromotionMaterial(tbPromotionMaterial);
|
int i = mapper.updateTbPromotionMaterial(tbPromotionMaterial);
|
||||||
if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty() && i > 0) {
|
if(i > 0){
|
||||||
//删除以前的关联关系
|
//删除以前的关联关系
|
||||||
int x = mapper.deleteMaterialProductRelevance(tbPromotionMaterial.getId());
|
int x = mapper.deleteMaterialProductRelevance(tbPromotionMaterial.getId());
|
||||||
//将产品与物料关系存到另一张表
|
if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty()) {
|
||||||
List<TbPromotionMaterial> split = tbPromotionMaterial.split(tbPromotionMaterial);
|
//将产品与物料关系存到另一张表
|
||||||
int n = mapper.insertMaterialProductRelevance(split);
|
List<TbPromotionMaterial> split = tbPromotionMaterial.split(tbPromotionMaterial);
|
||||||
|
int n = mapper.insertMaterialProductRelevance(split);
|
||||||
|
}
|
||||||
if(listFiles != null && !listFiles.isEmpty()){
|
if(listFiles != null && !listFiles.isEmpty()){
|
||||||
//删除以前的附件
|
//删除以前的附件
|
||||||
if(tbPromotionMaterial.getDelIds() != null && !tbPromotionMaterial.getDelIds().isEmpty()){
|
if(tbPromotionMaterial.getDelIds() != null && !tbPromotionMaterial.getDelIds().isEmpty()){
|
||||||
|
|
@ -155,6 +159,7 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi
|
||||||
int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId());
|
int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue