班结管理

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

@@ -1,6 +1,10 @@
 package com.yijia.station.controller;
 
+import java.util.Date;
 import java.util.List;
+
+import com.yijia.station.domain.PayOrder;
+import com.yijia.station.service.IPayOrderService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +36,9 @@ public class StationClassStructureController extends BaseController
 {
     @Autowired
     private IStationClassStructureService stationClassStructureService;
+    @Autowired
+    private IPayOrderService payOrderService;
+
 
     /**
      * 查询班结管理列表
@@ -45,6 +52,17 @@ public class StationClassStructureController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 根据员工汇总
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:listPersonnelStructure')")
+    @GetMapping("/listPersonnelStructure")
+    public TableDataInfo listPersonnelStructure(StationClassStructure stationClassStructure)
+    {
+        List<StationClassStructure> list = stationClassStructureService.listPersonnelStructure(stationClassStructure);
+        return getDataTable(list);
+    }
     /**
      * 导出班结管理列表
      */
@@ -76,7 +94,80 @@ public class StationClassStructureController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationClassStructure stationClassStructure)
     {
-        return toAjax(stationClassStructureService.insertStationClassStructure(stationClassStructure));
+        //获取当前班结油站
+       // Long stationId=stationClassStructure.getStationId();
+        Long stationId= Long.valueOf("1");
+        String stationName=stationClassStructure.getStationName();
+        String username = stationClassStructure.getClassStructureMan();
+        //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
+        StationClassStructure classes =new StationClassStructure();
+        classes.setStationId(stationId);
+        //查询出上次班结，最后一条数据
+        StationClassStructure sss =stationClassStructureService.selectStationClassStructureMax(classes);
+        //当前时间
+        Date date= new Date();
+        int i=0;
+        if(sss!=null){
+            //获取上次班结时间
+            PayOrder order=new PayOrder();
+            order.setStationId(stationId);
+            order.setBeginTime(sss.getClassStructureDate().toString());
+            order.setEndTime(date.toString());
+            List<PayOrder> list = payOrderService.selectPayOrderList(order);
+            for(PayOrder payOrder:list){
+                StationClassStructure stationclass =new StationClassStructure();
+                stationclass.setStationId(payOrder.getStationId());
+                stationclass.setClassStructureMan(username);
+                stationclass.setClassStructureDate(date);
+                stationclass.setOrderNo(payOrder.getOrderNo());
+                stationclass.setOilGun(payOrder.getOilGun());
+                stationclass.setOilName(payOrder.getOilName());
+                stationclass.setConsumerId(payOrder.getConsumerId());
+                stationclass.setConsumer(payOrder.getConsumer());
+                stationclass.setAmt(payOrder.getAmt());
+                stationclass.setOrderLiters(payOrder.getOrderLiters());
+                stationclass.setPayWay(payOrder.getPayWay());
+                stationclass.setPayType(payOrder.getPayType());
+                stationclass.setPayDate(payOrder.getPayDate());
+                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                stationclass.setOrderType(payOrder.getOrderType());
+                //stationclass.setOilType();
+                //stationclass.getPrintNum();
+                //stationclass
+                i= stationClassStructureService.insertStationClassStructure(stationclass);
+            }
+        }else{
+            //初次班结 班结时间默认为当前时间，班结人username
+            //根据班结时间查询订单
+
+            PayOrder order=new PayOrder();
+            order.setStationId(stationId);
+            order.setEndTime(date.toString());
+            List<PayOrder> list = payOrderService.selectPayOrderList(order);
+            for(PayOrder payOrder:list){
+                StationClassStructure stationclass =new StationClassStructure();
+                stationclass.setStationId(payOrder.getStationId());
+                stationclass.setClassStructureMan(username);
+                stationclass.setClassStructureDate(date);
+                stationclass.setOrderNo(payOrder.getOrderNo());
+                stationclass.setOilGun(payOrder.getOilGun());
+                stationclass.setOilName(payOrder.getOilName());
+                stationclass.setConsumerId(payOrder.getConsumerId());
+                stationclass.setConsumer(payOrder.getConsumer());
+                stationclass.setAmt(payOrder.getAmt());
+                stationclass.setOrderLiters(payOrder.getOrderLiters());
+                stationclass.setPayWay(payOrder.getPayWay());
+                stationclass.setPayType(payOrder.getPayType());
+                stationclass.setPayDate(payOrder.getPayDate());
+                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                stationclass.setOrderType(payOrder.getOrderType());
+                //stationclass.setOilType();
+                //stationclass.getPrintNum();
+               //stationclass
+               i= stationClassStructureService.insertStationClassStructure(stationclass);
+            }
+        }
+        return toAjax(i);
     }
 
     /**

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

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 班结管理对象 station_class_structure
  * 
  * @author yijia
- * @date 2020-12-14
+ * @date 2020-12-24
  */
 public class StationClassStructure extends BaseEntity
 {
@@ -20,45 +20,66 @@ public class StationClassStructure extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 油站id */
+    @Excel(name = "油站id")
     private Long stationId;
 
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNo;
+
+    /** 加油枪号 */
+    @Excel(name = "加油枪号")
+    private String oilGun;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 用户（app_user_info  id消费者id） */
+    @Excel(name = "用户", readConverterExp = "a=pp_user_info,i=d消费者id")
+    private Long consumerId;
+
+    /** 消费者 */
+    @Excel(name = "消费者")
+    private String consumer;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private String amt;
+
     /** 油站名称 */
     @Excel(name = "油站名称")
     private String stationName;
 
-    /** 员工姓名 */
-    @Excel(name = "员工姓名")
-    private String person;
-
-    /** 负责枪号 */
-    @Excel(name = "负责枪号")
-    private String gunNo;
+    /** 加油升数· */
+    @Excel(name = "加油升数·")
+    private String orderLiters;
 
-    /** 销量 */
-    @Excel(name = "销量")
-    private String salesVolume;
+    /** 支付类型 sxf */
+    @Excel(name = "支付类型 sxf")
+    private String payType;
 
-    /** 销额 */
-    @Excel(name = "销额")
-    private String salesAmount;
+    /** 支付方式：02公众号 03小程序 */
+    @Excel(name = "支付方式：02公众号 03小程序")
+    private String payWay;
 
-    /** 优惠 */
-    @Excel(name = "优惠")
-    private String discount;
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payDate;
 
-    /** 优惠券 */
-    @Excel(name = "优惠券")
-    private String coupon;
+    /** 加油员人名 */
+    @Excel(name = "加油员人名")
+    private String oilPersonnel;
 
-    /** 实收 */
-    @Excel(name = "实收")
-    private String netReceipts;
+    /** 订单类型订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
+    @Excel(name = "订单类型订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
+    private String orderType;
 
-    /** 销售笔数 */
-    @Excel(name = "销售笔数")
-    private Long salesNum;
+    /** 油品类型（柴油，汽油） */
+    @Excel(name = "油品类型", readConverterExp = "柴=油，汽油")
+    private String oilType;
 
     /** 打印小票数（含重复） */
     @Excel(name = "打印小票数", readConverterExp = "含=重复")
@@ -77,6 +98,10 @@ public class StationClassStructure extends BaseEntity
     @Excel(name = "班结人")
     private String classStructureMan;
 
+    /** 油品 */
+    @Excel(name = "油品")
+    private String oils;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -95,86 +120,131 @@ public class StationClassStructure extends BaseEntity
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setOrderNo(String orderNo) 
     {
-        this.stationName = stationName;
+        this.orderNo = orderNo;
     }
 
-    public String getStationName() 
+    public String getOrderNo() 
     {
-        return stationName;
+        return orderNo;
+    }
+    public void setOilGun(String oilGun) 
+    {
+        this.oilGun = oilGun;
+    }
+
+    public String getOilGun() 
+    {
+        return oilGun;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
     }
-    public void setPerson(String person) 
+    public void setConsumerId(Long consumerId) 
     {
-        this.person = person;
+        this.consumerId = consumerId;
     }
 
-    public String getPerson() 
+    public Long getConsumerId() 
     {
-        return person;
+        return consumerId;
     }
-    public void setGunNo(String gunNo) 
+    public void setConsumer(String consumer) 
     {
-        this.gunNo = gunNo;
+        this.consumer = consumer;
     }
 
-    public String getGunNo() 
+    public String getConsumer() 
     {
-        return gunNo;
+        return consumer;
     }
-    public void setSalesVolume(String salesVolume) 
+    public void setAmt(String amt) 
     {
-        this.salesVolume = salesVolume;
+        this.amt = amt;
     }
 
-    public String getSalesVolume() 
+    public String getAmt() 
     {
-        return salesVolume;
+        return amt;
     }
-    public void setSalesAmount(String salesAmount) 
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setOrderLiters(String orderLiters) 
+    {
+        this.orderLiters = orderLiters;
+    }
+
+    public String getOrderLiters() 
     {
-        this.salesAmount = salesAmount;
+        return orderLiters;
+    }
+    public void setPayType(String payType) 
+    {
+        this.payType = payType;
+    }
+
+    public String getPayType() 
+    {
+        return payType;
+    }
+    public void setPayWay(String payWay) 
+    {
+        this.payWay = payWay;
     }
 
-    public String getSalesAmount() 
+    public String getPayWay() 
     {
-        return salesAmount;
+        return payWay;
     }
-    public void setDiscount(String discount) 
+    public void setPayDate(Date payDate) 
     {
-        this.discount = discount;
+        this.payDate = payDate;
     }
 
-    public String getDiscount() 
+    public Date getPayDate() 
     {
-        return discount;
+        return payDate;
     }
-    public void setCoupon(String coupon) 
+    public void setOilPersonnel(String oilPersonnel) 
     {
-        this.coupon = coupon;
+        this.oilPersonnel = oilPersonnel;
     }
 
-    public String getCoupon() 
+    public String getOilPersonnel() 
     {
-        return coupon;
+        return oilPersonnel;
     }
-    public void setNetReceipts(String netReceipts) 
+    public void setOrderType(String orderType) 
     {
-        this.netReceipts = netReceipts;
+        this.orderType = orderType;
     }
 
-    public String getNetReceipts() 
+    public String getOrderType() 
     {
-        return netReceipts;
+        return orderType;
     }
-    public void setSalesNum(Long salesNum) 
+    public void setOilType(String oilType) 
     {
-        this.salesNum = salesNum;
+        this.oilType = oilType;
     }
 
-    public Long getSalesNum() 
+    public String getOilType() 
     {
-        return salesNum;
+        return oilType;
     }
     public void setPrintNum(Long printNum) 
     {
@@ -212,25 +282,40 @@ public class StationClassStructure extends BaseEntity
     {
         return classStructureMan;
     }
+    public void setOils(String oils) 
+    {
+        this.oils = oils;
+    }
+
+    public String getOils() 
+    {
+        return oils;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("stationId", getStationId())
+            .append("orderNo", getOrderNo())
+            .append("oilGun", getOilGun())
+            .append("oilName", getOilName())
+            .append("consumerId", getConsumerId())
+            .append("consumer", getConsumer())
+            .append("amt", getAmt())
             .append("stationName", getStationName())
-            .append("person", getPerson())
-            .append("gunNo", getGunNo())
-            .append("salesVolume", getSalesVolume())
-            .append("salesAmount", getSalesAmount())
-            .append("discount", getDiscount())
-            .append("coupon", getCoupon())
-            .append("netReceipts", getNetReceipts())
-            .append("salesNum", getSalesNum())
+            .append("orderLiters", getOrderLiters())
+            .append("payType", getPayType())
+            .append("payWay", getPayWay())
+            .append("payDate", getPayDate())
+            .append("oilPersonnel", getOilPersonnel())
+            .append("orderType", getOrderType())
+            .append("oilType", getOilType())
             .append("printNum", getPrintNum())
             .append("classStructureNo", getClassStructureNo())
             .append("classStructureDate", getClassStructureDate())
             .append("classStructureMan", getClassStructureMan())
+            .append("oils", getOils())
             .toString();
     }
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationClassStructureMapper.java

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationClassStructure;
  * 班结管理Mapper接口
  * 
  * @author yijia
- * @date 2020-12-14
+ * @date 2020-12-24
  */
 public interface StationClassStructureMapper 
 {
@@ -58,4 +58,13 @@ public interface StationClassStructureMapper
      * @return 结果
      */
     public int deleteStationClassStructureByIds(Long[] ids);
+
+    public StationClassStructure selectStationClassStructureMax(StationClassStructure classes);
+
+    /**
+     * 根据员工汇总班结数据
+     * @param stationClassStructure
+     * @return
+     */
+    public  List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationClassStructureService.java

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationClassStructure;
  * 班结管理Service接口
  * 
  * @author yijia
- * @date 2020-12-14
+ * @date 2020-12-24
  */
 public interface IStationClassStructureService 
 {
@@ -58,4 +58,13 @@ public interface IStationClassStructureService
      * @return 结果
      */
     public int deleteStationClassStructureById(Long id);
+
+    public StationClassStructure selectStationClassStructureMax(StationClassStructure classes);
+
+    /**
+     * 根据员工汇总班结数据
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationClassStructureServiceImpl.java

@@ -11,7 +11,7 @@ import com.yijia.station.service.IStationClassStructureService;
  * 班结管理Service业务层处理
  * 
  * @author yijia
- * @date 2020-12-14
+ * @date 2020-12-24
  */
 @Service
 public class StationClassStructureServiceImpl implements IStationClassStructureService 
@@ -90,4 +90,27 @@ public class StationClassStructureServiceImpl implements IStationClassStructureS
     {
         return stationClassStructureMapper.deleteStationClassStructureById(id);
     }
+
+    /**
+     * 查询班结数据
+     * @param classes
+     * @return
+     */
+    @Override
+    public StationClassStructure selectStationClassStructureMax(StationClassStructure classes) {
+
+        return stationClassStructureMapper.selectStationClassStructureMax(classes);
+    }
+
+    /**
+     * 根据员工汇总
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure) {
+        stationClassStructure.setStationId(Long.valueOf("1"));
+        List<StationClassStructure>  list =stationClassStructureMapper.listPersonnelStructure(stationClassStructure);
+        return list;
+    }
 }

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

@@ -7,83 +7,119 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="StationClassStructure" id="StationClassStructureResult">
         <result property="id"    column="id"    />
         <result property="stationId"    column="station_id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="oilGun"    column="oil_gun"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
+        <result property="amt"    column="amt"    />
         <result property="stationName"    column="station_name"    />
-        <result property="person"    column="person"    />
-        <result property="gunNo"    column="gun_no"    />
-        <result property="salesVolume"    column="sales_volume"    />
-        <result property="salesAmount"    column="sales_amount"    />
-        <result property="discount"    column="discount"    />
-        <result property="coupon"    column="coupon"    />
-        <result property="netReceipts"    column="net_receipts"    />
-        <result property="salesNum"    column="sales_num"    />
+        <result property="orderLiters"    column="order_liters"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="payWay"    column="pay_way"    />
+        <result property="payDate"    column="pay_date"    />
+        <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="oilType"    column="oil_type"    />
         <result property="printNum"    column="print_num"    />
         <result property="classStructureNo"    column="class_structure_no"    />
         <result property="classStructureDate"    column="class_structure_date"    />
         <result property="classStructureMan"    column="class_structure_man"    />
+        <result property="oils"    column="oils"    />
     </resultMap>
 
     <sql id="selectStationClassStructureVo">
-        select id, station_id, station_name, person, gun_no, sales_volume, sales_amount, discount, coupon, net_receipts, sales_num, print_num, class_structure_no, class_structure_date, class_structure_man from station_class_structure
+        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_structure_date, class_structure_man, oils from station_class_structure
     </sql>
 
     <select id="selectStationClassStructureList" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         <where>  
             <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</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="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null  and amt != ''"> and amt = #{amt}</if>
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="person != null  and person != ''"> and person = #{person}</if>
-            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
-            <if test="salesVolume != null  and salesVolume != ''"> and sales_volume = #{salesVolume}</if>
-            <if test="salesAmount != null  and salesAmount != ''"> and sales_amount = #{salesAmount}</if>
-            <if test="discount != null  and discount != ''"> and discount = #{discount}</if>
-            <if test="coupon != null  and coupon != ''"> and coupon = #{coupon}</if>
-            <if test="netReceipts != null  and netReceipts != ''"> and net_receipts = #{netReceipts}</if>
-            <if test="salesNum != null "> and sales_num = #{salesNum}</if>
+            <if test="orderLiters != null  and orderLiters != ''"> 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="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
             <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</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>
         </where>
     </select>
-    
+    <select id="selectStationClassStructureMax" parameterType="Long" resultMap="StationClassStructureResult">
+        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_structure_date, class_structure_man, oils from station_class_structure
+        where id = (select max(id)
+        from station_class_structure where station_id = #{stationId});
+    </select>
     <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         where id = #{id}
     </select>
+    <!--根据盐工汇总班结数据-->
+    <select id="listPersonnelStructure" parameterType="Long" resultMap="StationClassStructureResult">
+        SELECT a.oil_personnel,b.gun_no,ROUND(sum(a.order_liters),2) as order_liters,ROUND(SUM(a.amt),2) as amt,COUNT(a.order_no) counts
+        from station_class_structure a
+        join station_personnel b  on a.oil_personnel=b.personnel_name and a.station_id = b.station_id
+        where a.station_id = #{stationId}
+        GROUP BY a.oil_personnel,b.gun_no
+    </select>
         
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stationId != null">station_id,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="oilGun != null">oil_gun,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
+            <if test="amt != null">amt,</if>
             <if test="stationName != null">station_name,</if>
-            <if test="person != null">person,</if>
-            <if test="gunNo != null">gun_no,</if>
-            <if test="salesVolume != null">sales_volume,</if>
-            <if test="salesAmount != null">sales_amount,</if>
-            <if test="discount != null">discount,</if>
-            <if test="coupon != null">coupon,</if>
-            <if test="netReceipts != null">net_receipts,</if>
-            <if test="salesNum != null">sales_num,</if>
+            <if test="orderLiters != null">order_liters,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="payWay != null">pay_way,</if>
+            <if test="payDate != null">pay_date,</if>
+            <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="oilType != null">oil_type,</if>
             <if test="printNum != null">print_num,</if>
             <if test="classStructureNo != null">class_structure_no,</if>
             <if test="classStructureDate != null">class_structure_date,</if>
             <if test="classStructureMan != null">class_structure_man,</if>
+            <if test="oils != null">oils,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationId != null">#{stationId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="oilGun != null">#{oilGun},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
+            <if test="amt != null">#{amt},</if>
             <if test="stationName != null">#{stationName},</if>
-            <if test="person != null">#{person},</if>
-            <if test="gunNo != null">#{gunNo},</if>
-            <if test="salesVolume != null">#{salesVolume},</if>
-            <if test="salesAmount != null">#{salesAmount},</if>
-            <if test="discount != null">#{discount},</if>
-            <if test="coupon != null">#{coupon},</if>
-            <if test="netReceipts != null">#{netReceipts},</if>
-            <if test="salesNum != null">#{salesNum},</if>
+            <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="payWay != null">#{payWay},</if>
+            <if test="payDate != null">#{payDate},</if>
+            <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="oilType != null">#{oilType},</if>
             <if test="printNum != null">#{printNum},</if>
             <if test="classStructureNo != null">#{classStructureNo},</if>
             <if test="classStructureDate != null">#{classStructureDate},</if>
             <if test="classStructureMan != null">#{classStructureMan},</if>
+            <if test="oils != null">#{oils},</if>
          </trim>
     </insert>
 
@@ -91,19 +127,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update station_class_structure
         <trim prefix="SET" suffixOverrides=",">
             <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="oilGun != null">oil_gun = #{oilGun},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</if>
+            <if test="amt != null">amt = #{amt},</if>
             <if test="stationName != null">station_name = #{stationName},</if>
-            <if test="person != null">person = #{person},</if>
-            <if test="gunNo != null">gun_no = #{gunNo},</if>
-            <if test="salesVolume != null">sales_volume = #{salesVolume},</if>
-            <if test="salesAmount != null">sales_amount = #{salesAmount},</if>
-            <if test="discount != null">discount = #{discount},</if>
-            <if test="coupon != null">coupon = #{coupon},</if>
-            <if test="netReceipts != null">net_receipts = #{netReceipts},</if>
-            <if test="salesNum != null">sales_num = #{salesNum},</if>
+            <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="payWay != null">pay_way = #{payWay},</if>
+            <if test="payDate != null">pay_date = #{payDate},</if>
+            <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="oilType != null">oil_type = #{oilType},</if>
             <if test="printNum != null">print_num = #{printNum},</if>
             <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>
             <if test="classStructureDate != null">class_structure_date = #{classStructureDate},</if>
             <if test="classStructureMan != null">class_structure_man = #{classStructureMan},</if>
+            <if test="oils != null">oils = #{oils},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.PayOrderMapper">
+
+    <resultMap type="PayOrder" id="PayOrderResult">
+        <result property="orderId"    column="order_id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="oilGun"    column="oil_gun"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
+        <result property="amt"    column="amt"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="status"    column="status"    />
+        <result property="orderLiters"    column="order_liters"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="payWay"    column="pay_way"    />
+        <result property="payDate"    column="pay_date"    />
+        <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="createdDate"    column="created_date"    />
+        <result property="orderType"    column="order_type"    />
+    </resultMap>
+
+    <sql id="selectPayOrderVo">
+        select order_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_id, status, order_liters, pay_type, pay_way, pay_date, oil_personnel, created_date, order_type from pay_order
+    </sql>
+
+    <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
+        <include refid="selectPayOrderVo"/>
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</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="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null  and amt != ''"> and amt = #{amt}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="orderLiters != null  and orderLiters != ''"> 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="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+        </where>
+        ORDER BY created_date DESC
+    </select>
+
+    <select id="selectPayOrderById" parameterType="Long" resultMap="PayOrderResult">
+        <include refid="selectPayOrderVo"/>
+        where order_id = #{orderId}
+    </select>
+
+    <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
+        insert into pay_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">order_no,</if>
+            <if test="oilGun != null">oil_gun,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
+            <if test="amt != null">amt,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="status != null">status,</if>
+            <if test="orderLiters != null">order_liters,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="payWay != null">pay_way,</if>
+            <if test="payDate != null">pay_date,</if>
+            <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="createdDate != null">created_date,</if>
+            <if test="orderType != null">order_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="oilGun != null">#{oilGun},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="status != null">#{status},</if>
+            <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="payWay != null">#{payWay},</if>
+            <if test="payDate != null">#{payDate},</if>
+            <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="createdDate != null">#{createdDate},</if>
+            <if test="orderType != null">#{orderType},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePayOrder" parameterType="PayOrder">
+        update pay_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="oilGun != null">oil_gun = #{oilGun},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="payWay != null">pay_way = #{payWay},</if>
+            <if test="payDate != null">pay_date = #{payDate},</if>
+            <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
+            <if test="createdDate != null">created_date = #{createdDate},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+        </trim>
+        where order_id = #{orderId}
+    </update>
+
+    <delete id="deletePayOrderById" parameterType="Long">
+        delete from pay_order where order_id = #{orderId}
+    </delete>
+
+    <delete id="deletePayOrderByIds" parameterType="String">
+        delete from pay_order where order_id in
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationClassStructureMapper">
+    
+    <resultMap type="StationClassStructure" id="StationClassStructureResult">
+        <result property="id"    column="id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="oilGun"    column="oil_gun"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
+        <result property="amt"    column="amt"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="orderLiters"    column="order_liters"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="payWay"    column="pay_way"    />
+        <result property="payDate"    column="pay_date"    />
+        <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="oilType"    column="oil_type"    />
+        <result property="printNum"    column="print_num"    />
+        <result property="classStructureNo"    column="class_structure_no"    />
+        <result property="classStructureDate"    column="class_structure_date"    />
+        <result property="classStructureMan"    column="class_structure_man"    />
+        <result property="oils"    column="oils"    />
+    </resultMap>
+
+    <sql id="selectStationClassStructureVo">
+        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_structure_date, class_structure_man, oils from station_class_structure
+    </sql>
+
+    <select id="selectStationClassStructureList" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        <where>  
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</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="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null  and amt != ''"> and amt = #{amt}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="orderLiters != null  and orderLiters != ''"> 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="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</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>
+        </where>
+    </select>
+    <select id="selectStationClassStructureMax" parameterType="Long" resultMap="StationClassStructureResult">
+        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_structure_date, class_structure_man, oils from station_class_structure
+        where id = (select max(id)
+        from station_class_structure where station_id = #{stationId});
+    </select>
+    <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        where id = #{id}
+    </select>
+    <!--根据盐工汇总班结数据-->
+    <select id="listPersonnelStructure" parameterType="Long" resultMap="StationClassStructureResult">
+        SELECT a.oil_personnel,b.gun_no,ROUND(sum(a.order_liters),2) as order_liters,ROUND(SUM(a.amt),2) as amt,COUNT(a.order_no) counts
+        from station_class_structure a
+        join station_personnel b  on a.oil_personnel=b.personnel_name and a.station_id = b.station_id
+        where a.station_id = #{stationId}
+        GROUP BY a.oil_personnel,b.gun_no
+    </select>
+        
+    <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
+        insert into station_class_structure
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="oilGun != null">oil_gun,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
+            <if test="amt != null">amt,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="orderLiters != null">order_liters,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="payWay != null">pay_way,</if>
+            <if test="payDate != null">pay_date,</if>
+            <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="oilType != null">oil_type,</if>
+            <if test="printNum != null">print_num,</if>
+            <if test="classStructureNo != null">class_structure_no,</if>
+            <if test="classStructureDate != null">class_structure_date,</if>
+            <if test="classStructureMan != null">class_structure_man,</if>
+            <if test="oils != null">oils,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="oilGun != null">#{oilGun},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="payWay != null">#{payWay},</if>
+            <if test="payDate != null">#{payDate},</if>
+            <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="oilType != null">#{oilType},</if>
+            <if test="printNum != null">#{printNum},</if>
+            <if test="classStructureNo != null">#{classStructureNo},</if>
+            <if test="classStructureDate != null">#{classStructureDate},</if>
+            <if test="classStructureMan != null">#{classStructureMan},</if>
+            <if test="oils != null">#{oils},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationClassStructure" parameterType="StationClassStructure">
+        update station_class_structure
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="oilGun != null">oil_gun = #{oilGun},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="payWay != null">pay_way = #{payWay},</if>
+            <if test="payDate != null">pay_date = #{payDate},</if>
+            <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="oilType != null">oil_type = #{oilType},</if>
+            <if test="printNum != null">print_num = #{printNum},</if>
+            <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>
+            <if test="classStructureDate != null">class_structure_date = #{classStructureDate},</if>
+            <if test="classStructureMan != null">class_structure_man = #{classStructureMan},</if>
+            <if test="oils != null">oils = #{oils},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteStationClassStructureById" parameterType="Long">
+        delete from station_class_structure where id = #{id}
+    </delete>
+
+    <delete id="deleteStationClassStructureByIds" parameterType="String">
+        delete from station_class_structure where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationDeviceManageMapper">
+    
+    <resultMap type="StationDeviceManage" id="StationDeviceManageResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNo"    column="device_no"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="deviceType"    column="device_type"    />
+        <result property="deviceSerialNum"    column="device_serial_num"    />
+        <result property="gunNo"    column="gun_no"    />
+        <result property="deviceStatus"    column="device_status"    />
+        <result property="deviceFactory"    column="device_factory"    />
+    </resultMap>
+
+    <sql id="selectStationDeviceManageVo">
+        select device_id, device_no, device_name, station_id, station_name, device_type, device_serial_num, gun_no, device_status, device_factory from station_device_manage
+    </sql>
+
+    <select id="selectStationDeviceManageList" parameterType="StationDeviceManage" resultMap="StationDeviceManageResult">
+        <include refid="selectStationDeviceManageVo"/>
+        <where>  
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</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="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
+            <if test="deviceSerialNum != null  and deviceSerialNum != ''"> and device_serial_num = #{deviceSerialNum}</if>
+            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
+            <if test="deviceFactory != null  and deviceFactory != ''"> and device_factory = #{deviceFactory}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationDeviceManageById" parameterType="Long" resultMap="StationDeviceManageResult">
+        <include refid="selectStationDeviceManageVo"/>
+        where device_id = #{deviceId}
+    </select>
+        
+    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage">
+        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>
+            <if test="stationName != null">station_name,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceSerialNum != null">device_serial_num,</if>
+            <if test="gunNo != null">gun_no,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <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>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceSerialNum != null">#{deviceSerialNum},</if>
+            <if test="gunNo != null">#{gunNo},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="deviceFactory != null">#{deviceFactory},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationDeviceManage" parameterType="StationDeviceManage">
+        update station_device_manage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceSerialNum != null">device_serial_num = #{deviceSerialNum},</if>
+            <if test="gunNo != null">gun_no = #{gunNo},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="deviceFactory != null">device_factory = #{deviceFactory},</if>
+        </trim>
+        where device_id = #{deviceId}
+    </update>
+
+    <delete id="deleteStationDeviceManageById" parameterType="Long">
+        delete from station_device_manage where device_id = #{deviceId}
+    </delete>
+
+    <delete id="deleteStationDeviceManageByIds" parameterType="String">
+        delete from station_device_manage where device_id in 
+        <foreach item="deviceId" collection="array" open="(" separator="," close=")">
+            #{deviceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="StationInfo" id="StationInfoResult">
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
-        <result property="stationNo"    column="station_no"    />
         <result property="stationAddress"    column="station_address"    />
         <result property="oilGunNum"    column="oil_gun_num"    />
         <result property="contacts"    column="contacts"    />
@@ -17,17 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationPic"    column="station_pic"    />
         <result property="stationLongitude"    column="station_longitude"    />
         <result property="stationLatitude"    column="station_latitude"    />
+        <result property="mno"    column="mno"    />
     </resultMap>
 
     <sql id="selectStationInfoVo">
-        select station_id, station_name, station_no, station_address, oil_gun_num, contacts, phone, station_group_id, station_group_name, station_pic, station_longitude, station_latitude from station_info
+        select station_id, station_name, station_address, oil_gun_num, contacts, phone, station_group_id, station_group_name, station_pic, station_longitude, station_latitude, mno from station_info
     </sql>
 
     <select id="selectStationInfoList" parameterType="StationInfo" resultMap="StationInfoResult">
         <include refid="selectStationInfoVo"/>
         <where>  
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="stationNo != null  and stationNo != ''"> and station_no = #{stationNo}</if>
             <if test="stationAddress != null  and stationAddress != ''"> and station_address = #{stationAddress}</if>
             <if test="oilGunNum != null "> and oil_gun_num = #{oilGunNum}</if>
             <if test="contacts != null  and contacts != ''"> and contacts = #{contacts}</if>
@@ -37,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null  and stationPic != ''"> and station_pic = #{stationPic}</if>
             <if test="stationLongitude != null  and stationLongitude != ''"> and station_longitude = #{stationLongitude}</if>
             <if test="stationLatitude != null  and stationLatitude != ''"> and station_latitude = #{stationLatitude}</if>
+            <if test="mno != null "> and mno = #{mno}</if>
         </where>
     </select>
     
@@ -50,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
-            <if test="stationNo != null">station_no,</if>
             <if test="stationAddress != null">station_address,</if>
             <if test="oilGunNum != null">oil_gun_num,</if>
             <if test="contacts != null">contacts,</if>
@@ -60,11 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">station_pic,</if>
             <if test="stationLongitude != null">station_longitude,</if>
             <if test="stationLatitude != null">station_latitude,</if>
+            <if test="mno != null">mno,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
-            <if test="stationNo != null">#{stationNo},</if>
             <if test="stationAddress != null">#{stationAddress},</if>
             <if test="oilGunNum != null">#{oilGunNum},</if>
             <if test="contacts != null">#{contacts},</if>
@@ -74,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">#{stationPic},</if>
             <if test="stationLongitude != null">#{stationLongitude},</if>
             <if test="stationLatitude != null">#{stationLatitude},</if>
+            <if test="mno != null">#{mno},</if>
          </trim>
     </insert>
 
@@ -81,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update station_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="stationName != null">station_name = #{stationName},</if>
-            <if test="stationNo != null">station_no = #{stationNo},</if>
             <if test="stationAddress != null">station_address = #{stationAddress},</if>
             <if test="oilGunNum != null">oil_gun_num = #{oilGunNum},</if>
             <if test="contacts != null">contacts = #{contacts},</if>
@@ -91,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">station_pic = #{stationPic},</if>
             <if test="stationLongitude != null">station_longitude = #{stationLongitude},</if>
             <if test="stationLatitude != null">station_latitude = #{stationLatitude},</if>
+            <if test="mno != null">mno = #{mno},</if>
         </trim>
         where station_id = #{stationId}
     </update>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationNoticeMapper">
+    
+    <resultMap type="StationNotice" id="StationNoticeResult">
+        <result property="noticeId"    column="notice_id"    />
+        <result property="fullName"    column="full_name"    />
+        <result property="phone"    column="phone"    />
+        <result property="bindDate"    column="bind_date"    />
+        <result property="bindStatus"    column="bind_status"    />
+        <result property="wxFullName"    column="wx_full_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+    </resultMap>
+
+    <sql id="selectStationNoticeVo">
+        select notice_id, full_name, phone, bind_date, bind_status, wx_full_name, station_id, station_name from station_notice
+    </sql>
+
+    <select id="selectStationNoticeList" parameterType="StationNotice" resultMap="StationNoticeResult">
+        <include refid="selectStationNoticeVo"/>
+        <where>  
+            <if test="fullName != null  and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="bindDate != null "> and bind_date = #{bindDate}</if>
+            <if test="bindStatus != null  and bindStatus != ''"> and bind_status = #{bindStatus}</if>
+            <if test="wxFullName != null  and wxFullName != ''"> and wx_full_name like concat('%', #{wxFullName}, '%')</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectStationNoticeById" parameterType="Long" resultMap="StationNoticeResult">
+        <include refid="selectStationNoticeVo"/>
+        where notice_id = #{noticeId}
+    </select>
+        
+    <insert id="insertStationNotice" parameterType="StationNotice" useGeneratedKeys="true" keyProperty="noticeId">
+        insert into station_notice
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fullName != null">full_name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="bindDate != null">bind_date,</if>
+            <if test="bindStatus != null">bind_status,</if>
+            <if test="wxFullName != null">wx_full_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fullName != null">#{fullName},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="bindDate != null">#{bindDate},</if>
+            <if test="bindStatus != null">#{bindStatus},</if>
+            <if test="wxFullName != null">#{wxFullName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationNotice" parameterType="StationNotice">
+        update station_notice
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fullName != null">full_name = #{fullName},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="bindDate != null">bind_date = #{bindDate},</if>
+            <if test="bindStatus != null">bind_status = #{bindStatus},</if>
+            <if test="wxFullName != null">wx_full_name = #{wxFullName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+        </trim>
+        where notice_id = #{noticeId}
+    </update>
+
+    <delete id="deleteStationNoticeById" parameterType="Long">
+        delete from station_notice where notice_id = #{noticeId}
+    </delete>
+
+    <delete id="deleteStationNoticeByIds" parameterType="String">
+        delete from station_notice where notice_id in 
+        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
+            #{noticeId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilGunMapper">
+    
+    <resultMap type="StationOilGun" id="StationOilGunResult">
+        <result property="oilGunId"    column="oil_gun_id"    />
+        <result property="oilGunNo"    column="oil_gun_no"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="date"    column="date"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectStationOilGunVo">
+        select oil_gun_id, oil_gun_no, oil_name, station_id, station_name, date, status from station_oil_gun
+    </sql>
+
+    <select id="selectStationOilGunList" parameterType="StationOilGun" resultMap="StationOilGunResult">
+        <include refid="selectStationOilGunVo"/>
+        <where>  
+            <if test="oilGunNo != null  and oilGunNo != ''"> and oil_gun_no = #{oilGunNo}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</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="date != null "> and date = #{date}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilGunById" parameterType="Long" resultMap="StationOilGunResult">
+        <include refid="selectStationOilGunVo"/>
+        where oil_gun_id = #{oilGunId}
+    </select>
+        
+    <insert id="insertStationOilGun" parameterType="StationOilGun" useGeneratedKeys="true" keyProperty="oilGunId">
+        insert into station_oil_gun
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilGunNo != null">oil_gun_no,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="date != null">date,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilGunNo != null">#{oilGunNo},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="date != null">#{date},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilGun" parameterType="StationOilGun">
+        update station_oil_gun
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilGunNo != null">oil_gun_no = #{oilGunNo},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where oil_gun_id = #{oilGunId}
+    </update>
+
+    <delete id="deleteStationOilGunById" parameterType="Long">
+        delete from station_oil_gun where oil_gun_id = #{oilGunId}
+    </delete>
+
+    <delete id="deleteStationOilGunByIds" parameterType="String">
+        delete from station_oil_gun where oil_gun_id in 
+        <foreach item="oilGunId" collection="array" open="(" separator="," close=")">
+            #{oilGunId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilPriceAdjustMapper">
+    
+    <resultMap type="StationOilPriceAdjust" id="StationOilPriceAdjustResult">
+        <result property="adjustPriceId"    column="adjust_price_id"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="oilAdjustPrice"    column="oil_adjust_price"    />
+        <result property="takeEffectStatus"    column="take_effect_status"    />
+        <result property="takeEffectDate"    column="take_effect_date"    />
+        <result property="adjustDate"    column="adjust_date"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="operator"    column="operator"    />
+    </resultMap>
+
+    <sql id="selectStationOilPriceAdjustVo">
+        select adjust_price_id, oil_name, oil_adjust_price, take_effect_status, take_effect_date, adjust_date, station_id, station_name, operator from station_oil_price_adjust
+    </sql>
+
+    <select id="selectStationOilPriceAdjustList" parameterType="StationOilPriceAdjust" resultMap="StationOilPriceAdjustResult">
+        <include refid="selectStationOilPriceAdjustVo"/>
+        <where>  
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilAdjustPrice != null  and oilAdjustPrice != ''"> and oil_adjust_price = #{oilAdjustPrice}</if>
+            <if test="takeEffectStatus != null  and takeEffectStatus != ''"> and take_effect_status = #{takeEffectStatus}</if>
+            <if test="takeEffectDate != null "> and take_effect_date = #{takeEffectDate}</if>
+            <if test="adjustDate != null "> and adjust_date = #{adjustDate}</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="operator != null  and operator != ''"> and operator = #{operator}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilPriceAdjustById" parameterType="Long" resultMap="StationOilPriceAdjustResult">
+        <include refid="selectStationOilPriceAdjustVo"/>
+        where adjust_price_id = #{adjustPriceId}
+    </select>
+        
+    <insert id="insertStationOilPriceAdjust" parameterType="StationOilPriceAdjust" useGeneratedKeys="true" keyProperty="adjustPriceId">
+        insert into station_oil_price_adjust
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">oil_name,</if>
+            <if test="oilAdjustPrice != null">oil_adjust_price,</if>
+            <if test="takeEffectStatus != null">take_effect_status,</if>
+            <if test="takeEffectDate != null">take_effect_date,</if>
+            <if test="adjustDate != null">adjust_date,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="operator != null">operator,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">#{oilName},</if>
+            <if test="oilAdjustPrice != null">#{oilAdjustPrice},</if>
+            <if test="takeEffectStatus != null">#{takeEffectStatus},</if>
+            <if test="takeEffectDate != null">#{takeEffectDate},</if>
+            <if test="adjustDate != null">#{adjustDate},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="operator != null">#{operator},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilPriceAdjust" parameterType="StationOilPriceAdjust">
+        update station_oil_price_adjust
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilAdjustPrice != null">oil_adjust_price = #{oilAdjustPrice},</if>
+            <if test="takeEffectStatus != null">take_effect_status = #{takeEffectStatus},</if>
+            <if test="takeEffectDate != null">take_effect_date = #{takeEffectDate},</if>
+            <if test="adjustDate != null">adjust_date = #{adjustDate},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="operator != null">operator = #{operator},</if>
+        </trim>
+        where adjust_price_id = #{adjustPriceId}
+    </update>
+
+    <delete id="deleteStationOilPriceAdjustById" parameterType="Long">
+        delete from station_oil_price_adjust where adjust_price_id = #{adjustPriceId}
+    </delete>
+
+    <delete id="deleteStationOilPriceAdjustByIds" parameterType="String">
+        delete from station_oil_price_adjust where adjust_price_id in 
+        <foreach item="adjustPriceId" collection="array" open="(" separator="," close=")">
+            #{adjustPriceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilPriceMapper">
+    
+    <resultMap type="StationOilPrice" id="StationOilPriceResult">
+        <result property="oilPriceId"    column="oil_price_id"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="oilPrice"    column="oil_price"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationNanme"    column="station_nanme"    />
+        <result property="date"    column="date"    />
+    </resultMap>
+
+    <sql id="selectStationOilPriceVo">
+        select oil_price_id, oil_name, oil_price, station_id, station_nanme, date from station_oil_price
+    </sql>
+
+    <select id="selectStationOilPriceList" parameterType="StationOilPrice" resultMap="StationOilPriceResult">
+        <include refid="selectStationOilPriceVo"/>
+        <where>  
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPrice != null  and oilPrice != ''"> and oil_price = #{oilPrice}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
+            <if test="date != null "> and date = #{date}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilPriceById" parameterType="Long" resultMap="StationOilPriceResult">
+        <include refid="selectStationOilPriceVo"/>
+        where oil_price_id = #{oilPriceId}
+    </select>
+        
+    <insert id="insertStationOilPrice" parameterType="StationOilPrice" useGeneratedKeys="true" keyProperty="oilPriceId">
+        insert into station_oil_price
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">oil_name,</if>
+            <if test="oilPrice != null">oil_price,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationNanme != null">station_nanme,</if>
+            <if test="date != null">date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">#{oilName},</if>
+            <if test="oilPrice != null">#{oilPrice},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationNanme != null">#{stationNanme},</if>
+            <if test="date != null">#{date},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilPrice" parameterType="StationOilPrice">
+        update station_oil_price
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilPrice != null">oil_price = #{oilPrice},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationNanme != null">station_nanme = #{stationNanme},</if>
+            <if test="date != null">date = #{date},</if>
+        </trim>
+        where oil_price_id = #{oilPriceId}
+    </update>
+
+    <delete id="deleteStationOilPriceById" parameterType="Long">
+        delete from station_oil_price where oil_price_id = #{oilPriceId}
+    </delete>
+
+    <delete id="deleteStationOilPriceByIds" parameterType="String">
+        delete from station_oil_price where oil_price_id in 
+        <foreach item="oilPriceId" collection="array" open="(" separator="," close=")">
+            #{oilPriceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationPayMapper">
+    
+    <resultMap type="StationPay" id="StationPayResult">
+        <result property="payId"    column="pay_id"    />
+        <result property="payMode"    column="pay_mode"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="imagePhotosFlag"    column="image_photos_flag"    />
+        <result property="cardEnabledFlag"    column="card_enabled_flag"    />
+        <result property="activityPic"    column="activity_pic"    />
+        <result property="preferentialWayShareFlag"    column="preferential_way_share_flag"    />
+        <result property="otherPreferentialWay"    column="other_preferential_way"    />
+        <result property="payPrintNum"    column="pay_print_num"    />
+        <result property="payCallbackPage"    column="pay_callback_page"    />
+        <result property="wsPrintFlag"    column="ws_print_flag"    />
+    </resultMap>
+
+    <sql id="selectStationPayVo">
+        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag from station_pay
+    </sql>
+
+    <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
+        <include refid="selectStationPayVo"/>
+        <where>  
+            <if test="payMode != null  and payMode != ''"> and pay_mode = #{payMode}</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="imagePhotosFlag != null  and imagePhotosFlag != ''"> and image_photos_flag = #{imagePhotosFlag}</if>
+            <if test="cardEnabledFlag != null  and cardEnabledFlag != ''"> and card_enabled_flag = #{cardEnabledFlag}</if>
+            <if test="activityPic != null  and activityPic != ''"> and activity_pic = #{activityPic}</if>
+            <if test="preferentialWayShareFlag != null  and preferentialWayShareFlag != ''"> and preferential_way_share_flag = #{preferentialWayShareFlag}</if>
+            <if test="otherPreferentialWay != null  and otherPreferentialWay != ''"> and other_preferential_way = #{otherPreferentialWay}</if>
+            <if test="payPrintNum != null "> and pay_print_num = #{payPrintNum}</if>
+            <if test="payCallbackPage != null  and payCallbackPage != ''"> and pay_callback_page = #{payCallbackPage}</if>
+            <if test="wsPrintFlag != null  and wsPrintFlag != ''"> and ws_print_flag = #{wsPrintFlag}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationPayById" parameterType="Long" resultMap="StationPayResult">
+        <include refid="selectStationPayVo"/>
+        where pay_id = #{payId}
+    </select>
+        
+    <insert id="insertStationPay" parameterType="StationPay" useGeneratedKeys="true" keyProperty="payId">
+        insert into station_pay
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="payMode != null">pay_mode,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="imagePhotosFlag != null">image_photos_flag,</if>
+            <if test="cardEnabledFlag != null">card_enabled_flag,</if>
+            <if test="activityPic != null">activity_pic,</if>
+            <if test="preferentialWayShareFlag != null">preferential_way_share_flag,</if>
+            <if test="otherPreferentialWay != null">other_preferential_way,</if>
+            <if test="payPrintNum != null">pay_print_num,</if>
+            <if test="payCallbackPage != null">pay_callback_page,</if>
+            <if test="wsPrintFlag != null">ws_print_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="payMode != null">#{payMode},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="imagePhotosFlag != null">#{imagePhotosFlag},</if>
+            <if test="cardEnabledFlag != null">#{cardEnabledFlag},</if>
+            <if test="activityPic != null">#{activityPic},</if>
+            <if test="preferentialWayShareFlag != null">#{preferentialWayShareFlag},</if>
+            <if test="otherPreferentialWay != null">#{otherPreferentialWay},</if>
+            <if test="payPrintNum != null">#{payPrintNum},</if>
+            <if test="payCallbackPage != null">#{payCallbackPage},</if>
+            <if test="wsPrintFlag != null">#{wsPrintFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationPay" parameterType="StationPay">
+        update station_pay
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="payMode != null">pay_mode = #{payMode},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="imagePhotosFlag != null">image_photos_flag = #{imagePhotosFlag},</if>
+            <if test="cardEnabledFlag != null">card_enabled_flag = #{cardEnabledFlag},</if>
+            <if test="activityPic != null">activity_pic = #{activityPic},</if>
+            <if test="preferentialWayShareFlag != null">preferential_way_share_flag = #{preferentialWayShareFlag},</if>
+            <if test="otherPreferentialWay != null">other_preferential_way = #{otherPreferentialWay},</if>
+            <if test="payPrintNum != null">pay_print_num = #{payPrintNum},</if>
+            <if test="payCallbackPage != null">pay_callback_page = #{payCallbackPage},</if>
+            <if test="wsPrintFlag != null">ws_print_flag = #{wsPrintFlag},</if>
+        </trim>
+        where pay_id = #{payId}
+    </update>
+
+    <delete id="deleteStationPayById" parameterType="Long">
+        delete from station_pay where pay_id = #{payId}
+    </delete>
+
+    <delete id="deleteStationPayByIds" parameterType="String">
+        delete from station_pay where pay_id in 
+        <foreach item="payId" collection="array" open="(" separator="," close=")">
+            #{payId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationPersonnelMapper">
+    
+    <resultMap type="StationPersonnel" id="StationPersonnelResult">
+        <result property="personnelId"    column="personnel_id"    />
+        <result property="personnelName"    column="personnel_name"    />
+        <result property="gunNo"    column="gun_no"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="personnelPhone"    column="personnel_phone"    />
+    </resultMap>
+
+    <sql id="selectStationPersonnelVo">
+        select personnel_id, personnel_name, gun_no, station_id, station_name, qr_code, personnel_phone from station_personnel
+    </sql>
+
+    <select id="selectStationPersonnelList" parameterType="StationPersonnel" resultMap="StationPersonnelResult">
+        <include refid="selectStationPersonnelVo"/>
+        <where>  
+            <if test="personnelName != null  and personnelName != ''"> and personnel_name like concat('%', #{personnelName}, '%')</if>
+            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</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="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="personnelPhone != null  and personnelPhone != ''"> and personnel_phone = #{personnelPhone}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationPersonnelById" parameterType="Long" resultMap="StationPersonnelResult">
+        <include refid="selectStationPersonnelVo"/>
+        where personnel_id = #{personnelId}
+    </select>
+        
+    <insert id="insertStationPersonnel" parameterType="StationPersonnel">
+        insert into station_personnel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">personnel_id,</if>
+            <if test="personnelName != null">personnel_name,</if>
+            <if test="gunNo != null">gun_no,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="personnelPhone != null">personnel_phone,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">#{personnelId},</if>
+            <if test="personnelName != null">#{personnelName},</if>
+            <if test="gunNo != null">#{gunNo},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="personnelPhone != null">#{personnelPhone},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationPersonnel" parameterType="StationPersonnel">
+        update station_personnel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="personnelName != null">personnel_name = #{personnelName},</if>
+            <if test="gunNo != null">gun_no = #{gunNo},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="personnelPhone != null">personnel_phone = #{personnelPhone},</if>
+        </trim>
+        where personnel_id = #{personnelId}
+    </update>
+
+    <delete id="deleteStationPersonnelById" parameterType="Long">
+        delete from station_personnel where personnel_id = #{personnelId}
+    </delete>
+
+    <delete id="deleteStationPersonnelByIds" parameterType="String">
+        delete from station_personnel where personnel_id in 
+        <foreach item="personnelId" collection="array" open="(" separator="," close=")">
+            #{personnelId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Dec 24 16:29:31 CST 2020
+version=1.0.1
+groupId=com.yijia
+artifactId=yijia-station

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

@@ -0,0 +1,53 @@
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationDeviceManageController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationNoticeController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationPersonnelMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationClassStructureService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationPersonnelController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilGunController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationNotice.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\PayOrderServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationDeviceManageServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationDeviceManage.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationPersonnel.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilGunServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilGunService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\PayOrder.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationPayMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationInfoServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationClasses.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationInfoMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationNoticeMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilGunMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationInfo.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\PayOrderController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationClassStructure.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceAdjustController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationPay.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationPayController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\task\SaticScheduleTask.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationClassStructureMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\PayOrderMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassStructureServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceAdjustService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationPersonnelService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationDeviceManageMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationPersonnelServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationInfoController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationDeviceManageService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationClassesMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationInfoService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationPayService.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilGun.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilPriceAdjust.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationClassStructureController.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationPayServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilPrice.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationNoticeServiceImpl.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceAdjustMapper.java
+D:\demo\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationNoticeService.java