feat: bug-564 产品中心,管理端,产品资料管理这里,设置默认文件,设置错了,想取消取消不了

This commit is contained in:
曹鹏飞 2025-09-10 09:51:08 +08:00
parent aa79284eea
commit a1d3c74553
6 changed files with 21 additions and 9 deletions

View File

@ -32,7 +32,7 @@ public class ProductModelFileItem implements Serializable {
private Integer modelId;
/**
* 产品机型id
* 产品机型文件id
*/
private Integer modelFileId;

View File

@ -5,6 +5,7 @@ import com.nflg.mobilebroken.common.pojo.request.FileDefaultConfigRequest;
import com.nflg.mobilebroken.common.pojo.request.ProductModelFileItemAddRequest;
import com.nflg.mobilebroken.repository.entity.ProductModelFileItem;
import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@ -24,4 +25,6 @@ public interface IProductModelFileItemService extends IService<ProductModelFileI
void setFileDefaultCondig(FileDefaultConfigRequest request);
List<ProductModelFileItem> getPublishedByLanguage(Integer modelId);
void removeByFileIds(@NotEmpty List<Integer> ids);
}

View File

@ -88,4 +88,11 @@ public class ProductModelFileItemServiceImpl extends ServiceImpl<ProductModelFil
public List<ProductModelFileItem> getPublishedByLanguage(Integer modelId) {
return baseMapper.getPublishedByLanguage(modelId);
}
@Override
public void removeByFileIds(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelFileItem>()
.in(ProductModelFileItem::getModelFileId, ids)
);
}
}

View File

@ -116,6 +116,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
}
}
@Transactional
@Override
public void delete(BatchDeleteRequest request) {
VUtils.trueThrowBusinessError(lambdaQuery()
@ -128,6 +129,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
.ne(ProductModelFile::getCreateBy, AdminUserUtil.getUserName())
.exists()).throwMessage("不能删除其他人创建的数据");
removeByIds(request.getIds());
productModelFileItemService.removeByFileIds(request.getIds());
}
@Transactional
@ -247,12 +249,12 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
.setLanguageCode(language.getCode())
.setLanguageName(language.getName())
.setItems(list.stream().filter(item -> StrUtil.equals(language.getCode(), item.getLanguageCode()))
.map(item -> {
return new FileDefaultConfigItemVO()
.setId(item.getId())
.setName(item.getName())
.setSelected(item.getShowInList());
}).collect(Collectors.toList()));
.map(item -> new FileDefaultConfigItemVO()
.setId(item.getId())
.setName(item.getName())
.setSelected(item.getShowInList())
).collect(Collectors.toList())
);
vos.add(vo);
});
return vos;

View File

@ -7,6 +7,6 @@
from product_model_file pmf
inner join product_model_file_item pmfi on pmfi.model_file_id=pmf.id
where pmf.state=1 and pmf.enable=1 and pmf.model_id=#{modelId}
order by pmfi.language_code,pmfi.show_in_list desc
order by pmfi.language_code,pmfi.show_in_list desc,pmfi.id desc
</select>
</mapper>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.mobilebroken.repository.mapper.ProductModelFileMapper">
<select id="getDefaultByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductFileVO">
SELECT pmfi.name, pmfi.*
SELECT pmfi.name,pmf.*
FROM product_model_file pmf
INNER JOIN product_model_file_item pmfi ON pmf.id = pmfi.model_file_id
WHERE pmf.`enable` = 1