修改班结信息

Yijia-SaaS/yijia-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: Admin@123#
+                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: develop
+                password: 1234.Abcd
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

Yijia-SaaS/yijia-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ yijia:
   # 实例演示开关
   demoEnabled: true
   # 文件路径
-  profile: D:/img
+  profile: E:/img
   # 获取ip地址开关
   addressEnabled: false
   # 验证码开关

Yijia-SaaS/yijia-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/suxinghua/Documents/yijia/logs" />
+	<property name="log.path" value="/home/testJar/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -70,12 +70,6 @@ public class StationInfoController extends BaseController
         List<StationInfo> list = stationInfoService.selectStationInfoList(stationInfo);
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('station:info:uploadSignImg')")
-    @PostMapping("/uploadSignImg")
-    public TableDataInfo uploadSignImg() {
-        System.out.println("2222223");
-        return null;
-    }
 
     /**
      * 导出油站信息列表

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

@@ -44,6 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="carNo"    column="car_no"    />
         <result property="customerPhone"    column="customer_phone"    />
         <result property="customerGrade"    column="customer_grade"    />
+        <result property="wxNum"    column="wx_num"    />
+        <result property="zfbNum"    column="zfb_num"    />
+        <result property="xjNum"    column="xj_num"  />
+        <result property="qyAmt"    column="qy_amt"  />
+        <result property="cyAmt"    column="cy_amt"  />
     </resultMap>
 
 
@@ -92,9 +97,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
-            <if test="likeConsumer != null  and likeConsumer != ''"> and customer  like concat('%',#{likeConsumer}, '%')</if>
+            <if test="likeConsumer != null  and likeConsumer != ''"> and consumer  like concat('%',#{likeConsumer}, '%')</if>
             <if test="likeCarNo != null  and likeCarNo != ''"> and car_no  like concat('%',#{likeCarNo}, '%') </if>
             <if test="likeCustomerPhone != null  and likeCustomerPhone != ''"> and customer_phone  like concat('%',#{likeCustomerPhone}, '%') </if>
+            <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>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by order_id desc
     </select>
@@ -142,6 +160,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
             <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by order_id desc
     </select>
@@ -153,6 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT SUM(amt) as amt,sum(order_liters) as order_liters
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
             <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')
@@ -160,12 +187,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </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="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
             <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')
@@ -173,6 +209,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY oil_type
     </select>
@@ -180,6 +223,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
             <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')
@@ -187,20 +232,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </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
+        SELECT date_format( b.created_date, '%Y-%m-%d' ) as created_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,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_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' )
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY  date_format( created_date, '%Y-%m-%d' )
+        ORDER BY date_format( created_date, '%Y-%m-%d' ) DESC
     </select>
 <!-- 日报折线图油品数据-->
     <select id="listQydata" parameterType="Long" resultMap="PayOrderResult">
         SELECT sum(amt) as amt,date_format(created_date,'%Y-%m-%d')  as created_date
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="oilName != null "> and oil_name = #{oilName}</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
@@ -208,6 +274,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY oil_name ,date_format(created_date,'%Y-%m-%d')
     </select>
@@ -216,15 +289,93 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT date_format(created_date,'%Y-%m-%d')  as created_date
         from pay_order
         <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY date_format(created_date,'%Y-%m-%d')
     </select>
+
+    <!--查询数据，根据员工汇总数据-->
+    <select id="selectPersonnelStructure" parameterType="Long" resultMap="PayOrderResult">
+        SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.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 pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY a.oil_personnel
+    </select>
+    <!--初始化数据班结数据，根据油品汇总 -->
+    <select id="selectOilStructure" parameterType="Long" resultMap="PayOrderResult">
+        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 pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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 a.oil_name
+    </select>
+    <!--初始化数据班结数据，根据员工/支付方式汇总 -->
+    <select id="selectPersonnelPayStructure" parameterType="Long" resultMap="PayOrderResult">
+        SELECT oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,count(wx_amt) wx_num,count(zfb_amt) zfb_num,count(xj_amt) xj_num,sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,SUM(xj_amt) xj_amt,sum(member_amt) member_amt
+        from  pay_order a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</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 a.oil_personnel
+    </select>
+<!--查询本站第一笔数据-->
+    <select id="getPayOrderInfoMin" parameterType="Long" resultMap="PayOrderResult">
+        SELECT * from pay_order where order_id = (
+        SELECT min(order_id)
+        from pay_order
+            <where>
+                <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+                <if test="stationId != null "> and station_id = #{stationId}</if>
+                <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+                <if test="status != null  and status != ''"> and status = #{status}</if>
+            </where>
+        )
+    </select>
     <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into pay_order
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -106,24 +106,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listPersonnelStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
-        SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT 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
+        SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.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>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
         </where>
-        GROUP BY a.oil_personnel,b.gun_no
+        GROUP BY a.oil_personnel
     </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
+       	SELECT a.station_id, a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(a.receivable_amt),2) as receivable_amt,ROUND(SUM(a.received_amt),2) as received_amt,ROUND(SUM(order_liters),2) as order_liters,ROUND(SUM(a.discount_amt),2) as discount_amt ,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man,sum(a.print_num) print_num
         from station_class_structure a
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
         </where>
-        GROUP BY a.oil_name
+        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, 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
@@ -150,8 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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(receivable_amt) as receivable_amt,sum(amt) as amt,class_structure_man,
+        sum(print_num) as print_num,sum(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt,
+        sum(dzk_amt) as dzk_amt,sum(discount_amt) as discount_amt,SUM(pos_amt) as pos_amt,sum(xj_amt) as xj_amt
         from station_class_structure
         <where>
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
@@ -181,6 +182,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </where>
         )
     </select>
+    <!--根据支付方式汇总数据-->
+    <select id="listPayStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+      	SELECT dict_label as pay_type,sum(order_liters) as order_liters,sum(discount_amt) as discount_amt,count(order_no) order_no,sum(amt) as amt,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_amt
+		from   station_class_structure left JOIN sys_dict_data on dict_value = pay_type and dict_type ='pay_type'
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+		GROUP BY pay_type,dict_label
+    </select>
 <!--  导出数据-->
     <select id="selectStationClassStructureExport" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
@@ -225,7 +236,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
-            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="likePayDate != null  and likePayDate != ''">
+              and date_format(pay_date,'%Y-%m-%d') = date_format(#{likePayDate},'%Y-%m-%d')
+            </if>
         </where>
         order by  id desc
     </select>

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

@@ -33,6 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
             <if test="deviceFactory != null  and deviceFactory != ''"> and device_factory = #{deviceFactory}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by device_id desc
     </select>
@@ -89,10 +96,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteStationDeviceManageByIds" parameterType="String">
-        delete from station_device_manage where device_id in 
+        delete from station_device_manage where device_id in
         <foreach item="deviceId" collection="array" open="(" separator="," close=")">
             #{deviceId}
         </foreach>
     </delete>
-    
+
+    <!--根据油站Id获取打印机编号 -->
+    <select id="getPrinterSnByStationId" parameterType="map" resultType="map">
+        select * from station_device_manage where device_id =(
+            SELECT max(device_id) from  station_device_manage
+            <where>
+                <if test="stationId != null and stationId !=''">
+                    AND station_id = #{stationId}
+                </if>
+                <if test="deviceType != null and deviceType !=''">
+                    AND device_type = #{deviceType}
+                </if>
+            </where>
+        );
+    </select>
 </mapper>

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

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectStationInfoList" parameterType="StationInfo" resultMap="StationInfoResult">
         <include refid="selectStationInfoVo"/>
-        <where>  
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="stationAddress != null  and stationAddress != ''"> and station_address = #{stationAddress}</if>
             <if test="oilGunNum != null "> and oil_gun_num = #{oilGunNum}</if>
@@ -37,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationLongitude != null  and stationLongitude != ''"> and station_longitude = #{stationLongitude}</if>
             <if test="stationLatitude != null  and stationLatitude != ''"> and station_latitude = #{stationLatitude}</if>
             <if test="mno != null "> and mno = #{mno}</if>
+            <if test="stationIdList != null ">
+             and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+             </if>
         </where>
         order by station_id desc
     </select>

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

@@ -29,6 +29,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="date != null "> and date = #{date}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

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

@@ -38,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(take_effect_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by adjust_price_id desc
     </select>

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

@@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
             <if test="date != null "> and date = #{date}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     

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

@@ -17,10 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payPrintNum"    column="pay_print_num"    />
         <result property="payCallbackPage"    column="pay_callback_page"    />
         <result property="wsPrintFlag"    column="ws_print_flag"    />
+        <result property="printSetting"    column="print_setting"    />
+        <result property="discountSetting"    column="discount_setting"    />
     </resultMap>
 
     <sql id="selectStationPayVo">
-        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag from station_pay
+        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag, print_setting, discount_setting from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
@@ -37,6 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payPrintNum != null "> and pay_print_num = #{payPrintNum}</if>
             <if test="payCallbackPage != null  and payCallbackPage != ''"> and pay_callback_page = #{payCallbackPage}</if>
             <if test="wsPrintFlag != null  and wsPrintFlag != ''"> and ws_print_flag = #{wsPrintFlag}</if>
+            <if test="printSetting != null  and printSetting != ''"> and print_setting = #{printSetting}</if>
+            <if test="discountSetting != null  and discountSetting != ''"> and discount_setting = #{discountSetting}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     
@@ -59,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payPrintNum != null">pay_print_num,</if>
             <if test="payCallbackPage != null">pay_callback_page,</if>
             <if test="wsPrintFlag != null">ws_print_flag,</if>
+            <if test="printSetting != null">print_setting,</if>
+            <if test="discountSetting != null">discount_setting,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payMode != null">#{payMode},</if>
@@ -72,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payPrintNum != null">#{payPrintNum},</if>
             <if test="payCallbackPage != null">#{payCallbackPage},</if>
             <if test="wsPrintFlag != null">#{wsPrintFlag},</if>
+            <if test="printSetting != null">#{printSetting},</if>
+            <if test="discountSetting != null">#{discountSetting},</if>
          </trim>
     </insert>
 
@@ -89,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payPrintNum != null">pay_print_num = #{payPrintNum},</if>
             <if test="payCallbackPage != null">pay_callback_page = #{payCallbackPage},</if>
             <if test="wsPrintFlag != null">ws_print_flag = #{wsPrintFlag},</if>
+            <if test="printSetting != null">print_setting = #{printSetting},</if>
+            <if test="discountSetting != null">discount_setting = #{discountSetting},</if>
         </trim>
         where pay_id = #{payId}
     </update>

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

@@ -27,6 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
             <if test="personnelPhone != null  and personnelPhone != ''"> and personnel_phone = #{personnelPhone}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by personnel_id desc
     </select>

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Jan 13 11:21:32 CST 2021
+#Sat Jan 23 23:41:46 CST 2021
 version=1.0.1
 groupId=com.yijia
 artifactId=yijia-station

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

@@ -37,6 +37,7 @@ 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\utils\FeiEPrinterUtil.class
 com\yijia\station\service\IStationOilPriceService.class
 com\yijia\station\mapper\StationClassesSummaryMapper.class
 com\yijia\station\domain\StationNotice.class

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

@@ -5,6 +5,7 @@ E:\JDD-SAAS\Yijia-SaaS\yijia-station\src\main\java\com\yijia\station\mapper\Stat
 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\utils\FeiEPrinterUtil.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

Yijia-SaaS/yijia-system/target/classes/mapper/system/SysDeptMapper.xml

@@ -20,10 +20,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="jiBie" column="ji_bie" />
+		<result property="deptAddress"    column="dept_address"    />
+		<result property="oilGunNum"    column="oil_gun_num"    />
+		<result property="stationPic"    column="station_pic"    />
+		<result property="stationLongitude"    column="station_longitude"    />
+		<result property="stationLatitude"    column="station_latitude"    />
+		<result property="mno"    column="mno"    />
+		<result property="appId"    column="app_id"    />
+		<result property="appSecret"    column="app_secret"    />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.ji_bie, d.dept_address, d.oil_gun_num, d.station_pic, d.station_longitude, d.station_latitude, d.mno, d.app_id, d.app_secret
         from sys_dept d
     </sql>
     
@@ -81,7 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
 	</select>
-    
+    <!--调用存储过程-->
+	<select id="selectDeptListTree" statementType="CALLABLE" useCache="false">
+		{call deptinfo()};
+	</select>
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -94,6 +106,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="jiBie != null">ji_bie,</if>
+			<if test="deptAddress != null">dept_address,</if>
+			<if test="oilGunNum != null">oil_gun_num,</if>
+			<if test="stationPic != null">station_pic,</if>
+			<if test="stationLongitude!= null">station_longitude,</if>
+			<if test="stationLatitude != null">station_latitude,</if>
+			<if test="mno != null">mno,</if>
+			<if test="appId != null">app_id,</if>
+			<if test="appSecret != null">app_secret,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -106,6 +127,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="jiBie != null">#{jiBie},</if>
+			<if test="deptAddress != null">#{deptAddress},</if>
+			<if test="oilGunNum != null">#{oilGunNum},</if>
+			<if test="stationPic != null">#{stationPic},</if>
+			<if test="stationLongitude!= null">#{stationLongitude},</if>
+			<if test="stationLatitude != null">#{stationLatitude},</if>
+			<if test="mno != null">#{mno},</if>
+			<if test="appId != null">#{appId},</if>
+			<if test="appSecret != null">#{appSecret},</if>
  			sysdate()
  		)
 	</insert>
@@ -122,6 +152,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="jiBie != null">ji_bie = #{jiBie},</if>
+			<if test="deptAddress!= null">dept_address = #{deptAddress},</if>
+			<if test="oilGunNum != null">oil_gun_num = #{oilGunNum},</if>
+			<if test="stationPic != null">station_pic = #{stationPic},</if>
+			<if test="stationLongitude!= null">station_longitude = #{stationLongitude},</if>
+			<if test="stationLatitude != null">station_latitude = #{stationLatitude},</if>
+			<if test="mno != null">mno = #{mno},</if>
+			<if test="appId != null">app_id = #{appId},</if>
+			<if test="appSecret != null">app_secret = #{appSecret},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}