bug修复
This commit is contained in:
guo
parent
db55e7e010
commit
bbb6e75770
@ -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<SectorOneVo> list, BaseEnum[] enums) {
|
||||
public static SectorVo getSectorVoByEnum(List<SectorOneVo> list, BaseEnum[] enums, boolean isSort) {
|
||||
SectorVo vo = new SectorVo();
|
||||
List<SectorOneVo> rtList = new ArrayList<>();
|
||||
Map<String, SectorOneVo> 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;
|
||||
}
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ public class AntiPressureFoldManageServiceImpl extends ServiceImpl<AntiPressureF
|
||||
|
||||
@Override
|
||||
public SectorVo countTestType(HashMap<String, Object> paramMap) {
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -75,7 +75,7 @@ public class ConcreteMixStationData implements Serializable {
|
||||
*/
|
||||
@Excel(name = "水胶比", width = 15)
|
||||
@ApiModelProperty(value = "水胶比")
|
||||
private java.lang.Double water_binderRatio;
|
||||
private java.lang.Double waterBinderRatio;
|
||||
/**
|
||||
* 出料时间
|
||||
*/
|
||||
|
||||
@ -138,7 +138,7 @@ public class ConcreteMixStationDataServiceImpl extends ServiceImpl<ConcreteMixSt
|
||||
@Override
|
||||
public SectorVo countUseStatus(HashMap<String, Object> paramMap) {
|
||||
ArrayList<SectorOneVo> list = baseMapper.countUseStatus(paramMap);
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -515,7 +515,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
||||
|
||||
@Override
|
||||
public SectorVo countFaultLevel(Map<String, Object> map) {
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countFaultLevel(map), ParamEnum.HiddenDangerInspectionRecordFaultLevelEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countFaultLevel(map), ParamEnum.HiddenDangerInspectionRecordFaultLevelEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -25,6 +25,6 @@ public class PartyMemberManageServiceImpl extends ServiceImpl<PartyMemberManageM
|
||||
@Override
|
||||
public Result<SectorVo> countPartyMemberManagePoliticalStatus(HashMap<String, Object> paramMap) {
|
||||
List<SectorOneVo> list = baseMapper.countPartyMemberManagePoliticalStatus(paramMap);
|
||||
return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.PartyMemberManagePoliticalStatusEnum.values()));
|
||||
return Result.success(SectorVo.getSectorVoByEnum(list, ParamEnum.PartyMemberManagePoliticalStatusEnum.values(), false));
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,6 +75,7 @@ public class PaveCompactionRecordController {
|
||||
@ApiOperation(value = "添加路面压实-记录信息", notes = "添加路面压实-记录信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<PaveCompactionRecord> add(@RequestBody @Validate PaveCompactionRecord paveCompactionRecord) {
|
||||
log.info("添加路面压实-记录信息:{}", JSON.toJSONString(paveCompactionRecord));
|
||||
paveCompactionRecordService.add(paveCompactionRecord);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -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<PaveCompactionR
|
||||
paveCompactionRecord.setProjectSn(dev.getProjectSn());
|
||||
paveCompactionRecord.setId(null);
|
||||
baseMapper.insert(paveCompactionRecord);
|
||||
dev.setLastDataTime(new Date());
|
||||
paveCompactionDevMapper.updateById(dev);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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 PaveRecordServiceImpl extends ServiceImpl<PaveRecordMapper, PaveRec
|
||||
paveRecord.setDevName(dev.getDevName());
|
||||
paveRecord.setProjectSn(dev.getProjectSn());
|
||||
paveRecordMapper.insert(paveRecord);
|
||||
dev.setLastDataTime(new Date());
|
||||
paveDevMapper.updateById(dev);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -138,7 +138,7 @@ public class PitchMixStationProdDataServiceImpl extends ServiceImpl<PitchMixStat
|
||||
@Override
|
||||
public SectorVo countUseStatus(HashMap<String, Object> paramMap) {
|
||||
ArrayList<SectorOneVo> list = baseMapper.countUseStatus(paramMap);
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -45,6 +45,6 @@ public class PoisonousGasDevAlarmServiceImpl extends ServiceImpl<PoisonousGasDev
|
||||
@Override
|
||||
public SectorVo countPoisonousGasDevAlarmGasType(HashMap<String, Object> paramMap) {
|
||||
List<SectorOneVo> list = baseMapper.countPoisonousGasDevAlarmGasType(paramMap);
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values(), false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,6 +55,7 @@
|
||||
and test_time > date_sub(test_time,interval 29 day)
|
||||
</if>
|
||||
group by test_type
|
||||
order by count desc
|
||||
</select>
|
||||
|
||||
<select id="countPressureTestMachineManage"
|
||||
|
||||
@ -99,7 +99,7 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
|
||||
|
||||
@Override
|
||||
public SectorVo countTestType(HashMap<String, Object> paramMap) {
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values(), true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -321,7 +321,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
||||
@Override
|
||||
public SectorVo countQualityInspectionRecordUrgentLevel(HashMap<String, Object> paramMap) {
|
||||
List<SectorOneVo> list = baseMapper.countQualityInspectionRecordUrgentLevel(paramMap);
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.QualityInspectionRecordUrgentLevelEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(list, ParamEnum.QualityInspectionRecordUrgentLevelEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -486,7 +486,7 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
|
||||
|
||||
@Override
|
||||
public SectorVo countMppStatus(HashMap<String, Object> paramMap) {
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countMppStatus(paramMap), ParamEnum.TaskProgressMppStatusEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countMppStatus(paramMap), ParamEnum.TaskProgressMppStatusEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -60,9 +60,9 @@ public class UniversalTestDev implements Serializable {
|
||||
/**
|
||||
* 进场时间
|
||||
*/
|
||||
@Excel(name = "进场时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "进场时间", width = 15, 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 entryTime;
|
||||
@ApiModelProperty(value = "负责人")
|
||||
|
||||
@ -74,7 +74,7 @@ public class UniversalTestManageServiceImpl extends ServiceImpl<UniversalTestMan
|
||||
|
||||
@Override
|
||||
public SectorVo countTestType(HashMap<String, Object> paramMap) {
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values());
|
||||
return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user