优化导出

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -111,9 +111,11 @@ public class PayOrderController extends BaseController
     {
         List<PayOrder> list = payOrderService.selectPayOrderExport(payOrder);
         ExcelUtil<PayOrder> util = new ExcelUtil<PayOrder>(PayOrder.class);
+
         return util.exportExcel(list, "order");
     }
 
+
     /**
      * 获取订单支付详细信息
      */

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -26,19 +26,14 @@ public class PayOrder extends BaseEntity
     private String orderNo;
 
     /** 油站id */
-    @Excel(name = "油站id")
     private Long stationId;
-
     /** 油站名称 */
-    @Excel(name = "油站名称")
     private String stationName;
 
     /** 状态(0未支付，1，已支付) */
-    @Excel(name = "状态(0未支付，1，已支付)")
     private String status;
 
     /** 用户id(消费者) */
-    @Excel(name = "用户id(消费者)")
     private Long consumerId;
 
     /** 消费者 */
@@ -58,7 +53,6 @@ public class PayOrder extends BaseEntity
     private BigDecimal oilPirce;
 
     /** 油品类型（1.柴油 2 汽油） */
-    @Excel(name = "油品类型", readConverterExp = "1=.柴油,2=,汽=油")
     private String oilType;
 
     /** 加油升数 */
@@ -66,83 +60,64 @@ public class PayOrder extends BaseEntity
     private BigDecimal orderLiters;
 
     /** 实收金额 */
-    @Excel(name = "实收金额")
+    @Excel(name = "金额")
     private BigDecimal amt;
 
     /** 应收金额 */
-    @Excel(name = "应收金额")
     private BigDecimal receivableAmt;
 
     /** 到账金额 */
-    @Excel(name = "到账金额")
     private BigDecimal receivedAmt;
 
     /** 优惠金额 */
-    @Excel(name = "优惠金额")
     private BigDecimal discountAmt;
 
     /** 优惠券金额 */
-    @Excel(name = "优惠券金额")
     private BigDecimal discountCouponAmt;
-
     /** 优惠券 */
-    @Excel(name = "优惠券")
     private String discountCoupon;
 
     /** 微信支付金额 */
-    @Excel(name = "微信支付金额")
     private BigDecimal wxAmt;
 
     /** 支付宝支付金额 */
-    @Excel(name = "支付宝支付金额")
     private BigDecimal zfbAmt;
 
     /** pos支付金额 */
-    @Excel(name = "pos支付金额")
     private BigDecimal posAmt;
 
     /** 现金支付金额 */
-    @Excel(name = "现金支付金额")
     private BigDecimal xjAmt;
 
     /** 滴滴app支付金额 */
-    @Excel(name = "滴滴app支付金额")
     private BigDecimal didiAppAmt;
 
     /** 团油app支付金额 */
-    @Excel(name = "团油app支付金额")
     private BigDecimal tyAppAmt;
 
     /** 其他支付金额 */
-    @Excel(name = "其他支付金额")
     private BigDecimal otherAmt;
 
     /** 电子卡金额 */
-    @Excel(name = "电子卡金额")
     private BigDecimal dzkAmt;
 
     /** 消费积分 */
-    @Excel(name = "消费积分")
     private Long score;
 
     /** 会员卡号 */
-    @Excel(name = "会员卡号")
+   // @Excel(name = "会员卡号")
     private String memberNo;
 
     /** 会员支付金额 */
-    @Excel(name = "会员支付金额")
     private BigDecimal memberAmt;
 
     /** 打印小票数量 */
-    @Excel(name = "打印小票数量")
     private Long printCount;
 
     /** 支付类型：随行付：sxf */
-    @Excel(name = "支付类型：随行付：sxf")
     private String payType;
 
     /** 支付方式：02公众号，03小程序 */
-    @Excel(name = "支付方式：02公众号，03小程序")
     private String payWay;
 
     /** 加油员 */
@@ -151,34 +126,30 @@ public class PayOrder extends BaseEntity
 
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+  //  @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date payDate;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    //@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdDate;
 
     /** 订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
-    @Excel(name = "订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
+
     private String orderType;
 
     /** 车牌号 */
-    @Excel(name = "车牌号")
     private String carNo;
 
     /** 客户电话 */
-    @Excel(name = "客户电话")
     private String customerPhone;
 
     /** 客户等级 */
-    @Excel(name = "客户等级")
     private String customerGrade;
 
     /** pos支付金额 */
-    @Excel(name = "汽油金额")
     private BigDecimal qyAmt;
-    @Excel(name = "柴油金额")
+
     private BigDecimal cyAmt;
 
     /**
@@ -189,7 +160,7 @@ public class PayOrder extends BaseEntity
     private String likeConsumer;
     //车牌号
     private String likeCarNo;
-    //客户电话
+    //ke
     private String likeCustomerPhone;
 
     public String getLikeCustomerPhone() {

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassStructure.java

@@ -26,7 +26,6 @@ public class StationClassStructure extends BaseEntity
     private String orderNo;
 
     /** 油站id */
