优化后台功能

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

@@ -1,11 +1,15 @@
 package com.yijia.station.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
 import com.yijia.station.domain.PayOrder;
+import com.yijia.station.domain.StationClassesSummary;
 import com.yijia.station.mapper.PayOrderMapper;
 import com.yijia.station.service.IPayOrderService;
+import com.yijia.station.service.IStationClassesSummaryService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +43,7 @@ public class StationClassStructureController extends BaseController
     private IStationClassStructureService stationClassStructureService;
     @Autowired
     private IPayOrderService payOrderService;
+    private IStationClassesSummaryService stationClassesSummaryService;
     /**
      * 查询班结管理列表
      */
@@ -89,13 +94,14 @@ public class StationClassStructureController extends BaseController
         return AjaxResult.success(stationClassStructureService.selectStationClassStructureById(id));
     }
 
+
     /**
      * 新增班结管理
      */
     @PreAuthorize("@ss.hasPermi('station:structure:add')")
     @Log(title = "班结管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody StationClassStructure stationClassStructure){
+    public AjaxResult add(@RequestBody StationClassStructure stationClassStructure) throws ParseException {
         //获取当前班结油站
         // Long stationId=stationClassStructure.getStationId();
         Long stationId= Long.valueOf("1");
@@ -106,14 +112,34 @@ public class StationClassStructureController extends BaseController
         classes.setStationId(stationId);
         //查询出上次班结，最后一条数据
         StationClassStructure sss =stationClassStructureService.selectStationClassStructureMax(classes);
+        String beginTime="";
         //当前时间
         Date date= new Date();
+        StationClassStructure classesStructure =new StationClassStructure();
+        classesStructure.setStationId(stationId);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String no=sdf.parse(String.valueOf(date)).toString();
+        classesStructure.setLikeClassStructureNo(no);
+        //查询班结信息中本日班结次数
+        StationClassStructure structure =stationClassStructureService.selectDistnctClassStructure(classesStructure);
+        if(structure!=null){
+            if(structure.getNum()==0){
+                no = no + "0"+1;
+            }else{
+                int num  = structure.getNum()+1;
+                if(num>0 && num<10){
+                    no = no + "0"+num;
+                }else{
+                    no = no +""+ num;
+                }
+            }
+        }
         int i=0;
-
         if(sss!=null){
             //获取上次班结时间
             PayOrder order=new PayOrder();
             order.setStationId(stationId);
+            beginTime=sss.getClassStructureDate().toString();
             order.setBeginTime(sss.getClassStructureDate().toString());
             order.setEndTime(date.toString());
             List<PayOrder> list = payOrderService.selectPayOrderList(order);
@@ -121,6 +147,7 @@ public class StationClassStructureController extends BaseController
                 StationClassStructure stationclass =new StationClassStructure();
                 stationclass.setStationId(payOrder.getStationId());
                 stationclass.setClassStructureMan(username);
+                stationclass.setClassStructureNo(no);
                 stationclass.setClassStructureDate(date);
                 stationclass.setOrderNo(payOrder.getOrderNo());
                 stationclass.setOilGun(payOrder.getOilGun());
@@ -134,15 +161,11 @@ public class StationClassStructureController extends BaseController
                 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());
@@ -152,6 +175,7 @@ public class StationClassStructureController extends BaseController
                 stationclass.setStationId(payOrder.getStationId());
                 stationclass.setClassStructureMan(username);
                 stationclass.setClassStructureDate(date);
+                stationclass.setClassStructureNo(no);
                 stationclass.setOrderNo(payOrder.getOrderNo());
                 stationclass.setOilGun(payOrder.getOilGun());
                 stationclass.setOilName(payOrder.getOilName());
@@ -170,6 +194,24 @@ public class StationClassStructureController extends BaseController
                 i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
         }
+        StationClassStructure scs =new StationClassStructure();
+        scs.setClassStructureNo(no);
+        //汇总班结数据将汇总的数据插入到汇总数据中
+        StationClassStructure stationclass = stationClassStructureService.selectSummyClassStructure(scs);
+        StationClassesSummary stationClassesSummary =new StationClassesSummary();
+        stationClassesSummary.setClassesNo(stationclass.getClassStructureNo());
+        stationClassesSummary.setStartDate(stationclass.getClassStartDate());
+        stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
+        stationClassesSummary.setStationName(stationclass.getStationName());
+        stationClassesSummary.setStationId(stationclass.getStationId());
+        stationClassesSummary.setOrderNum(Long.valueOf(stationclass.getNum()));
+        stationClassesSummary.setPrintNum(stationclass.getPrintNum());
+        stationClassesSummary.setSaleLiters(String.valueOf(stationclass.getOrderLiters()));
+        stationClassesSummary.setSaleAmt(stationclass.getAmt());
+        stationClassesSummary.setZfbAmt(Double.valueOf("0"));
+        stationClassesSummary.setDzkAmt(Double.valueOf(0));
+        stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
+        i = stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
         return toAjax(i);
 
     }

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

