审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

 src/main/java/com/whyc/service/PwrdevDataHistoryService.java

@@ -1,5 +1,8 @@
package com.whyc.service;

import com.whyc.dto.PowerDevDataAC;
import com.whyc.dto.PowerDevDataACDC;
import com.whyc.dto.PowerDevDataDC;
import com.whyc.dto.Response;
import com.whyc.dto.paramter.PwrdevReportParam;
import com.whyc.mapper.PwrdevDataHistoryMapper;
@@ -12,6 +15,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class PwrdevDataHistoryService {
@@ -94,6 +98,7 @@
        if(dataType.equals("ac")){
            dataResult = result.stream().map(data -> {
                PowerDevDataAC ac = new PowerDevDataAC();
                ac.setRecordTime(data.getRecordTime());
                ac.setAcAcIn1VolA(data.getAcAcIn1VolA());
                ac.setAcAcIn1VolB(data.getAcAcIn1VolB());
                ac.setAcAcIn1VolC(data.getAcAcIn1VolC());
@@ -114,6 +119,7 @@
        }else if(dataType.equals("acdc")){
            dataResult = result.stream().map(data -> {
                PowerDevDataACDC acdc = new PowerDevDataACDC();
                acdc.setRecordTime(data.getRecordTime());
                acdc.setAcdcAcdcmTemp(data.getAcdcAcdcmTemp());
                acdc.setAcdcAcIn1VolA(data.getAcdcAcIn1VolA());
                acdc.setAcdcAcIn1VolB(data.getAcdcAcIn1VolB());
@@ -162,6 +168,7 @@
        }else if(dataType.equals("dc")){
            dataResult = result.stream().map(data -> {
                PowerDevDataDC dc = new PowerDevDataDC();
                dc.setRecordTime(data.getRecordTime());
                dc.setDcDcIn1Vol(data.getDcDcIn1Vol());
                dc.setDcDcIn2Vol(data.getDcDcIn2Vol());
                dc.setDcDcOut1Curr(data.getDcDcOut1Curr());