org full name to dept full name
This commit is contained in:
		
							parent
							
								
									ce7dcfb2c1
								
							
						
					
					
						commit
						fd4b9522c0
					
				| 
						 | 
				
			
			@ -36,7 +36,7 @@
 | 
			
		|||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.cust_num,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        sd.dept_name as org_full_name,
 | 
			
		||||
        sd.dept_full_name as org_full_name,
 | 
			
		||||
        t4.order_id,
 | 
			
		||||
        t4.mac_order_id,
 | 
			
		||||
        t4.order_time,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,7 @@
 | 
			
		|||
                ci.cust_num,
 | 
			
		||||
                ci.nick_name as cust_name,
 | 
			
		||||
                ci.phonenumber as mobile,
 | 
			
		||||
                sd.dept_name as org_full_name,
 | 
			
		||||
                sd.dept_full_name as org_full_name,
 | 
			
		||||
                t3.psn_type_name,
 | 
			
		||||
                t4.wallet_bal     walletBal,
 | 
			
		||||
                t4.frozen_balance walletFreezeBal,
 | 
			
		||||
| 
						 | 
				
			
			@ -85,7 +85,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        t4.dept_name as org_full_name,
 | 
			
		||||
        t4.dept_full_name as org_full_name,
 | 
			
		||||
        t3.psn_type_name,
 | 
			
		||||
        t1.acc_bal_total,
 | 
			
		||||
        t1.wallet_bal,
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +190,7 @@
 | 
			
		|||
            ci.cust_num,
 | 
			
		||||
            ci.nick_name as cust_name,
 | 
			
		||||
            ci.phonenumber as mobile,
 | 
			
		||||
            t3.dept_name as org_full_name,
 | 
			
		||||
            t3.dept_full_name as org_full_name,
 | 
			
		||||
            t4.wallet_bal
 | 
			
		||||
        FROM
 | 
			
		||||
        acc_draw_audit t1
 | 
			
		||||
| 
						 | 
				
			
			@ -246,7 +246,7 @@
 | 
			
		|||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        t3.psn_type_name,
 | 
			
		||||
        t4.dept_name as org_full_name,
 | 
			
		||||
        t4.dept_full_name as org_full_name,
 | 
			
		||||
        t1.flow_instance_id,
 | 
			
		||||
        t1.audit_reason AS refusedReason,
 | 
			
		||||
        t1.with_draw_result
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@
 | 
			
		|||
        t2.cust_num,
 | 
			
		||||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        t3.dept_name as org_full_name,
 | 
			
		||||
        t3.dept_full_name as org_full_name,
 | 
			
		||||
        t4.psn_type_name,
 | 
			
		||||
        t1.amount,
 | 
			
		||||
        t1.receive_end_date,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,7 @@
 | 
			
		|||
