add - panel

wujian

5 天以前 ea3c33c8561df39d4f123d1424fda99dd0f0c51d

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -18,14 +18,12 @@
import com.jcdm.common.exception.ServiceException;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.bs.orderScheduling.Query.EngineQuery;
import com.jcdm.main.bs.orderScheduling.Query.SAPQuery;
import com.jcdm.main.bs.orderScheduling.common.Constants;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import com.jcdm.main.bs.orderScheduling.vo.FollowReportVO;
import com.jcdm.main.bs.orderScheduling.vo.LineChartVO;
import com.jcdm.main.bs.orderScheduling.vo.ReportVO;
import com.jcdm.main.bs.orderScheduling.vo.SumDataVO;
import com.jcdm.main.bs.orderScheduling.vo.*;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
@@ -46,6 +44,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -505,33 +504,43 @@


    @PostMapping("/engine-report")
    public R getReportDetail(SAPQuery sapQuery){
    public ReportVO getReportDetail(@RequestBody SAPQuery sapQuery){
        ReportVO reportVO = new ReportVO();
        if (StrUtil.isBlank(sapQuery.getIV_ZFDJM())){
            reportVO.setEV_STATUS("E");
            reportVO.setEV_MESSAGE("发动机号不能为空");
        List<ResultDataVO> EV_DATA = new ArrayList<>();
        List<EngineQuery> engineQueryList = sapQuery.getIV_ZFDJM();
        if (CollUtil.isEmpty(engineQueryList)){
            reportVO.setEV_DATA(EV_DATA);
            return reportVO;
        }
        BsOrderScheduling query = new BsOrderScheduling();
        query.setEngineNo(sapQuery.getIV_ZFDJM());
        List<String> engineNoList = engineQueryList.stream().map(EngineQuery::getZFDJM).collect(Collectors.toList());
        query.setEngineNoList(engineNoList);
        List<BsOrderScheduling> bsOrderSchedulingList = bsOrderSchedulingService.selectBsOrderSchedulingList(query);
        if (CollUtil.isNotEmpty(bsOrderSchedulingList)){
            BsOrderScheduling bsOrderScheduling = bsOrderSchedulingList.get(0);
            if (StrUtil.isBlank(bsOrderScheduling.getReport20())){
                reportVO.setEV_STATUS("0");
                reportVO.setEV_MESSAGE("未报工");
            } else {
                if ("1".equals(bsOrderScheduling.getReport20())){
                    reportVO.setEV_STATUS("1");
                    reportVO.setEV_MESSAGE("已报工");
                } else if ("3".equals(bsOrderScheduling.getReport20())){
                    reportVO.setEV_STATUS("E");
                    reportVO.setEV_MESSAGE(bsOrderScheduling.getRemarks());
        for (String s : engineNoList) {
            ResultDataVO  resultDataVO = new ResultDataVO();
            resultDataVO.setZFDJM(s);
            List<BsOrderScheduling> collect = bsOrderSchedulingList.stream().filter(x -> x.getEngineNo().equals(s)).collect(Collectors.toList());
            if (CollUtil.isNotEmpty(collect)){
                BsOrderScheduling bsOrderScheduling = collect.get(0);
                if (StrUtil.isBlank(bsOrderScheduling.getReport20())){
                    resultDataVO.setSTATU("0");
                    resultDataVO.setEV_MESSAGE("未报工");
                } else {
                    if ("1".equals(bsOrderScheduling.getReport20())){
                        resultDataVO.setSTATU("1");
                        resultDataVO.setEV_MESSAGE("已报工");
                    } else if ("3".equals(bsOrderScheduling.getReport20())){
                        resultDataVO.setSTATU("2");
                        resultDataVO.setEV_MESSAGE(bsOrderScheduling.getRemarks());
                    }
                }
            } else {
                resultDataVO.setSTATU("2");
                resultDataVO.setEV_MESSAGE("未查询到此发动机信息");
            }
        } else {
            reportVO.setEV_STATUS("E");
            reportVO.setEV_MESSAGE("未查询到此发动机信息");
            EV_DATA.add(resultDataVO);
        }
        return R.ok(reportVO);
        reportVO.setEV_DATA(EV_DATA);
        return reportVO;
    }
}