change-4

wujian

2024-10-23 2c65c31aceb16c1d06c692266e3fb555ecafdfb5

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

@@ -1,5 +1,6 @@
package com.jcdm.main.da.passingStationCollection.controller;

import cn.hutool.core.util.ObjectUtil;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
@@ -9,6 +10,7 @@
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.domain.ProductNumVO;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl;
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
@@ -18,6 +20,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.List;

/**
@@ -47,6 +50,15 @@
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
    }

    @GetMapping("/selectDaPassingStationCollectionForSearch")
    public TableDataInfo selectDaPassingStationCollectionForSearch(DaPassingStationCollection daPassingStationCollection)
    {
        startPage();
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionForSearch(daPassingStationCollection);
        return getDataTable(list);
    }


    @GetMapping("/getTopProcess")
    public TableDataInfo getTopProcess()
@@ -152,4 +164,23 @@
//        }
//        return passingStationCollectionServiceImpl.sendMessage(message);
//    }


    @GetMapping("/getProductNum")
    public R getProductNum(DaPassingStationCollection daPassingStationCollection){
        LocalDate queryDate = daPassingStationCollection.getQueryDate();
        String queryMonth = daPassingStationCollection.getQueryMonth();
        if (ObjectUtil.isNull(queryDate) && ObjectUtil.isNull(queryMonth)){
            return R.fail("请选择月份或者日期");
        }
        if (ObjectUtil.isNotEmpty(queryMonth) && ObjectUtil.isNotEmpty(queryDate)){
            String queryDateString = queryDate.toString();
            String queryMonthString = queryMonth.toString();
            if (!queryDateString.contains(queryMonthString)){
                return R.fail("请确认选择的月份和日期月份是否匹配");
            }
        }
        List<ProductNumVO> productNum = daPassingStationCollectionService.getProductNum(daPassingStationCollection);
        return R.ok(productNum);
    }
}