元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
2025-07-25 d600b6fb14a154db99c5912c4092bb74d20cf52b 
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java


@@ -347,7 +347,7 @@




    public void valueFrom84(DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.opType = null;


        this.opType = cdData.opType;


        this.opTotalAmount = cdData.waterTotalAmount;


        this.opIcCardNo = cdData.icCardNo;


        this.opIcCardAddr = cdData.icCardAddr;


@@ -378,7 +378,7 @@


    public void valueFrom85(DataV202404 dataV202404, DataCd85Vo cdData) throws Exception {


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt);


        this.opType = cdData.opType;


        this.clType = cdData.clType;


        this.clIcCardAddr = cdData.icCardAddr;


        this.clIcCardNo = cdData.icCardNo;


        this.clTotalAmount = cdData.waterTotalAmount;


@@ -451,6 +451,38 @@


        }


    }




    public void updateFrom(DataV202404 dataV202404, DataCd84Vo dataCd84Vo, Boolean clearCloseValve) throws Exception {


        this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.opType = dataCd84Vo.opType;


        this.opTotalAmount = dataCd84Vo.waterTotalAmount;


        this.opIcCardNo = dataCd84Vo.icCardNo;


        this.opIcCardAddr = dataCd84Vo.icCardAddr;


        this.opRemainMoney = dataCd84Vo.moneyRemainUser;


        this.opOrderNo = dataCd84Vo.orderNo; //江海协议特有


        this.opEleTotalAmount = dataCd84Vo.eleTotalAmount; //江海协议特有


        this.opWaterRemainUser = dataCd84Vo.waterRemainUser; //江海协议特有


        this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.openDt);


        if (clearCloseValve != null && clearCloseValve.booleanValue()) {


            this.clDt = null;


            this.clType = null;


            this.clTotalAmount = null;


            this.clIcCardNo = null;


            this.clIcCardAddr = null;


            this.clRemainMoney = null;


            this.clThisAmount = null;


            this.clThisMoney = null;


            this.clThisTime = null;


            this.clPrice = null;


            this.clOpenDt = null;


            this.closeDt = null;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }






    public void updateFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);


@@ -511,4 +543,39 @@


            this.clThisEle = null;//江海协议特有


        }


    }






    public void updateFrom(DataV202404 dataV202404, DataCd85Vo cdData, boolean clearOpenValve) throws Exception {


        this.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataV202404.dt);


        this.clType = cdData.clType;


        this.clTotalAmount = cdData.waterTotalAmount;


        this.clIcCardNo = cdData.icCardNo;


        this.clIcCardAddr = cdData.icCardAddr;


        this.clOrderNo = cdData.orderNo;


        this.clRemainMoney = cdData.moneyRemain;


        this.clEleTotalAmount = cdData.eleTotalAmount;


        this.clWaterRemainUser = cdData.waterRemain;


        this.clThisAmount = cdData.thisWater;


        this.clThisMoney = cdData.thisMoney;


        this.clThisTime = cdData.thisDuration;


        this.clThisEle = cdData.thisEle;


        this.clPrice = null;


        this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);


        this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt) ;




        if(clearOpenValve){


            this.opDt = null ;


            this.opType = null ;


            this.opTotalAmount = null ;


            this.opIcCardNo = null ;


            this.opIcCardAddr = null ;


            this.opRemainMoney = null ;


            this.openDt = null ;




            this.clOrderNo = null;//江海协议特有


            this.clEleTotalAmount = null;//江海协议特有


            this.clWaterRemainUser = null;//江海协议特有


            this.clThisEle = null;//江海协议特有


        }


    }


}