大屏评分调整
This commit is contained in:
parent
d4b9faac0a
commit
d1449d026b
@ -70,7 +70,7 @@ public class DangerousEngineeringSideStationController {
|
|||||||
public Result<DangerousEngineeringSideStation> add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) {
|
public Result<DangerousEngineeringSideStation> add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) {
|
||||||
Result<DangerousEngineeringSideStation> result = new Result<DangerousEngineeringSideStation>();
|
Result<DangerousEngineeringSideStation> result = new Result<DangerousEngineeringSideStation>();
|
||||||
try {
|
try {
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
dangerousEngineeringSideStation.setCreateTime(sdf.format(new Date()));
|
dangerousEngineeringSideStation.setCreateTime(sdf.format(new Date()));
|
||||||
dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation);
|
dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation);
|
||||||
result.successMsg(MessageUtil.get("addSucess"));
|
result.successMsg(MessageUtil.get("addSucess"));
|
||||||
|
|||||||
@ -240,7 +240,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
|
|||||||
.between(DangerousEngineeringSideStation::getCreateTime, DateUtil.beginOfMonth(date), DateUtil.endOfMonth(date)));
|
.between(DangerousEngineeringSideStation::getCreateTime, DateUtil.beginOfMonth(date), DateUtil.endOfMonth(date)));
|
||||||
Set<String> sideList = new HashSet<>();
|
Set<String> sideList = new HashSet<>();
|
||||||
for (DangerousEngineeringSideStation dangerousEngineeringSideStation : list3) {
|
for (DangerousEngineeringSideStation dangerousEngineeringSideStation : list3) {
|
||||||
sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getSideStationTime()), "yyyy-MM-dd"));
|
sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getCreateTime()), "yyyy-MM-dd"));
|
||||||
}
|
}
|
||||||
BigDecimal bigDecima2 = new BigDecimal(list3.size());
|
BigDecimal bigDecima2 = new BigDecimal(list3.size());
|
||||||
BigDecimal result2 = new BigDecimal(0.4);
|
BigDecimal result2 = new BigDecimal(0.4);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user