Merge remote-tracking branch 'origin/master'

admin

2025-03-14 ae6879a7575f79d814c70781e6efc1b6218f3732

 billion-main/src/main/java/com/billion/main/da/service/impl/DaParamCollectionServiceImpl.java

@@ -1,6 +1,5 @@
package com.billion.main.da.service.impl;

import com.billion.common.utils.DateUtils;
import com.billion.main.da.domain.DaParamCollection;
import com.billion.main.da.mapper.DaParamCollectionMapper;
import com.billion.main.da.service.IDaParamCollectionService;
@@ -54,11 +53,6 @@
    @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);
    }

@@ -71,7 +65,6 @@
    @Override
    public int insertDaParamCollection(DaParamCollection daParamCollection)
    {
        daParamCollection.setCreateTime(DateUtils.getNowDate());
        return daParamCollectionMapper.insertDaParamCollection(daParamCollection);
    }