-    @Excel(name = "油站id")
     private Long stationId;
 
     /** 油站名称 */
@@ -46,11 +45,9 @@ public class StationClassStructure extends BaseEntity
     private BigDecimal oilPirce;
 
     /** 油品类型（柴油，汽油） */
-    @Excel(name = "油品类型", readConverterExp = "柴=油，汽油")
     private String oilType;
 
     /** 用户（app_user_info  id消费者id） */
-    @Excel(name = "用户", readConverterExp = "a=pp_user_info,i=d消费者id")
     private Long consumerId;
 
     /** 消费者 */
@@ -66,11 +63,11 @@ public class StationClassStructure extends BaseEntity
     private BigDecimal  orderLiters;
 
     /** 支付类型 sxf */
-    @Excel(name = "支付类型 sxf")
+
     private String payType;
 
     /** 支付方式：02公众号 03小程序 */
-    @Excel(name = "支付方式：02公众号 03小程序")
+
     private String payWay;
 
     /** 支付时间 */
@@ -83,11 +80,10 @@ public class StationClassStructure extends BaseEntity
     private String oilPersonnel;
 
     /** 订单类型订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
-    @Excel(name = "订单类型订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
     private String orderType;
 
     /** 打印小票数（含重复） */
-    @Excel(name = "打印小票数", readConverterExp = "含=重复")
+    @Excel(name = "打印小票数")
     private Long printNum;
 
     /** 班次号 */
@@ -96,12 +92,12 @@ public class StationClassStructure extends BaseEntity
 
     /** 班结开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "班结开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "班次开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date classStartDate;
 
     /** 班结时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "班结时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "班次结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date classStructureDate;
 
     /** 班结人 */
@@ -109,13 +105,11 @@ public class StationClassStructure extends BaseEntity
     private String classStructureMan;
 
     /** 油品 */
-    @Excel(name = "油品")
+
     private String oils;
     /** like 查询班结号 */
-    @Excel(name = "根据班结号模糊查询")
     private String likeClassStructureNo;
     /** like 返回参数 */
