优惠包申请选择本分公司下优惠包

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@@ -99,5 +99,6 @@
         FROM base_discountpackage
         WHERE useOrg = #{userOrg}
           AND curdate() <= effectiveDate
+          AND nodeState = '已办结'
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
-import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
@@ -22,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,7 +40,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
 
     /**
      * 新增或修改
-     *
      * @param dto
      * @return
      */