新增-生产报表

hdy

2024-01-24 8ae9df8f5ed23873cbd47dde1fea30952ed0f1f3

新增-生产报表

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java

@@ -96,6 +96,33 @@
    @Excel(name = "类型")
    private String type;

    private String[] dateConditions;

    private String startTime;

    private String endTime;

    public String[] getDateConditions() {
        return dateConditions;
    }

    public void setDateConditions(String[] dateConditions) {
        this.dateConditions = dateConditions;
    }

    public String getStartTime() {return startTime;}

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    public void setId(Long id) 
    {
        this.id = id;

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -5,6 +5,7 @@
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -19,6 +20,9 @@
{
    @Autowired
    private DaParamCollectionMapper daParamCollectionMapper;

    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    /**
     * 查询设备产品过程参数采集
@@ -41,6 +45,11 @@
    @Override
    public List<DaParamCollection> selectDaParamCollectionList(DaParamCollection daParamCollection)
    {
        if(daParamCollection.getDateConditions()!=null){
        String[] conditions = daParamCollection.getDateConditions();
            daParamCollection.setStartTime(conditions[0]);
            daParamCollection.setEndTime(conditions[1]);
    }
        return daParamCollectionMapper.selectDaParamCollectionList(daParamCollection);
    }


 jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml

@@ -45,6 +45,7 @@
            <if test="locationCode != null  and locationCode != ''"> and location_code = #{locationCode}</if>
            <if test="equipmentNo != null  and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
            <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
            <if test="dateConditions != null  and dateConditions != ''"> and collection_time BETWEEN #{startTime} AND #{endTime}</if>
        </where>
    </select>
    

 jcdm-ui/src/views/main/pr/tightenReport/index.vue

@@ -14,14 +14,17 @@
            placeholder="请输入工位号"
            @keyup.enter.native="handleQuery"/>
        </el-form-item>
        <el-form-item label-width="120"  label="采集时间" prop="startDate">
            <el-date-picker
              v-model="dateRange"
              type="daterange"
              range-separator="至"
              start-placeholder="开始日期"
              end-placeholder="结束日期">
            </el-date-picker>
        <el-form-item label-width="130" label="保存日期" prop="dateConditions">
          <el-date-picker
            v-model="queryParams.dateConditions"
            type="datetimerange"
            :picker-options="pickerOptions"
            value-format="yyyy-MM-dd HH:mm:ss"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
            align="right">
          </el-date-picker>
        </el-form-item>
        <el-form-item style="float: right">
          <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button>
@@ -110,7 +113,35 @@
        unit: null,
        type: '拧紧数据',
        startDate: null,
        endDate: null
        endDate: null,
        dateConditions: [],
      },
      pickerOptions: {
        shortcuts: [{
          text: '最近一周',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
            picker.$emit('pick', [start, end]);
          }
        }, {
          text: '最近一个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
            picker.$emit('pick', [start, end]);
          }
        }, {
          text: '最近三个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
            picker.$emit('pick', [start, end]);
          }
        }]
      },
    }
  },
@@ -118,21 +149,6 @@
    this.getList();
  },
  methods: {

    //   async fetchData() {
    //     // 构建API请求的URL，使用选择的日期范围作为查询参数
    //     const url = `@/api/main/da/paramCollection/paramCollection?startDate=${this.dateRange[0]}&endDate=${this.dateRange[1]}`;
    //
    //     try {
    //       // 发送API请求，获取查询结果
    //       const response = await fetch(url);
    //       const data = await response.json();
    //       console.log(data); // 处理查询结果，比如在控制台输出或显示在页面上
    //     } catch (error) {
    //       console.error('Error fetching data:', error);
    //     }
    //   },
    // },

    reset() {
      this.form = {