灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示

zhubaomin

2025-03-27 43a19a4424f67c379934ed0d70e0d1b3512cd769

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java

@@ -8,10 +8,10 @@
import com.dy.pipIrrGlobal.voSe.VoRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;

@@ -33,32 +33,16 @@

    public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
        //完善查询充值记录的起止时间
        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");

        //LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
        //LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
        //if(rechargeTimeStart != null) {
        //    rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        //    queryVo.setRechargeTimeStart(rechargeTimeStart);
        //}
        //
        //if(rechargeTimeStop != null) {
        //    rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        //    queryVo.setRechargeTimeStop(rechargeTimeStop);
        //}

        String rechargeTimeStart = queryVo.rechargeTimeStart;
        String rechargeTimeStop = queryVo.rechargeTimeStop;
        if(rechargeTimeStart != null) {
            rechargeTimeStart = rechargeTimeStart + " 00:00:00";
            queryVo.setRechargeTimeStart(rechargeTimeStart);
        }

        if(rechargeTimeStop != null) {
            rechargeTimeStop = rechargeTimeStop + " 23:59:59";
            queryVo.setRechargeTimeStop(rechargeTimeStop);
        }


        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

@@ -67,6 +51,7 @@
        QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = queryVo.pageSize ;
        rsVo.pageCurr = queryVo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = seRechargeMapper.getRecharges(params);
        return rsVo ;
@@ -113,4 +98,13 @@
        return po.getId();
    }

    /**
     * 根据水卡id获取最近一条充值记录id
     * @param cardId
     * @return
     */
    public Long selectIdByCardId(Long cardId){
        SeRecharge seRecharge = seRechargeMapper.selectByCardId(cardId);
        return seRecharge.getId();
    }
}