@@ -4,6 +4,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+
+import com.yijia.common.core.domain.entity.SysUser;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -68,6 +72,9 @@ public class StationOilGunController extends BaseController
     @GetMapping(value = "/selectGun")
     public TableDataInfo selectGun(StationOilGun stationOilGun)
     {
+//        LoginUser currentUser = SecurityUtils.getLoginUser();
+//        String userName = currentUser.getStation();
+        //SysUser sysUser = ShiroUtils.getSysUser();
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         return getTable(list);
     }

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

@@ -106,8 +106,30 @@ public class StationClassStructure extends BaseEntity
     /** 油品 */
     @Excel(name = "油品")
     private String oils;
+    /** like 查询班结号 */
+    @Excel(name = "根据班结号模糊查询")
+    private String likeClassStructureNo;
+    /** like 返回参数 */
+    @Excel(name = "返回参数")
+    private Integer num;
 
-    public void setId(Long id) 
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public String getLikeClassStructureNo() {
+        return likeClassStructureNo;
+    }
+
+    public void setLikeClassStructureNo(String likeClassStructureNo) {
+        this.likeClassStructureNo = likeClassStructureNo;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 油品调价信息对象 station_oil_price_adjust
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-11
  */
 public class StationOilPriceAdjust extends BaseEntity
 {
@@ -54,6 +54,14 @@ public class StationOilPriceAdjust extends BaseEntity
     @Excel(name = "操作员")
     private String operator;
 
+    /** 状态：（1，未调价；2，已调价） */
+    @Excel(name = "状态：", readConverterExp = "1=，未调价；2，已调价")
+    private String status;
+
+    /** 油价id */
+    @Excel(name = "油价id")
+    private Long oilPriceId;
+
     public void setAdjustPriceId(Long adjustPriceId) 
     {
         this.adjustPriceId = adjustPriceId;
@@ -135,6 +143,24 @@ public class StationOilPriceAdjust extends BaseEntity
     {
         return operator;
     }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setOilPriceId(Long oilPriceId) 
+    {
+        this.oilPriceId = oilPriceId;
+    }
+
+    public Long getOilPriceId() 
+    {
+        return oilPriceId;
+    }
 
     @Override
     public String toString() {
@@ -148,6 +174,8 @@ public class StationOilPriceAdjust extends BaseEntity
             .append("stationId", getStationId())
             .append("stationName", getStationName())
             .append("operator", getOperator())
+            .append("status", getStatus())
+            .append("oilPriceId", getOilPriceId())
             .toString();
     }
 }

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

@@ -79,4 +79,18 @@ public interface StationClassStructureMapper
      * @return
      */
     public List<StationClassStructure> listOilStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
+
+    /**
+     * 根据班次号汇总班结数据
+     * @param scs
+     * @return
+     */
+    StationClassStructure selectSummyClassStructure(StationClassStructure scs);
 }

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

@@ -79,4 +79,18 @@ public interface IStationClassStructureService
      * @return
      */
     List<StationClassStructure> listOilStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
+
+    /**
+     * 根据班次号查询班结汇总数据
+     * @param scs
+     * @return
+     */
+    StationClassStructure selectSummyClassStructure(StationClassStructure scs);
 }

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