<!--    查询充值撤销异常记录-v4-->
 | 
			
		||||
    <select id="selectAccTradeCashErrorV4" resultType="com.bonus.canteen.core.account.v3.web.vo.AccTradeCashPageVO">
 | 
			
		||||
        select  a.* ,b.nick_name AS cust_name
 | 
			
		||||
               , sd.dept_name as org_full_name
 | 
			
		||||
               , sd.dept_full_name as org_full_name
 | 
			
		||||
        from acc_trade_cash_error a
 | 
			
		||||
        left join sys_user b  on a.cust_id=b.cust_id
 | 
			
		||||
        left join sys_dept sd on b.dept_id = sd.dept_id
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,7 +34,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        co.dept_name as org_full_name,
 | 
			
		||||
        co.dept_full_name as org_full_name,
 | 
			
		||||
        ci.psn_type,
 | 
			
		||||
        cpt.psn_type_name
 | 
			
		||||
        FROM
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@
 | 
			
		|||
            ci.cust_num,
 | 
			
		||||
            ci.nick_name as cust_name,
 | 
			
		||||
            ci.phonenumber as mobile,
 | 
			
		||||
            sd.dept_name as org_full_name,
 | 
			
		||||
            sd.dept_full_name as org_full_name,
 | 
			
		||||
            ifnull( t.consume_num, 0 ) AS consume_num,
 | 
			
		||||
            ifnull( t.consume_amount, 0 ) AS consume_amount,
 | 
			
		||||
            ifnull( t.consume_repair_num, 0 ) AS consume_repair_num,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -506,7 +506,7 @@
 | 
			
		|||
            t.statistic_date,
 | 
			
		||||
        </if>
 | 
			
		||||
        g.dept_id as org_id, g.dept_name as org_name,
 | 
			
		||||
        g.dept_name as org_full_name,
 | 
			
		||||
        g.dept_full_name as org_full_name,
 | 
			
		||||
        ifnull( t.wallet_consume_amount, 0 ) AS wallet_consume_amount,
 | 
			
		||||
        ifnull( t.subsidy_consume_amount, 0 ) AS subsidy_consume_amount,
 | 
			
		||||
        ifnull( t.luck_consume_amount, 0 ) AS luck_consume_amount,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -236,7 +236,7 @@
 | 
			
		|||
        a.status as cust_state,
 | 
			
		||||
        a.cust_num,
 | 
			
		||||
        a.nick_name as cust_name,
 | 
			
		||||
        sd.dept_name as org_full_name,
 | 
			
		||||
        sd.dept_full_name as org_full_name,
 | 
			
		||||
        a.face_url as cust_photo_url,
 | 
			
		||||
        a.avatar as head_portrait_url,
 | 
			
		||||
        a.phonenumber as mobile,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,7 @@
 | 
			
		|||
        h.cust_id,
 | 
			
		||||
        c.nick_name as cust_name,
 | 
			
		||||
        c.phonenumber as mobile,
 | 
			
		||||
        co.dept_name as org_full_name,
 | 
			
		||||
        co.dept_full_name as org_full_name,
 | 
			
		||||
        h.health_info_source,
 | 
			
		||||
        c.sex
 | 
			
		||||
        FROM
 | 
			
		||||
| 
						 | 
				
			
			@ -70,7 +70,7 @@
 | 
			
		|||
        h.cust_id,
 | 
			
		||||
        c.nick_name as cust_name,
 | 
			
		||||
        c.phonenumber as mobile,
 | 
			
		||||
        co.dept_name as org_full_name,
 | 
			
		||||
        co.dept_full_name as org_full_name,
 | 
			
		||||
        h.health_info_source,
 | 
			
		||||
        c.sex
 | 
			
		||||
        FROM
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,7 @@
 | 
			
		|||
        SELECT a.cust_id,
 | 
			
		||||
               a.cust_num,
 | 
			
		||||
               a.nick_name as cust_name,
 | 
			
		||||
               sd.dept_name as org_full_name,
 | 
			
		||||
               sd.dept_full_name as org_full_name,
 | 
			
		||||
        <!--  cp.place_full_name, -->
 | 
			
		||||
               a.phonenumber as mobile,
 | 
			
		||||
               a.face_url as cust_photo_url,
 | 
			
		||||
| 
						 | 
				
			
			@ -55,7 +55,7 @@
 | 
			
		|||
               a.phonenumber as mobile,
 | 
			
		||||
               a.sex,
 | 
			
		||||
               a.dept_id as org_id,
 | 
			
		||||
               sd.dept_name as org_full_name,
 | 
			
		||||
               sd.dept_full_name as org_full_name,
 | 
			
		||||
               a.psn_type,
 | 
			
		||||
               a.psn_type_name,
 | 
			
		||||
        <!--  a.place_id,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -93,7 +93,7 @@
 | 
			
		|||
        oai.*,
 | 
			
		||||
        ci.cust_num custNum,
 | 
			
		||||
        ci.nick_name custName,
 | 
			
		||||
        sd.dept_name as orgFullName,
 | 
			
		||||
        sd.dept_full_name as orgFullName,
 | 
			
		||||
        ci.psn_type psnType,
 | 
			
		||||
        cp.psn_type_name psnTypeName
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -287,7 +287,7 @@
 | 
			
		|||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.cust_num,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        sd.dept_name as org_full_name
 | 
			
		||||
        sd.dept_full_name as org_full_name
 | 
			
		||||
        FROM  order_info t1
 | 
			
		||||
        LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id
 | 
			
		||||
        LEFT JOIN sys_dept sd ON t2.dept_id = sd.dept_id
 | 
			
		||||
