增加加油员id

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

@@ -605,6 +605,7 @@ public class StationClassStructureController extends BaseController
                 stationclass.setPayType(payOrder.getPayType());
                 stationclass.setPayDate(payOrder.getPayDate());
                 stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                stationclass.setOilPersonnelId(payOrder.getOilPersonnelId());
                 stationclass.setOrderType(payOrder.getOrderType());
                 if(payOrder.getPrintCount()!=null){
                     stationclass.setPrintNum(payOrder.getPrintCount());
@@ -719,6 +720,7 @@ public class StationClassStructureController extends BaseController
                         stationclass.setPayType(payOrder.getPayType());
                         stationclass.setPayDate(payOrder.getPayDate());
                         stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                        stationclass.setOilPersonnelId(payOrder.getOilPersonnelId());
                         stationclass.setOrderType(payOrder.getOrderType());
                         if(payOrder.getPrintCount()!=null){
                             stationclass.setPrintNum(payOrder.getPrintCount());

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

@@ -127,6 +127,7 @@ public class PayOrder extends BaseEntity
     /** 加油员 */
     @Excel(name = "加油员")
     private String oilPersonnel;
+    private String oilPersonnelId;
 
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -210,6 +211,14 @@ public class PayOrder extends BaseEntity
     private Integer countNum;
 
 
+    public String getOilPersonnelId() {
+        return oilPersonnelId;
+    }
+
+    public void setOilPersonnelId(String oilPersonnelId) {
+        this.oilPersonnelId = oilPersonnelId;
+    }
+
     public BigDecimal getDriverDiscountAmt() {
         return driverDiscountAmt;
     }

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

@@ -10,7 +10,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 班结管理对象 station_class_structure
- * 
+ *
  * @author yijia
  * @date 2021-01-12
  */
@@ -219,6 +219,7 @@ public class StationClassStructure extends BaseEntity
     /** 客户等级 */
     @Excel(name = "客户等级")
     private String customerGrade;
+    private String oilPersonnelId;
 
 
     /**
@@ -232,6 +233,15 @@ public class StationClassStructure extends BaseEntity
     //现金支付数量
     private Integer xjNum;
 
+
+    public String getOilPersonnelId() {
+        return oilPersonnelId;
+    }
+
+    public void setOilPersonnelId(String oilPersonnelId) {
+        this.oilPersonnelId = oilPersonnelId;
+    }
+
     public Integer getWxNum() {
         return wxNum;
     }
@@ -261,360 +271,360 @@ public class StationClassStructure extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setOrderNo(String orderNo) 
+    public void setOrderNo(String orderNo)
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo() 
+    public String getOrderNo()
     {
         return orderNo;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setOilGun(String oilGun) 
+    public void setOilGun(String oilGun)
     {
         this.oilGun = oilGun;
     }
 
-    public String getOilGun() 
+    public String getOilGun()
     {
         return oilGun;
     }
-    public void setOilName(String oilName) 
+    public void setOilName(String oilName)
     {
         this.oilName = oilName;
     }
 
-    public String getOilName() 
+    public String getOilName()
     {
         return oilName;
     }
-    public void setOilPirce(BigDecimal oilPirce) 
+    public void setOilPirce(BigDecimal oilPirce)
     {
         this.oilPirce = oilPirce;
     }
 
-    public BigDecimal getOilPirce() 
+    public BigDecimal getOilPirce()
     {
         return oilPirce;
     }
-    public void setOilType(String oilType) 
+    public void setOilType(String oilType)
     {
         this.oilType = oilType;
     }
 
-    public String getOilType() 
+    public String getOilType()
     {
         return oilType;
     }
-    public void setConsumerId(Long consumerId) 
+    public void setConsumerId(Long consumerId)
     {
         this.consumerId = consumerId;
     }
 
-    public Long getConsumerId() 
+    public Long getConsumerId()
     {
         return consumerId;
     }
-    public void setConsumer(String consumer) 
+    public void setConsumer(String consumer)
     {
         this.consumer = consumer;
     }
 
-    public String getConsumer() 
+    public String getConsumer()
     {
         return consumer;
     }
 
 
-    public void setPayType(String payType) 
+    public void setPayType(String payType)
     {
         this.payType = payType;
     }
 
-    public String getPayType() 
+    public String getPayType()
     {
         return payType;
     }
-    public void setPayWay(String payWay) 
+    public void setPayWay(String payWay)
     {
         this.payWay = payWay;
     }
 
-    public String getPayWay() 
+    public String getPayWay()
     {
         return payWay;
     }
-    public void setPayDate(Date payDate) 
+    public void setPayDate(Date payDate)
     {
         this.payDate = payDate;
     }
 
-    public Date getPayDate() 
+    public Date getPayDate()
     {
         return payDate;
     }
-    public void setOilPersonnel(String oilPersonnel) 
+    public void setOilPersonnel(String oilPersonnel)
     {
         this.oilPersonnel = oilPersonnel;
     }
 
-    public String getOilPersonnel() 
+    public String getOilPersonnel()
     {
         return oilPersonnel;
     }
-    public void setOrderType(String orderType) 
+    public void setOrderType(String orderType)
     {
         this.orderType = orderType;
     }
 
-    public String getOrderType() 
+    public String getOrderType()
     {
         return orderType;
     }
-    public void setPrintNum(Long printNum) 
+    public void setPrintNum(Long printNum)
     {
         this.printNum = printNum;
     }
 
-    public Long getPrintNum() 
+    public Long getPrintNum()
     {
         return printNum;
     }
-    public void setClassStructureNo(String classStructureNo) 
+    public void setClassStructureNo(String classStructureNo)
     {
         this.classStructureNo = classStructureNo;
     }
 
-    public String getClassStructureNo() 
+    public String getClassStructureNo()
     {
         return classStructureNo;
     }
-    public void setClassStartDate(Date classStartDate) 
+    public void setClassStartDate(Date classStartDate)
     {
         this.classStartDate = classStartDate;
     }
 
-    public Date getClassStartDate() 
+    public Date getClassStartDate()
     {
         return classStartDate;
     }
-    public void setClassStructureDate(Date classStructureDate) 
+    public void setClassStructureDate(Date classStructureDate)
     {
         this.classStructureDate = classStructureDate;
     }
 
-    public Date getClassStructureDate() 
+    public Date getClassStructureDate()
     {
         return classStructureDate;
     }
-    public void setClassStructureMan(String classStructureMan) 
+    public void setClassStructureMan(String classStructureMan)
     {
         this.classStructureMan = classStructureMan;
     }
 
-    public String getClassStructureMan() 
+    public String getClassStructureMan()
     {
         return classStructureMan;
     }
-    public void setOils(String oils) 
+    public void setOils(String oils)
     {
         this.oils = oils;
     }
 
-    public String getOils() 
+    public String getOils()
     {
         return oils;
     }
-    public void setReceivableAmt(BigDecimal receivableAmt) 
+    public void setReceivableAmt(BigDecimal receivableAmt)
     {
         this.receivableAmt = receivableAmt;
     }
 
-    public BigDecimal getReceivableAmt() 
+    public BigDecimal getReceivableAmt()
     {
         return receivableAmt;
     }
-    public void setReceivedAmt(BigDecimal receivedAmt) 
+    public void setReceivedAmt(BigDecimal receivedAmt)
     {
         this.receivedAmt = receivedAmt;
     }
 
-    public BigDecimal getReceivedAmt() 
+    public BigDecimal getReceivedAmt()
     {
         return receivedAmt;
     }
-    public void setDiscountAmt(BigDecimal discountAmt) 
+    public void setDiscountAmt(BigDecimal discountAmt)
     {
         this.discountAmt = discountAmt;
     }
 
-    public BigDecimal getDiscountAmt() 
+    public BigDecimal getDiscountAmt()
     {
         return discountAmt;
     }
-    public void setDiscountCouponAmt(BigDecimal discountCouponAmt) 
+    public void setDiscountCouponAmt(BigDecimal discountCouponAmt)
     {
         this.discountCouponAmt = discountCouponAmt;
     }
 
-    public BigDecimal getDiscountCouponAmt() 
+    public BigDecimal getDiscountCouponAmt()
     {
         return discountCouponAmt;
     }
-    public void setDiscountCoupon(String discountCoupon) 
+    public void setDiscountCoupon(String discountCoupon)
     {
         this.discountCoupon = discountCoupon;
     }
 
-    public String getDiscountCoupon() 
+    public String getDiscountCoupon()
     {
         return discountCoupon;
     }
-    public void setWxAmt(BigDecimal wxAmt) 
+    public void setWxAmt(BigDecimal wxAmt)
     {
         this.wxAmt = wxAmt;
     }
 
-    public BigDecimal getWxAmt() 
+    public BigDecimal getWxAmt()
     {
         return wxAmt;
     }
-    public void setZfbAmt(BigDecimal zfbAmt) 
+    public void setZfbAmt(BigDecimal zfbAmt)
     {
         this.zfbAmt = zfbAmt;
     }
 
-    public BigDecimal getZfbAmt() 
+    public BigDecimal getZfbAmt()
     {
         return zfbAmt;
     }
-    public void setPosAmt(BigDecimal posAmt) 
+    public void setPosAmt(BigDecimal posAmt)
     {
         this.posAmt = posAmt;
     }
 
-    public BigDecimal getPosAmt() 
+    public BigDecimal getPosAmt()
     {
         return posAmt;
     }
-    public void setXjAmt(BigDecimal xjAmt) 
+    public void setXjAmt(BigDecimal xjAmt)
     {
         this.xjAmt = xjAmt;
     }
 
-    public BigDecimal getXjAmt() 
+    public BigDecimal getXjAmt()
     {
         return xjAmt;
     }
-    public void setDidiAppAmt(BigDecimal didiAppAmt) 
+    public void setDidiAppAmt(BigDecimal didiAppAmt)
     {
         this.didiAppAmt = didiAppAmt;
     }
 
-    public BigDecimal getDidiAppAmt() 
+    public BigDecimal getDidiAppAmt()
     {
         return didiAppAmt;
     }
-    public void setTyAppAmt(BigDecimal tyAppAmt) 
+    public void setTyAppAmt(BigDecimal tyAppAmt)
     {
         this.tyAppAmt = tyAppAmt;
     }
 
-    public BigDecimal getTyAppAmt() 
+    public BigDecimal getTyAppAmt()
     {
         return tyAppAmt;
     }
-    public void setOtherAmt(BigDecimal otherAmt) 
+    public void setOtherAmt(BigDecimal otherAmt)
     {
         this.otherAmt = otherAmt;
     }
 
-    public BigDecimal getOtherAmt() 
+    public BigDecimal getOtherAmt()
     {
         return otherAmt;
     }
-    public void setDzkAmt(BigDecimal dzkAmt) 
+    public void setDzkAmt(BigDecimal dzkAmt)
     {
         this.dzkAmt = dzkAmt;
     }
 
-    public BigDecimal getDzkAmt() 
+    public BigDecimal getDzkAmt()
     {
         return dzkAmt;
     }
-    public void setScore(Long score) 
+    public void setScore(Long score)
     {
         this.score = score;
     }
 
-    public Long getScore() 
+    public Long getScore()
     {
         return score;
     }
-    public void setMemberNo(String memberNo) 
+    public void setMemberNo(String memberNo)
     {
         this.memberNo = memberNo;
     }
 
-    public String getMemberNo() 
+    public String getMemberNo()
     {
         return memberNo;
     }
-    public void setMemberAmt(BigDecimal memberAmt) 
+    public void setMemberAmt(BigDecimal memberAmt)
     {
         this.memberAmt = memberAmt;
     }
 
-    public BigDecimal getMemberAmt() 
+    public BigDecimal getMemberAmt()
     {
         return memberAmt;
     }
-    public void setCarNo(String carNo) 
+    public void setCarNo(String carNo)
     {
         this.carNo = carNo;
     }
 
-    public String getCarNo() 
+    public String getCarNo()
     {
         return carNo;
     }
-    public void setCustomerPhone(String customerPhone) 
+    public void setCustomerPhone(String customerPhone)
     {
         this.customerPhone = customerPhone;
     }
 
-    public String getCustomerPhone() 
+    public String getCustomerPhone()
     {
         return customerPhone;
     }
-    public void setCustomerGrade(String customerGrade) 
+    public void setCustomerGrade(String customerGrade)
     {
         this.customerGrade = customerGrade;
     }
 
-    public String getCustomerGrade() 
+    public String getCustomerGrade()
     {
         return customerGrade;
     }

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

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payType"    column="pay_type"    />
         <result property="payWay"    column="pay_way"    />
         <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="oilPersonnelId"    column="oil_personnel_id"    />
         <result property="payDate"    column="pay_date"    />
         <result property="createdDate"    column="created_date"    />
         <result property="orderType"    column="order_type"    />
@@ -61,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPayOrderVo">
         select order_id, order_no, station_id,d.dept_name as station_name, p.status,consumer_id, consumer, oil_gun,
-         oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt,sell_oil_price,driver_oil_price,
+         oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt,sell_oil_price,driver_oil_price,oil_personnel_id,
           discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
            other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
             pay_date, created_date, order_type, car_no, customer_phone, customer_grade,sell_amt,sell_discount_amt,driver_discount_amt
@@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
             <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
             <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="oilPersonnelId != null  and oilPersonnelId != ''"> and oil_personnel_id = #{oilPersonnelId}</if>
             <if test="payDate != null "> and pay_date = #{payDate}</if>
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
@@ -218,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="score != null "> and score = #{score}</if>
+            <if test="oilPersonnelId != null  and oilPersonnelId != ''"> and oil_personnel_id = #{oilPersonnelId}</if>
             <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="printCount != null "> and print_count = #{printCount}</if>
@@ -278,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="score != null "> and score = #{score}</if>
+            <if test="oilPersonnelId != null  and oilPersonnelId != ''"> and oil_personnel_id = #{oilPersonnelId}</if>
             <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="printCount != null "> and print_count = #{printCount}</if>
@@ -371,7 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        select order_id, order_no, p.station_id, p.station_name, p.status,consumer_id, consumer, oil_gun,
         oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt,sell_oil_price,driver_oil_price,
         discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt,
-        other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,
+        other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel,oil_personnel_id,
         pay_date, created_date, order_type, car_no,customer_grade,sell_amt,sell_discount_amt,d.mobile_phone as customer_phone
         from pay_order p join app_user_info d on p.consumer_id =d.user_id
         where order_id = #{orderId}

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

@@ -21,6 +21,7 @@
         <result property="payWay"    column="pay_way"    />
         <result property="payDate"    column="pay_date"    />
         <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="oilPersonnelId"    column="oil_personnel_id"    />
         <result property="orderType"    column="order_type"    />
         <result property="printNum"    column="print_num"    />
         <result property="classStructureNo"    column="class_structure_no"    />
@@ -55,7 +56,7 @@
 
     <sql id="selectStationClassStructureVo">
         select id, order_no, station_id, d.dept_name as station_name, oil_gun, oil_name, oil_pirce, oil_type,
-        consumer_id, consumer, amt, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type,
+        consumer_id, consumer, amt, order_liters, pay_type, pay_way, pay_date,oil_personnel_id, oil_personnel, order_type,
         print_num, class_structure_no, class_start_date, class_structure_date, class_structure_man, oils,
          receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt,
          pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, car_no,
@@ -80,6 +81,7 @@
             <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="oilPersonnelId != null  and oilPersonnelId != ''"> and oil_personnel_id = #{oilPersonnelId}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
             <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
@@ -131,8 +133,8 @@
         GROUP BY a.oil_name,a.station_id,a.class_start_date,a.class_structure_date,a.class_structure_man
     </select>
     <select id="selectStationClassStructureMax" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
-        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt,d.dept_name as station_name,
-        order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num,
+        select id, station_id, order_no, oil_gun, 02., consumer_id, consumer, amt,d.dept_name as station_name,
+        order_liters, pay_type, pay_way, pay_date, oil_personnel,oil_personnel_id, order_type, oil_type, print_num,
         class_structure_no, class_structure_date, class_structure_man, oils
         from station_class_structure s join sys_dept d on s.station_id = d.dept_id
         where id = (
@@ -293,6 +295,7 @@
             <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="oilPersonnelId != null  and oilPersonnelId != ''"> and oil_personnel_id = #{oilPersonnelId}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
             <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
@@ -327,6 +330,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">order_no,</if>
             <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
             <if test="oilGun != null">oil_gun,</if>
             <if test="oilName != null">oil_name,</if>
             <if test="oilPirce != null">oil_pirce,</if>
@@ -339,6 +343,7 @@
             <if test="payWay != null">pay_way,</if>
             <if test="payDate != null">pay_date,</if>
             <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="oilPersonnelId != null">oil_personnel_id,</if>
             <if test="orderType != null">order_type,</if>
             <if test="printNum != null">print_num,</if>
             <if test="classStructureNo != null">class_structure_no,</if>
@@ -369,6 +374,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">#{orderNo},</if>
             <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
             <if test="oilGun != null">#{oilGun},</if>
             <if test="oilName != null">#{oilName},</if>
             <if test="oilPirce != null">#{oilPirce},</if>
@@ -381,6 +387,7 @@
             <if test="payWay != null">#{payWay},</if>
             <if test="payDate != null">#{payDate},</if>
             <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="oilPersonnelId != null">#{oilPersonnelId},</if>
             <if test="orderType != null">#{orderType},</if>
             <if test="printNum != null">#{printNum},</if>
             <if test="classStructureNo != null">#{classStructureNo},</if>
@@ -415,6 +422,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderNo != null">order_no = #{orderNo},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="oilGun != null">oil_gun = #{oilGun},</if>
             <if test="oilName != null">oil_name = #{oilName},</if>
             <if test="oilPirce != null">oil_pirce = #{oilPirce},</if>
@@ -427,6 +435,7 @@
             <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="oilPersonnelId != null">oil_personnel_id = #{oilPersonnelId},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
             <if test="printNum != null">print_num = #{printNum},</if>
             <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>