From bbb6e75770368d92e49e5d4ef2ecaa33449317cd Mon Sep 17 00:00:00 2001 From: guo Date: Sat, 3 Feb 2024 10:51:45 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/base/entity/vo/SectorVo.java | 10 ++--- .../AntiPressureFoldManageServiceImpl.java | 2 +- .../entity/ConcreteMixStationData.java | 38 +++++++++---------- .../ConcreteMixStationDataServiceImpl.java | 2 +- .../HiddenDangerInspectRecordServiceImpl.java | 2 +- .../impl/PartyMemberManageServiceImpl.java | 2 +- .../PaveCompactionRecordController.java | 4 +- .../impl/PaveCompactionRecordServiceImpl.java | 3 ++ .../service/impl/PaveRecordServiceImpl.java | 3 ++ .../PitchMixStationProdDataServiceImpl.java | 2 +- .../impl/PoisonousGasDevAlarmServiceImpl.java | 2 +- .../xml/PressureTestMachineManageMapper.xml | 1 + .../PressureTestMachineManageServiceImpl.java | 2 +- .../QualityInspectionRecordServiceImpl.java | 2 +- .../service/impl/TaskProgressServiceImpl.java | 2 +- .../entity/UniversalTestDev.java | 6 +-- .../impl/UniversalTestManageServiceImpl.java | 2 +- 17 files changed, 47 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java index fe7f4bd97..45f9bba70 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java @@ -9,10 +9,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -35,7 +32,7 @@ public class SectorVo { * @param enums * @return */ - public static SectorVo getSectorVoByEnum(List list, BaseEnum[] enums) { + public static SectorVo getSectorVoByEnum(List list, BaseEnum[] enums, boolean isSort) { SectorVo vo = new SectorVo(); List rtList = new ArrayList<>(); Map map = list.stream().collect(Collectors.toMap(SectorOneVo::getEnumType, Function.identity())); @@ -52,6 +49,9 @@ public class SectorVo { vo.setData(rtList); vo.setCount(String.valueOf(rtList.stream().map(o -> Integer.parseInt(o.getCount())).mapToInt(value -> value).sum())); calPercent(vo); + if (isSort) { + vo.getData().sort(Comparator.comparing(SectorOneVo::getCount).reversed()); + } return vo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java index e89a43035..0b3bfde2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldManageServiceImpl.java @@ -91,7 +91,7 @@ public class AntiPressureFoldManageServiceImpl extends ServiceImpl paramMap) { - return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values()); + return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values(), false); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java index 73ffa3b4d..8b732dbe6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/ConcreteMixStationData.java @@ -65,25 +65,25 @@ public class ConcreteMixStationData implements Serializable { @ApiModelProperty(value = "强度等级") private java.lang.String powerLevel; /** - * 实际方量(m3) - */ - @Excel(name = "实际方量(m3)", width = 15) - @ApiModelProperty(value = "实际方量(m3)") - private java.lang.Double actualQuantity; - /** - * 水胶比 - */ - @Excel(name = "水胶比", width = 15) - @ApiModelProperty(value = "水胶比") - private java.lang.Double water_binderRatio; - /** - * 出料时间 - */ - @Excel(name = "出料时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "出料时间") - private java.util.Date dischargeTime; + * 实际方量(m3) + */ + @Excel(name = "实际方量(m3)", width = 15) + @ApiModelProperty(value = "实际方量(m3)") + private java.lang.Double actualQuantity; + /** + * 水胶比 + */ + @Excel(name = "水胶比", width = 15) + @ApiModelProperty(value = "水胶比") + private java.lang.Double waterBinderRatio; + /** + * 出料时间 + */ + @Excel(name = "出料时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "出料时间") + private java.util.Date dischargeTime; /** * 使用状态：1正常2初级超标3中级超标4高级超标5异常 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java index bed35c6ce..33ae4c857 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java @@ -138,7 +138,7 @@ public class ConcreteMixStationDataServiceImpl extends ServiceImpl paramMap) { ArrayList list = baseMapper.countUseStatus(paramMap); - return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values()); + return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values(), false); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java index 3181997ac..88dd48eca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java @@ -515,7 +515,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl map) { - return SectorVo.getSectorVoByEnum(baseMapper.countFaultLevel(map), ParamEnum.HiddenDangerInspectionRecordFaultLevelEnum.values()); + return SectorVo.getSectorVoByEnum(baseMapper.countFaultLevel(map), ParamEnum.HiddenDangerInspectionRecordFaultLevelEnum.values(), false); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java index b6c0e8610..bbc9c70e3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java @@ -25,6 +25,6 @@ public class PartyMemberManageServiceImpl extends ServiceImpl countPartyMemberManagePoliticalStatus(HashMap paramMap) { List list = baseMapper.countPartyMemberManagePoliticalStatus(paramMap); - return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.PartyMemberManagePoliticalStatusEnum.values())); + return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.PartyMemberManagePoliticalStatusEnum.values(), false)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java index 60ed70e3f..5faef565b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.pave.controller; +import com.gexin.fastjson.JSON; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecord; import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordService; import io.swagger.annotations.Api; @@ -74,7 +75,8 @@ public class PaveCompactionRecordController { @ApiOperation(value = "添加路面压实-记录信息", notes = "添加路面压实-记录信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate PaveCompactionRecord paveCompactionRecord) { - paveCompactionRecordService.add(paveCompactionRecord); + log.info("添加路面压实-记录信息:{}", JSON.toJSONString(paveCompactionRecord)); + paveCompactionRecordService.add(paveCompactionRecord); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java index d5345e99a..acdf31f74 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java @@ -16,6 +16,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; import java.util.HashMap; import java.util.List; @@ -74,6 +75,8 @@ public class PaveCompactionRecordServiceImpl extends ServiceImpl paramMap) { ArrayList list = baseMapper.countUseStatus(paramMap); - return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values()); + return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values(), false); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java index e84062b84..cd2e45fa4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java @@ -45,6 +45,6 @@ public class PoisonousGasDevAlarmServiceImpl extends ServiceImpl paramMap) { List list = baseMapper.countPoisonousGasDevAlarmGasType(paramMap); - return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values()); + return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values(), false); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml index a04ea00a6..c08d02ba3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml @@ -55,6 +55,7 @@ and test_time > date_sub(test_time,interval 29 day) group by test_type + order by count desc