| 
						 | 
				
			
			@ -325,7 +325,7 @@
 | 
			
		|||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.cust_num,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        sd.dept_name as org_full_name
 | 
			
		||||
        sd.dept_full_name as org_full_name
 | 
			
		||||
        FROM order_info t1
 | 
			
		||||
        LEFT JOIN sys_user t2 ON t1.cust_id = t2.cust_id
 | 
			
		||||
        LEFT JOIN sys_dept sd ON t2.dept_id = sd.dept_id
 | 
			
		||||
| 
						 | 
				
			
			@ -533,7 +533,7 @@
 | 
			
		|||
        oi.remark,
 | 
			
		||||
        ci.cust_num AS custNum,
 | 
			
		||||
        ci.nick_name AS custName,
 | 
			
		||||
        sd.dept_name AS orgFullName,
 | 
			
		||||
        sd.dept_full_name AS orgFullName,
 | 
			
		||||
        ci.psn_type AS psnType,
 | 
			
		||||
        ci.psn_type_name AS psnTypeName
 | 
			
		||||
        FROM order_info oi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        <!--  ci.cust_type, -->
 | 
			
		||||
        sd.dept_name as org_full_name,
 | 
			
		||||
        sd.dept_full_name as org_full_name,
 | 
			
		||||
        ci.face_url as cust_photo_url,
 | 
			
		||||
        ci.psn_type,
 | 
			
		||||
        ci.psn_type_name
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
    <select id="listOrganizationSummary" resultType="com.bonus.canteen.core.report.statistics.account.vo.ReportAccountConsumeOrganizationVO">
 | 
			
		||||
        SELECT
 | 
			
		||||
        g.dept_id as org_id, g.dept_name as org_name
 | 
			
		||||
              , g.dept_name as org_full_name,
 | 
			
		||||
              , g.dept_full_name as org_full_name,
 | 
			
		||||
        ifnull( t.consume_num, 0 ) AS consume_num,
 | 
			
		||||
        ifnull( t.consume_amount, 0 ) AS consume_amount,
 | 
			
		||||
        ifnull( t.consume_repair_num, 0 ) AS consume_repair_num,
 | 
			
		||||
