RIZO/shanghaiganxiang-zhusu-back01
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

模具大屏饼状图显示全部模具状态

Browse Source
This commit is contained in:
杨晓东 2026-01-04 10:44:22 +08:00
parent 612795ceec
commit 185c3546cf
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shgx-admin/src/main/java/com/shgx/web/controller/mold/MoldScreenController.java
View File

@ -53,14 +53,11 @@ public class MoldScreenController extends BaseController {
/**
* 模具状态饼状图
* @param startTime
* @param endTime
* @return
*/
@GetMapping("/pie")
public AjaxResult MoldStatusPieChart(@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
List<Map<String, Object>> list = moldScreenService.MoldStatusPieChart(startTime, endTime);
public AjaxResult MoldStatusPieChart() {
List<Map<String, Object>> list = moldScreenService.MoldStatusPieChart();
return AjaxResult.success(list);
}

4
shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/IMoldScreenService.java
View File

@ -28,11 +28,9 @@ public interface IMoldScreenService {
/**
* 模具状态饼状图
* @param startTime
* @param endTime
* @return
*/
public List<Map<String, Object>> MoldStatusPieChart(Date startTime, Date endTime);
public List<Map<String, Object>> MoldStatusPieChart();
/**
* 出入库柱状图

32
shgx-moldmanagement/src/main/java/com/shgx/moldmanagement/service/impl/MoldScreenServiceImpl.java
View File

@ -247,12 +247,10 @@ public class MoldScreenServiceImpl implements IMoldScreenService {
/**
* 模具状态饼状图
* @param startTime
* @param endTime
* @return
*/
@Override
public List<Map<String, Object>> MoldStatusPieChart(Date startTime, Date endTime) {
public List<Map<String, Object>> MoldStatusPieChart() {
List<String> statusList;
@ -268,20 +266,20 @@ public class MoldScreenServiceImpl implements IMoldScreenService {
.select("TRIM(status) as status", "count(*) as value") // 查询去空格，重命名为status
.groupBy("TRIM(status)"); // 分组去空格，与select一致
if (startTime != null) {
queryWrapper.and(w -> w
.ge("update_time", startTime)
.or(w2 -> w2.isNull("update_time").ge("create_time", startTime))
);
}
if (endTime != null) {
Date adjustedEndTime = getEndOfDay(endTime);
queryWrapper.and(w -> w
.le("update_time", adjustedEndTime)
.or(w2 -> w2.isNull("update_time").le("create_time", adjustedEndTime))
);
}
// if (startTime != null) {
// queryWrapper.and(w -> w
// .ge("update_time", startTime)
// .or(w2 -> w2.isNull("update_time").ge("create_time", startTime))
// );
// }
//
// if (endTime != null) {
// Date adjustedEndTime = getEndOfDay(endTime);
// queryWrapper.and(w -> w
// .le("update_time", adjustedEndTime)
// .or(w2 -> w2.isNull("update_time").le("create_time", adjustedEndTime))
// );
// }
List<Map<String, Object>> statistics = moldInfoMapper.selectMaps(queryWrapper);