-    @Excel(name = "返回参数")
     private Integer num;
 
     public BigDecimal getAmt() {

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="customerGrade"    column="customer_grade"    />
     </resultMap>
 
+
     <sql id="selectPayOrderVo">
         select order_id, order_no, station_id, station_name, status, consumer_id, consumer, oil_gun, oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel, pay_date, created_date, order_type, car_no, customer_phone, customer_grade from pay_order
     </sql>
@@ -97,9 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by order_id desc
     </select>
+
     <!--查询导出数据-->
     <select id="selectPayOrderExport" parameterType="PayOrder" resultMap="PayOrderResult">
         select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way
+        from pay_order
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -183,8 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 <!--  导出数据-->
     <select id="selectStationClassStructureExport" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
-        SELECT order_no,station_name,oil_gun,oil_name,oil_pirce,amt,order_liters,pay_date,consumer,oil_personnel,print_num,class_structure_no
-        from station_class_structure
+        <include refid="selectStationClassStructureVo"/>
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>

Yijia-SaaS/yijia-station/target/classes/mapper/station/PayOrderMapper.xml

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="customerGrade"    column="customer_grade"    />
     </resultMap>
 
+
     <sql id="selectPayOrderVo">
         select order_id, order_no, station_id, station_name, status, consumer_id, consumer, oil_gun, oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel, pay_date, created_date, order_type, car_no, customer_phone, customer_grade from pay_order
     </sql>
@@ -91,10 +92,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="likeConsumer != null  and likeConsumer != ''"> and customer  like concat('%',#{likeConsumer}, '%')</if>
+            <if test="likeCarNo != null  and likeCarNo != ''"> and car_no  like concat('%',#{likeCarNo}, '%') </if>
+            <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+        </where>
+        order by order_id desc
+    </select>
+
+    <!--查询导出数据-->
+    <select id="selectPayOrderExport" parameterType="PayOrder" resultMap="PayOrderResult">
+        select order_no,oil_name,oil_pirce,order_liters, amt,consumer,oil_personnel,oil_gun,pay_type,pay_way
+        from pay_order
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
+            <if test="printCount != null "> and print_count = #{printCount}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
+            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
         </where>
         order by order_id desc
     </select>
-    
     <select id="selectPayOrderById" parameterType="Long" resultMap="PayOrderResult">
         <include refid="selectPayOrderVo"/>
         where order_id = #{orderId}
@@ -105,10 +155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
     </select>
@@ -118,10 +168,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
         GROUP BY oil_type
@@ -132,19 +182,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
     </select>
+    <!--日报数据-->
     <select id="selectDayReport" parameterType="Long" resultMap="PayOrderResult">
         SELECT date_format( b.pay_date, '%Y-%m-%d' ) as pay_date,sum(b.amt) as amt,sum(b.qyamt) as qy_amt, sum(b.cyamt) as cy_amt,sum(b.order_liters) as order_liters ,count(b.order_no) order_no ,sum(b.member_amt) as menber_amt
         from (SELECT a.*,(SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=2) as qyamt , (SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=1) as cyamt
         from pay_order a) b
         GROUP BY  date_format( pay_date, '%Y-%m-%d' )
     </select>
+<!-- 日报折线图油品数据-->
+    <select id="listQydata" parameterType="Long" resultMap="PayOrderResult">
+        SELECT sum(amt) as amt,date_format(created_date,'%Y-%m-%d')  as created_date
+        from pay_order
+        <where>
+            <if test="oilName != null "> and oil_name = #{oilName}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY oil_name ,date_format(created_date,'%Y-%m-%d')
+    </select>
+<!-- 日报折线图X轴数据-->
+    <select id="listXdata" parameterType="Long" resultMap="PayOrderResult">
+        SELECT date_format(created_date,'%Y-%m-%d')  as created_date
+        from pay_order
+        <where>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY date_format(created_date,'%Y-%m-%d')
+    </select>
     <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into pay_order
         <trim prefix="(" suffix=")" suffixOverrides=",">

Yijia-SaaS/yijia-station/target/classes/mapper/station/StationClassStructureMapper.xml

@@ -175,8 +175,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT *  from
         station_class_structure
         where id =(SELECT max(id) from station_class_structure
-            where class_structure_man =#{classStructureMan})
+            <where>
+                <if test="classStructureMan != null and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+                <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            </where>
+        )
     </select>
+<!--  导出数据-->
+    <select id="selectStationClassStructureExport" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="classStartDate != null "> and class_start_date = #{classStartDate}</if>
+            <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
+            <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+            <if test="oils != null  and oils != ''"> and oils = #{oils}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
+            <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
+            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+        </where>
+        order by  id desc
+    </select>
+
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure
         <trim prefix="(" suffix=")" suffixOverrides=",">

Yijia-SaaS/yijia-station/target/classes/mapper/station/StationDeviceManageMapper.xml

@@ -42,10 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_id = #{deviceId}
     </select>
         
-    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage">
+    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage" useGeneratedKeys="true" keyProperty="deviceId">
         insert into station_device_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">device_id,</if>
             <if test="deviceNo != null">device_no,</if>
             <if test="deviceName != null">device_name,</if>
             <if test="stationId != null">station_id,</if>
@@ -57,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceFactory != null">device_factory,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">#{deviceId},</if>
             <if test="deviceNo != null">#{deviceNo},</if>
             <if test="deviceName != null">#{deviceName},</if>
             <if test="stationId != null">#{stationId},</if>

Yijia-SaaS/yijia-station/target/classes/mapper/station/StationOilPriceAdjustMapper.xml

@@ -35,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="oilPriceId != null "> and oil_price_id = #{oilPriceId}</if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(take_effect_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
         </where>
         order by adjust_price_id desc
     </select>

Yijia-SaaS/yijia-station/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Dec 24 16:29:31 CST 2020
+#Wed Jan 13 11:21:32 CST 2021
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

Yijia-SaaS/yijia-station/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,16 +1,20 @@
+com\yijia\station\service\impl\StationClassesSummaryServiceImpl.class
 com\yijia\station\service\IStationNoticeService.class
 com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.class
 com\yijia\station\controller\StationOilPriceAdjustController.class
 com\yijia\station\service\impl\PayOrderServiceImpl.class
 com\yijia\station\service\impl\StationPayServiceImpl.class
+com\yijia\station\service\IStationClassesSummaryService.class
 com\yijia\station\mapper\StationOilGunMapper.class
 com\yijia\station\controller\StationNoticeController.class
+com\yijia\station\domain\StationClassesSummary.class
 com\yijia\station\domain\PayOrder.class
 com\yijia\station\controller\StationDeviceManageController.class
 com\yijia\station\controller\StationPersonnelController.class
 com\yijia\station\mapper\StationNoticeMapper.class
 com\yijia\station\mapper\StationPersonnelMapper.class
 com\yijia\station\controller\StationOilPriceController.class
+com\yijia\station\controller\StationClassesSummaryController.class
 com\yijia\station\controller\PayOrderController.class
 com\yijia\station\service\impl\StationInfoServiceImpl.class
 com\yijia\station\service\impl\StationDeviceManageServiceImpl.class
@@ -34,6 +38,7 @@ com\yijia\station\service\IStationInfoService.class
 com\yijia\station\domain\StationPersonnel.class
 com\yijia\station\controller\StationOilGunController.class
 com\yijia\station\service\IStationOilPriceService.class
+com\yijia\station\mapper\StationClassesSummaryMapper.class
 com\yijia\station\domain\StationNotice.class
 com\yijia\station\service\impl\StationClassStructureServiceImpl.class
 com\yijia\station\domain\StationDeviceManage.class