@@ -121,4 +121,24 @@ public class StationClassStructureServiceImpl implements IStationClassStructureS
         return stationClassStructureMapper.listOilStructure(stationClassStructure);
     }
 
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    @Override
+    public StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure) {
+        return stationClassStructureMapper.selectDistnctClassStructure(classesStructure);
+    }
+
+    /**
+     * 根据班次号查询班结汇总
+     * @param scs
+     * @return
+     */
+    @Override
+    public StationClassStructure selectSummyClassStructure(StationClassStructure scs) {
+        return stationClassStructureMapper.selectSummyClassStructure(scs);
+    }
+
 }

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="classStructureDate"    column="class_structure_date"    />
         <result property="classStructureMan"    column="class_structure_man"    />
         <result property="oils"    column="oils"    />
+        <result property="num"    column="num"    />
     </resultMap>
 
     <sql id="selectStationClassStructureVo">
@@ -64,27 +65,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT a.oil_personnel,b.gun_no as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
         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 =1
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+        </where>
         GROUP BY a.oil_personnel,b.gun_no
     </select>
 
     <select id="listOilStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
        	SELECT  a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
         from station_class_structure a
-        where a.station_id =1
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+        </where>
         GROUP BY a.oil_name
     </select>
     <select id="selectStationClassStructureMax" parameterType="StationClassStructure" 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 MAX(id) from station_class_structurew
+            <where>
+                <if test="stationId != null "> and station_id = #{stationId}</if>
+            </where>
+		)
     </select>
     <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectDistnctClassStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+      select countselect count(DISTINCT class_structure_no) as num
