退款信息修改，班结统计的方式，退款审核2021-10-15

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

@@ -52,6 +52,9 @@
         <result property="wxNum"    column="wx_num"    />
         <result property="zfbNum"    column="zfb_num"    />
         <result property="xjNum"    column="xj_num"    />
+        <result property="status"    column="status"    />
+        <result property="dzkNum"    column="dzk_num"    />
+        <result property="refundAmt"    column="refund_amt"    />
     </resultMap>
 
     <sql id="selectStationClassStructureVo">
@@ -60,7 +63,7 @@
         print_num, class_structure_no, class_start_date, class_structure_date, class_structure_man, oils,
          receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt,
          pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, car_no,
-         customer_phone, customer_grade
+         customer_phone, customer_grade,status
           from station_class_structure s join sys_dept d on s.station_id = d.dept_id
     </sql>
 
@@ -108,6 +111,7 @@
             <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="status != null  and status != ''"> and status = #{status}</if>
         </where>
         order by  id desc
     </select>
@@ -119,6 +123,7 @@
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
         GROUP BY a.oil_personnel
     </select>
@@ -129,6 +134,7 @@
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
         GROUP BY a.oil_name,a.station_id,a.class_start_date,a.class_structure_date,a.class_structure_man
     </select>
@@ -142,6 +148,7 @@
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
         )
     </select>
@@ -157,6 +164,7 @@
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
             <if test="likeClassStructureNo != null  and likeClassStructureNo != ''">  and class_structure_no like concat( #{likeClassStructureNo}, '%') </if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
     </select>
     <!--根据班次号汇总班结数据-->
@@ -170,6 +178,7 @@
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null  and status != ''"> and s.status = #{status}</if>
         </where>
         GROUP BY class_structure_no,class_start_date,station_id,d.dept_name,class_structure_date,class_structure_man
     </select>
@@ -185,25 +194,29 @@
     <select id="listPersonnelPayStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         SELECT   oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,
         sum(discount_amt) discount_amt,
-        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,
+        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,sum(dzk_amt)  dzk_amt,
         SUM(xj_amt) xj_amt,sum(member_amt) member_amt,
-        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num
+        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num,sum(e.dzk_num)  dzk_num,sum(e.refund_amt) refund_amt
         from (
-        SELECT station_id,class_structure_no, order_type,oil_personnel,oil_gun,discount_amt,discount_coupon_amt,wx_amt,zfb_amt,xj_amt,member_amt,
+        SELECT station_id,class_structure_no, order_type,oil_personnel,oil_gun,discount_amt,discount_coupon_amt,wx_amt,zfb_amt,xj_amt,member_amt,status,dzk_amt,
         (SELECT COUNT(b.order_no) from station_class_structure b where 1=1 and a.id = b.id and b.pay_type="xj" ) xj_num,
         (SELECT COUNT(c.order_no) from station_class_structure c where 1=1 and a.id = c.id and c.pay_type="zfb" ) zfb_num,
-        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="wx" ) wx_num
+        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="wx" ) wx_num,
+        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="dzk" ) dzk_num,
+        (SELECT sum(d.amt) from station_class_structure d where 1=1 and a.id = d.id and d.status="3") refund_amt
         from station_class_structure  a
         <where>
             <if test="stationId != null and stationId != ''"> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and a.class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and a.status = #{status}</if>
         </where>
         ) e
         <where>
             <if test="stationId != null and stationId != ''"> and e.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and e.class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and e.order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and e.status = #{status}</if>
         </where>
         GROUP BY e.oil_personnel
     </select>
@@ -227,6 +240,7 @@
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
         GROUP BY pay_type,dict_label
     </select>
@@ -238,6 +252,7 @@
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and a.class_structure_no = #{classStructureNo}</if>
+            <if test="status != null and status != ''"> and a.status = #{status}</if>
         </where>
         GROUP BY a.oil_name,a.station_id,a.class_start_date,a.class_structure_date,a.class_structure_man) c
     </select>
@@ -246,24 +261,28 @@
     <select id="listPersonnelPayStructureSum" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         SELECT GROUP_CONCAT(DISTINCT oil_gun) oil_gun,
         sum(discount_amt) discount_amt,
-        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,
+        SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,sum(dzk_amt) dzk_amt,
         SUM(xj_amt) xj_amt,sum(member_amt) member_amt,
-        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num
-        from (SELECT  station_id,class_structure_no, order_type,oil_personnel,oil_gun,discount_amt,discount_coupon_amt,wx_amt,zfb_amt,xj_amt,member_amt,
+        sum(e.xj_num)	xj_num,sum(e.zfb_num)	zfb_num,sum(e.wx_num)	wx_num,sum(e.dzk_num) dzk_num,sum(refund_amt) redund_amt
+        from (SELECT  station_id,class_structure_no, order_type,oil_personnel,oil_gun,discount_amt,discount_coupon_amt,wx_amt,zfb_amt,xj_amt,member_amt,dzk,
         (SELECT COUNT(b.order_no) from station_class_structure b where 1=1 and a.id = b.id and b.pay_type="xj" ) xj_num,
         (SELECT COUNT(c.order_no) from station_class_structure c where 1=1 and a.id = c.id and c.pay_type="zfb" ) zfb_num,
-        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="wx" ) wx_num
+        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="wx" ) wx_num,
+        (SELECT COUNT(d.order_no) from station_class_structure d where 1=1 and a.id = d.id and d.pay_type="dzk" ) dzk_num,
+        (SELECT sum(d.amt) from station_class_structure d where 1=1 and a.id = d.id and d.status="3") refund_amt
         from station_class_structure  a
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and a.class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and a.order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and a.status = #{status}</if>
         </where>
         ) e
         <where>
             <if test="stationId != null "> and e.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and e.class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and e.order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and e.status = #{status}</if>
         </where>
     </select>
 
@@ -275,6 +294,7 @@
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
         </where>
         GROUP BY a.oil_personnel ) b
     </select>
@@ -321,6 +341,7 @@
             <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="status != null  and status != ''"> and status = #{status}</if>
         </where>
         order by  id desc
     </select>
@@ -370,6 +391,7 @@
             <if test="carNo != null">car_no,</if>
             <if test="customerPhone != null">customer_phone,</if>
             <if test="customerGrade != null">customer_grade,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">#{orderNo},</if>
@@ -414,6 +436,7 @@
             <if test="carNo != null">#{carNo},</if>
             <if test="customerPhone != null">#{customerPhone},</if>
             <if test="customerGrade != null">#{customerGrade},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 
@@ -462,6 +485,7 @@
             <if test="carNo != null">car_no = #{carNo},</if>
             <if test="customerPhone != null">customer_phone = #{customerPhone},</if>
             <if test="customerGrade != null">customer_grade = #{customerGrade},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>