fix: 修复价格展示无数据的问题

This commit is contained in:
han0
2024-12-31 09:15:50 +08:00
parent bf978de901
commit 9ad699b5bc
2 changed files with 15 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
package mjkf.xinke.main.service; package mjkf.xinke.main.service;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import mjkf.xinke.main.model.db.DataAdjacent; import mjkf.xinke.main.model.db.DataAdjacent;
@@ -92,5 +93,15 @@ public class DataAdjacentService extends DataService<BaseMapper<DataAdjacent>, D
} }
return result; return result;
} }
public List<Map<String, Object>> listStatistics(LambdaQueryWrapper<DataAdjacent> query) {
var data = this.list(query);
var result = new ArrayList<Map<String, Object>>();
for (var item: data) {
var obj = JSONUtil.parseObj(item);
result.add(obj);
}
return result;
}
} }

View File

@@ -33,6 +33,8 @@ public class MaterialResultService {
DataNetworkService dataNetworkService; DataNetworkService dataNetworkService;
@Resource @Resource
AsphaltModifierService asphaltModifierService; AsphaltModifierService asphaltModifierService;
@Resource
DataAdjacentService dataAdjacentService;
/** /**
* 基础查询 * 基础查询
@@ -136,6 +138,8 @@ public class MaterialResultService {
service = dataFujianService; service = dataFujianService;
} else if (type.equals(MaterialTaskType.ASPHALT_MODIFIER)) { } else if (type.equals(MaterialTaskType.ASPHALT_MODIFIER)) {
service = asphaltModifierService; service = asphaltModifierService;
} else if (type.equals(MaterialTaskType.OTHER)) {
service = dataAdjacentService;
} else if (MaterialTaskType.isLocalMaterial(type)) { } else if (MaterialTaskType.isLocalMaterial(type)) {
service = localMaterialService; service = localMaterialService;
} else if (MaterialTaskType.isNetworkPrice(type)) { } else if (MaterialTaskType.isNetworkPrice(type)) {