+            from station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="likeClassStructureNo != null  and likeClassStructureNo != ''"> class_structure_no like concat( #{likeClassStructureNo}, '%') </if>
+        </where>
+    </select>
+    <!--根据班次号汇总班结数据-->
+    <select id="selectSummyClassStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT class_structure_no,class_start_date,class_structure_date,station_id,station_name,count(order_no) as num,
+        sum(order_liters) as order_liters,sum(amt) as amt,class_structure_man
+        from station_class_structure
+        <where>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY class_structure_no,class_start_date,station_id,station_name,class_structure_date,class_structure_man
+    </select>
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -14,10 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="operator"    column="operator"    />
+        <result property="status"    column="status"    />
+        <result property="oilPriceId"    column="oil_price_id"    />
     </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
+        select adjust_price_id, oil_name, oil_adjust_price, take_effect_status, take_effect_date, adjust_date, station_id, station_name, operator, status, oil_price_id from station_oil_price_adjust
     </sql>
 
     <select id="selectStationOilPriceAdjustList" parameterType="StationOilPriceAdjust" resultMap="StationOilPriceAdjustResult">
@@ -31,8 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="oilPriceId != null "> and oil_price_id = #{oilPriceId}</if>
         </where>
-        order by  adjustDate desc
     </select>
     
     <select id="selectStationOilPriceAdjustById" parameterType="Long" resultMap="StationOilPriceAdjustResult">
@@ -51,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
             <if test="operator != null">operator,</if>
+            <if test="status != null">status,</if>
+            <if test="oilPriceId != null">oil_price_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oilName != null">#{oilName},</if>
@@ -61,6 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
             <if test="operator != null">#{operator},</if>
+            <if test="status != null">#{status},</if>
+            <if test="oilPriceId != null">#{oilPriceId},</if>
          </trim>
     </insert>
 
@@ -75,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="stationName != null">station_name = #{stationName},</if>
             <if test="operator != null">operator = #{operator},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="oilPriceId != null">oil_price_id = #{oilPriceId},</if>
         </trim>
         where adjust_price_id = #{adjustPriceId}
     </update>

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

@@ -1,60 +1,96 @@
 <?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">
+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="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="status"    column="status"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
         <result property="oilGun"    column="oil_gun"    />
         <result property="oilName"    column="oil_name"    />
         <result property="oilPirce"    column="oil_pirce"    />
-        <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="oilType"    column="oil_type"    />
         <result property="orderLiters"    column="order_liters"    />
+        <result property="amt"    column="amt"    />
+        <result property="receivableAmt"    column="receivable_amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="discountCouponAmt"    column="discount_coupon_amt"    />
+        <result property="discountCoupon"    column="discount_coupon"    />
+        <result property="wxAmt"    column="wx_amt"    />
+        <result property="zfbAmt"    column="zfb_amt"    />
+        <result property="posAmt"    column="pos_amt"    />
+        <result property="xjAmt"    column="xj_amt"    />
+        <result property="didiAppAmt"    column="didi_app_amt"    />
+        <result property="tyAppAmt"    column="ty_app_amt"    />
+        <result property="otherAmt"    column="other_amt"    />
+        <result property="dzkAmt"    column="dzk_amt"    />
+        <result property="score"    column="score"    />
+        <result property="memberAmt"    column="member_amt"    />
+        <result property="printCount"    column="print_count"    />
         <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="payDate"    column="pay_date"    />
         <result property="createdDate"    column="created_date"    />
         <result property="orderType"    column="order_type"    />
-        <result property="stationName"    column="station_name"    />
+        <result property="cyAmt"    column="cy_amt"    />
+        <result property="qyAmt"    column="qy_amt"    />
     </resultMap>
 
     <sql id="selectPayOrderVo">
-        select order_id, order_no, oil_gun, oil_name, oil_pirce, consumer_id, consumer, amt, station_id, status, order_liters, pay_type, pay_way, pay_date, oil_personnel, created_date, order_type, station_name from pay_order
+        select order_id, order_no, station_id, station_name, status, consumer_id, consumer, oil_gun, oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, 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_amt, print_count, pay_type, pay_way, oil_personnel, pay_date, created_date, order_type from pay_order
     </sql>
 
     <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
         <include refid="selectPayOrderVo"/>
-        <where>
+        <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="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="orderLiters != null  and orderLiters != ''"> and order_liters = #{orderLiters}</if>
+            <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null  and oilPirce != ''"> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
+            <if test="printCount != null "> and print_count = #{printCount}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
             <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
-
-            <if test="beginTime != null and beginTime != ''">
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
             </if>
-            <if test="endTime != null and endTime != ''">
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
             </if>
-            <if test="stationName != null  and stationName != ''">
-                AND station_name LIKE CONCAT('%', #{stationName}, '%')
-            </if>
+<!--            <if test="payDate != null "> and pay_date = #{payDate}</if>-->
             <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+
         </where>
         ORDER BY created_date DESC
     </select>
@@ -63,69 +99,162 @@
         <include refid="selectPayOrderVo"/>
         where order_id = #{orderId}
     </select>
-
+    <select id="selectDaySources" parameterType="Long" resultMap="PayOrderResult">
+        SELECT SUM(amt) as amt,sum(order_liters) as order_liters
+        from pay_order
+        <where>
+            <if test="createdDate != null "> and created_date like concat(#{createdDate}, '%') </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
+    <select id="selectOilTypeSources" parameterType="Long" resultMap="PayOrderResult">
+        SELECT SUM(amt) as amt,sum(order_liters) as order_liters, oil_type
+        from pay_order
+        <where>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+        GROUP BY oil_type
+    </select>
+    <select id="selectOverViewData" parameterType="Long" resultMap="PayOrderResult">
+        SELECT SUM(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt, sum(pos_amt) as pos_amt, sum(xj_amt) as xj_amt,sum(didi_app_amt) as didi_app_amt,sum(ty_app_amt) as ty_app_amt,sum(other_amt) as other_amt,sum(member_amt) as member_amt
+        from pay_order
+        <where>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
+    <select id="selectDayReport" parameterType="Long" resultMap="PayOrderResult">
+        SELECT date_format( b.pay_date, '%Y-%m-%d' ) as pay_date,sum(b.amt) as amt,sum(b.qyamt) as qy_amt, sum(b.cyamt) as cy_amt,sum(b.order_liters) as order_liters ,count(b.order_no) order_no ,sum(b.member_amt) as menber_amt
+        from (SELECT a.*,(SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=2) as qyamt , (SELECT sum(amt) as qyamt from pay_order where order_no=a.order_no and oil_type=1) as cyamt
+        from pay_order a) b
+        GROUP BY  date_format( pay_date, '%Y-%m-%d' )
+    </select>
     <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="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="status != null">status,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
             <if test="oilGun != null">oil_gun,</if>
             <if test="oilName != null">oil_name,</if>
             <if test="oilPirce != null">oil_pirce,</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="oilType != null">oil_type,</if>
             <if test="orderLiters != null">order_liters,</if>
+            <if test="amt != null">amt,</if>
+            <if test="receivableAmt != null">receivable_amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt,</if>
+            <if test="discountCoupon != null">discount_coupon,</if>
+            <if test="wxAmt != null">wx_amt,</if>
+            <if test="zfbAmt != null">zfb_amt,</if>
+            <if test="posAmt != null">pos_amt,</if>
+            <if test="xjAmt != null">xj_amt,</if>
+            <if test="didiAppAmt != null">didi_app_amt,</if>
+            <if test="tyAppAmt != null">ty_app_amt,</if>
+            <if test="otherAmt != null">other_amt,</if>
+            <if test="dzkAmt != null">dzk_amt,</if>
+            <if test="score != null">score,</if>
+            <if test="memberAmt != null">member_amt,</if>
+            <if test="printCount != null">print_count,</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="payDate != null">pay_date,</if>
             <if test="createdDate != null">created_date,</if>
             <if test="orderType != null">order_type,</if>
-            <if test="stationName != null">station_name,</if>
-        </trim>
+         </trim>
         <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="status != null">#{status},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
             <if test="oilGun != null">#{oilGun},</if>
             <if test="oilName != null">#{oilName},</if>
             <if test="oilPirce != null">#{oilPirce},</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="oilType != null">#{oilType},</if>
             <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="receivableAmt != null">#{receivableAmt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
+            <if test="discountCouponAmt != null">#{discountCouponAmt},</if>
+            <if test="discountCoupon != null">#{discountCoupon},</if>
+            <if test="wxAmt != null">#{wxAmt},</if>
+            <if test="zfbAmt != null">#{zfbAmt},</if>
+            <if test="posAmt != null">#{posAmt},</if>
+            <if test="xjAmt != null">#{xjAmt},</if>
+            <if test="didiAppAmt != null">#{didiAppAmt},</if>
+            <if test="tyAppAmt != null">#{tyAppAmt},</if>
+            <if test="otherAmt != null">#{otherAmt},</if>
+            <if test="dzkAmt != null">#{dzkAmt},</if>
+            <if test="score != null">#{score},</if>
+            <if test="memberAmt != null">#{memberAmt},</if>
+            <if test="printCount != null">#{printCount},</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="payDate != null">#{payDate},</if>
             <if test="createdDate != null">#{createdDate},</if>
             <if test="orderType != null">#{orderType},</if>
-            <if test="stationName != null">#{stationName},</if>
-        </trim>
+         </trim>
     </insert>
 
     <update id="updatePayOrder" parameterType="PayOrder">
         update pay_order
         <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="status != null">status = #{status},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</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>
-            <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="oilType != null">oil_type = #{oilType},</if>
             <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="receivableAmt != null">receivable_amt = #{receivableAmt},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt = #{discountCouponAmt},</if>
+            <if test="discountCoupon != null">discount_coupon = #{discountCoupon},</if>
+            <if test="wxAmt != null">wx_amt = #{wxAmt},</if>
+            <if test="zfbAmt != null">zfb_amt = #{zfbAmt},</if>
+            <if test="posAmt != null">pos_amt = #{posAmt},</if>
+            <if test="xjAmt != null">xj_amt = #{xjAmt},</if>
+            <if test="didiAppAmt != null">didi_app_amt = #{didiAppAmt},</if>
+            <if test="tyAppAmt != null">ty_app_amt = #{tyAppAmt},</if>
+            <if test="otherAmt != null">other_amt = #{otherAmt},</if>
+            <if test="dzkAmt != null">dzk_amt = #{dzkAmt},</if>
+            <if test="score != null">score = #{score},</if>
+            <if test="memberAmt != null">member_amt = #{memberAmt},</if>
+            <if test="printCount != null">print_count = #{printCount},</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="payDate != null">pay_date = #{payDate},</if>
             <if test="createdDate != null">created_date = #{createdDate},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
-            <if test="stationName != null">station_name = #{stationName},</if>
         </trim>
         where order_id = #{orderId}
     </update>
@@ -135,10 +264,10 @@
     </delete>
 
     <delete id="deletePayOrderByIds" parameterType="String">
-        delete from pay_order where order_id in
+        delete from pay_order where order_id in 
         <foreach item="orderId" collection="array" open="(" separator="," close=")">
             #{orderId}
         </foreach>
     </delete>
-
-</mapper>
+    
+</mapper>

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

@@ -23,13 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="oilType"    column="oil_type"    />
         <result property="printNum"    column="print_num"    />
         <result property="classStructureNo"    column="class_structure_no"    />
+        <result property="classStartDate"    column="class_start_date"    />
         <result property="classStructureDate"    column="class_structure_date"    />
         <result property="classStructureMan"    column="class_structure_man"    />
         <result property="oils"    column="oils"    />
+        <result property="num"    column="num"    />
     </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
+        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_start_date, class_structure_date, class_structure_man, oils from station_class_structure
     </sql>
 
     <select id="selectStationClassStructureList" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
@@ -52,29 +54,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="classStartDate != null "> and class_start_date = #{classStartDate}</if>
             <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
             <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
             <if test="oils != null  and oils != ''"> and oils = #{oils}</if>
         </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 id="listPersonnelStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT a.oil_personnel,b.gun_no as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
+        from station_class_structure a JOIN station_personnel b on a.oil_personnel =b.personnel_name
+        and a.station_id = b.station_id
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+        </where>
+        GROUP BY a.oil_personnel,b.gun_no
+    </select>
+
+    <select id="listOilStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+       	SELECT  a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
+        from station_class_structure a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+        </where>
+        GROUP BY a.oil_name
+    </select>
+    <select id="selectStationClassStructureMax" parameterType="StationClassStructure" 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_structurew
+            <where>
+                <if test="stationId != null "> and station_id = #{stationId}</if>
+            </where>
+		)
     </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 id="selectDistnctClassStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+      select countselect count(DISTINCT class_structure_no) as num
+            from station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="likeClassStructureNo != null  and likeClassStructureNo != ''"> class_structure_no like concat( #{likeClassStructureNo}, '%') </if>
+        </where>
+    </select>
+    <!--根据班次号汇总班结数据-->
+    <select id="selectSummyClassStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT class_structure_no,class_start_date,class_structure_date,station_id,station_name,count(order_no) as num,
+        sum(order_liters) as order_liters,sum(amt) as amt,class_structure_man
+        from station_class_structure
+        <where>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY class_structure_no,class_start_date,station_id,station_name,class_structure_date,class_structure_man
     </select>
-        
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -95,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilType != null">oil_type,</if>
             <if test="printNum != null">print_num,</if>
             <if test="classStructureNo != null">class_structure_no,</if>
+            <if test="classStartDate != null">class_start_date,</if>
             <if test="classStructureDate != null">class_structure_date,</if>
             <if test="classStructureMan != null">class_structure_man,</if>
             <if test="oils != null">oils,</if>
@@ -117,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilType != null">#{oilType},</if>
             <if test="printNum != null">#{printNum},</if>
             <if test="classStructureNo != null">#{classStructureNo},</if>
+            <if test="classStartDate != null">#{classStartDate},</if>
             <if test="classStructureDate != null">#{classStructureDate},</if>
             <if test="classStructureMan != null">#{classStructureMan},</if>
             <if test="oils != null">#{oils},</if>
@@ -143,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="classStartDate != null">class_start_date = #{classStartDate},</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>

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="oilGunId"    column="oil_gun_id"    />
         <result property="oilGunNo"    column="oil_gun_no"    />
         <result property="oilName"    column="oil_name"    />
+        <result property="oilPrice"    column="oil_price"    />
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="date"    column="date"    />
@@ -15,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStationOilGunVo">
-        select oil_gun_id, oil_gun_no, oil_name, station_id, station_name, date, status from station_oil_gun
+        select oil_gun_id, oil_gun_no, oil_name, oil_price, station_id, station_name, date, status from station_oil_gun
     </sql>
 
     <select id="selectStationOilGunList" parameterType="StationOilGun" resultMap="StationOilGunResult">
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="oilPrice != null "> and oil_price = #{oilPrice}</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>
@@ -40,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="oilGunNo != null">oil_gun_no,</if>
             <if test="oilName != null">oil_name,</if>
+            <if test="oilPrice != null">oil_price,</if>
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
             <if test="date != null">date,</if>
@@ -48,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oilGunNo != null">#{oilGunNo},</if>
             <if test="oilName != null">#{oilName},</if>
+            <if test="oilPrice != null">#{oilPrice},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
             <if test="date != null">#{date},</if>
@@ -60,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="oilGunNo != null">oil_gun_no = #{oilGunNo},</if>
             <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="stationName != null">station_name = #{stationName},</if>
             <if test="date != null">date = #{date},</if>

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

@@ -14,10 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="operator"    column="operator"    />
+        <result property="status"    column="status"    />
+        <result property="oilPriceId"    column="oil_price_id"    />
     </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
+        select adjust_price_id, oil_name, oil_adjust_price, take_effect_status, take_effect_date, adjust_date, station_id, station_name, operator, status, oil_price_id from station_oil_price_adjust
     </sql>
 
     <select id="selectStationOilPriceAdjustList" parameterType="StationOilPriceAdjust" resultMap="StationOilPriceAdjustResult">
@@ -31,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="oilPriceId != null "> and oil_price_id = #{oilPriceId}</if>
         </where>
     </select>
     
@@ -50,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
             <if test="operator != null">operator,</if>
+            <if test="status != null">status,</if>
+            <if test="oilPriceId != null">oil_price_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oilName != null">#{oilName},</if>
@@ -60,6 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
             <if test="operator != null">#{operator},</if>
+            <if test="status != null">#{status},</if>
+            <if test="oilPriceId != null">#{oilPriceId},</if>
          </trim>
     </insert>
 
@@ -74,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="stationName != null">station_name = #{stationName},</if>
             <if test="operator != null">operator = #{operator},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="oilPriceId != null">oil_price_id = #{oilPriceId},</if>
         </trim>
         where adjust_price_id = #{adjustPriceId}
     </update>

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

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

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

@@ -1,53 +1,56 @@
-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
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilPrice.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassStructureServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationNoticeController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationDeviceManageMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationInfoServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IPayOrderService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilGunService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationPayServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationPayMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationDeviceManageController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationPay.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\PayOrderMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationClassStructureService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationPayService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationDeviceManage.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceAdjustService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationNotice.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationClassesSummaryController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceAdjustServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationPersonnelMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationInfoService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilGunController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\PayOrderServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationNoticeService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilPriceAdjust.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilPriceServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationClassStructureController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationPersonnel.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationDeviceManageServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationOilPriceAdjustController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationClassesSummaryServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationOilPriceService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceAdjustMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\task\SaticScheduleTask.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\PayOrder.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationClassesSummaryMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationNoticeServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationPersonnelController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilPriceMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationDeviceManageService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationPayController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationClassesSummary.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\StationInfoController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationOilGun.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationPersonnelService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationClassStructure.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationInfoMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationPersonnelServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\domain\StationInfo.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\controller\PayOrderController.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationNoticeMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\impl\StationOilGunServiceImpl.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationClassStructureMapper.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\service\IStationClassesSummaryService.java
+E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\StationOilGunMapper.java