| 
						 | 
				
			
			@ -99,7 +99,7 @@
 | 
			
		|||
        t.change_flag
 | 
			
		||||
        FROM (
 | 
			
		||||
        SELECT g.dept_id as org_id, g.dept_name as org_name,
 | 
			
		||||
               g.dept_name as org_full_name,
 | 
			
		||||
               g.dept_full_name as org_full_name,
 | 
			
		||||
               g.ancestors as org_full_id,
 | 
			
		||||
               0 as idno, e.statistic_date FROM sys_dept g LEFT JOIN (
 | 
			
		||||
        SELECT
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1858,7 +1858,7 @@
 | 
			
		|||
               a.cust_id,
 | 
			
		||||
               ci.dept_id as org_id,
 | 
			
		||||
               g.dept_name as org_name,
 | 
			
		||||
              <!-- g.org_full_name, -->
 | 
			
		||||
               g.dept_full_name,
 | 
			
		||||
               ci.psn_type,
 | 
			
		||||
               p.psn_type_name,
 | 
			
		||||
               di.device_num,
 | 
			
		||||
| 
						 | 
				
			
			@ -1903,7 +1903,7 @@
 | 
			
		|||
               a.cust_id,
 | 
			
		||||
               ci.dept_id,
 | 
			
		||||
               g.dept_name as org_name,
 | 
			
		||||
              <!-- g.org_full_name, -->
 | 
			
		||||
               g.dept_full_name,
 | 
			
		||||
               ci.psn_type,
 | 
			
		||||
               p.psn_type_name,
 | 
			
		||||
               di.device_num,
 | 
			
		||||
| 
						 | 
				
			
			@ -1952,7 +1952,7 @@
 | 
			
		|||
               a.cust_id,
 | 
			
		||||
               ci.dept_id as org_id,
 | 
			
		||||
               g.dept_name as org_name,
 | 
			
		||||
              <!-- g.org_full_name, -->
 | 
			
		||||
               g.dept_full_name,
 | 
			
		||||
               ci.psn_type,
 | 
			
		||||
               p.psn_type_name,
 | 
			
		||||
               di.device_num,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -244,7 +244,7 @@
 | 
			
		|||
        t2.cust_num,
 | 
			
		||||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        sd.dept_name as org_full_name,
 | 
			
		||||
        sd.dept_full_name as org_full_name,
 | 
			
		||||
        t2.psn_type,
 | 
			
		||||
        cpt.psn_type_name
 | 
			
		||||
        FROM acc_info ai
 | 
			
		||||
| 
						 | 
				
			
			@ -315,7 +315,7 @@
 | 
			
		|||
        t2.cust_num,
 | 
			
		||||
        t2.nick_name as cust_name,
 | 
			
		||||
        t2.phonenumber as mobile,
 | 
			
		||||
        sd.dept_name as org_full_name,
 | 
			
		||||
        sd.dept_full_name as org_full_name,
 | 
			
		||||
        t2.psn_type,
 | 
			
		||||
        t7.psn_type_name,
 | 
			
		||||
        t1.acc_status,
 | 
			
		||||
| 
						 | 
				
			
			@ -798,7 +798,7 @@
 | 
			
		|||
        t2.nick_name AS cust_name,
 | 
			
		||||
        t2.phonenumber AS mobile,
 | 
			
		||||
        t3.psn_type_name,
 | 
			
		||||
        t4.dept_name AS org_full_name
 | 
			
		||||
        t4.dept_full_name AS org_full_name
 | 
			
		||||
        FROM
 | 
			
		||||
        acc_info t1
 | 
			
		||||
        LEFT JOIN sys_user AS t2 ON t2.cust_id = t1.cust_id
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@
 | 
			
		|||
        ci.nick_name as cust_name,
 | 
			
		||||
        atr.org_id,
 | 
			
		||||
        co.dept_name as org_name,
 | 
			
		||||
        co.dept_name AS org_full_name,
 | 
			
		||||
        co.dept_full_name AS org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atr.amount AS flowAmount,
 | 
			
		||||
| 
						 | 
				
			
			@ -289,7 +289,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name AS cust_name,
 | 
			
		||||
        ci.phonenumber AS mobile,
 | 
			
		||||
        co.dept_name AS org_full_name,
 | 
			
		||||
        co.dept_full_name AS org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atr.amount as clearAmount,
 | 
			
		||||
| 
						 | 
				
			
			@ -695,7 +695,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name AS cust_name,
 | 
			
		||||
        ci.phonenumber AS mobile,
 | 
			
		||||
        co.dept_name AS org_full_name,
 | 
			
		||||
        co.dept_full_name AS org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atwd.amount as repealAmount,
 | 
			
		||||
| 
						 | 
				
			
			@ -804,7 +804,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name AS cust_name,
 | 
			
		||||
        ci.phonenumber AS mobile,
 | 
			
		||||
        t6.dept_name AS org_full_name,
 | 
			
		||||
        t6.dept_full_name AS org_full_name,
 | 
			
		||||
        t4.psn_type_name,
 | 
			
		||||
        t1.amount AS withdrawAmount,
 | 
			
		||||
        t5.wallet_id AS withdrawWalletType,
 | 
			
		||||
| 
						 | 
				
			
			@ -933,7 +933,7 @@
 | 
			
		|||
            IFNULL( min( t4.psn_type_name ), '未分类人员' ) AS psn_type_name,
 | 
			
		||||
        </if>
 | 
			
		||||
        <if test="param.type == 3">
 | 
			
		||||
            min(t3.dept_name) AS org_full_name,
 | 
			
		||||
            min(t3.dept_full_name) AS org_full_name,
 | 
			
		||||
        </if>
 | 
			
		||||
        t1.withdraw_source,
 | 
			
		||||
        t1.pay_channel,
 | 
			
		||||
| 
						 | 
				
			
			@ -1011,7 +1011,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name AS cust_name,
 | 
			
		||||
        ci.phonenumber AS mobile,
 | 
			
		||||
        co.dept_name AS org_full_name,
 | 
			
		||||
        co.dept_full_name AS org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atr.trade_type,
 | 
			
		||||
| 
						 | 
				
			
			@ -1093,7 +1093,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name AS cust_name,
 | 
			
		||||
        ci.phonenumber AS mobile,
 | 
			
		||||
        co.dept_name AS org_full_name,
 | 
			
		||||
        co.dept_full_name AS org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atwd.wallet_id,
 | 
			
		||||
| 
						 | 
				
			
			@ -1176,7 +1176,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        co.dept_name as org_full_name,
 | 
			
		||||
        co.dept_full_name as org_full_name,
 | 
			
		||||
        atr.psn_type,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atr.amount as rechargeAmount,
 | 
			
		||||
| 
						 | 
				
			
			@ -1297,7 +1297,7 @@
 | 
			
		|||
        SELECT
 | 
			
		||||
        g.dept_id as org_id,
 | 
			
		||||
       <!-- g.org_num, -->
 | 
			
		||||
        g.dept_name as org_full_name,
 | 
			
		||||
        g.dept_full_name as org_full_name,
 | 
			
		||||
        IFNULL( t3.rechargeCount, 0 ) AS rechargeCount,
 | 
			
		||||
        IFNULL( t3.rechargeAmount, 0 ) AS rechargeAmount,
 | 
			
		||||
        t3.change_flag
 | 
			
		||||
| 
						 | 
				
			
			@ -1346,7 +1346,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        co.dept_name AS custOrgFullName,
 | 
			
		||||
        co.dept_full_name AS custOrgFullName,
 | 
			
		||||
        IFNULL( t3.rechargeCount, 0 ) AS rechargeCount,
 | 
			
		||||
        IFNULL( t3.rechargeAmount, 0 ) AS rechargeAmount,
 | 
			
		||||
        t3.change_flag
 | 
			
		||||
| 
						 | 
				
			
			@ -1544,7 +1544,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        t6.dept_name as org_full_name,
 | 
			
		||||
        t6.dept_full_name as org_full_name,
 | 
			
		||||
        t4.psn_type_name,
 | 
			
		||||
        t1.trade_type,
 | 
			
		||||
        t1.pay_channel,
 | 
			
		||||
| 
						 | 
				
			
			@ -1645,7 +1645,7 @@
 | 
			
		|||
        ci.cust_num,
 | 
			
		||||
        ci.nick_name as cust_name,
 | 
			
		||||
        ci.phonenumber as mobile,
 | 
			
		||||
        co.dept_name as org_full_name,
 | 
			
		||||
        co.dept_full_name as org_full_name,
 | 
			
		||||
        cpt.psn_type_name,
 | 
			
		||||
        atr.trade_type,
 | 
			
		||||
        atr.amount AS repealAmount,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue