FengChaoYu hai 9 meses
pai
achega
bededc9f68

+ 11 - 11
mall-miniapp-service/src/main/resources/mapper/MaterialMapper.xml

@@ -369,16 +369,16 @@
             CASE a.apply_category WHEN 'HOME' THEN '家用空调'
             WHEN 'TRADE' THEN '商用空调'
             WHEN 'ELEC' THEN '生活电器(小家电)'
-            ELSE '' END AS applyCategoryName,
+            ELSE '' END AS apply_category_name,
             a.apply_type,
             CASE a.apply_type WHEN 'NEW' THEN '新件返还'
             WHEN 'LOST' THEN '破损返还'
             WHEN 'BUG' THEN '故障返还'
-            ELSE '' END AS applyTypeName,
+            ELSE '' END AS apply_type_name,
             a.refund_mode,
             CASE a.refund_mode WHEN 'EXPRESS' THEN '快递'
             WHEN 'SELF' THEN '网点自还'
-            ELSE '' END AS refundModeName,
+            ELSE '' END AS refund_mode_name,
             a.express_no,
             a.receive_address,
             a.receive_websit_id,
@@ -390,7 +390,7 @@
             a.worker_name,
             a.refund_amount,
             a.refund_amount_mode,
-            IF(refund_amount_mode = 'CASH', '现金', '微信') AS refundAmountModeName,
+            IF(refund_amount_mode = 'CASH', '现金', '微信') AS refundAmount_mode_name,
             a.remark,
             a.examine_remark,
             a.flag,
@@ -399,7 +399,7 @@
             WHEN 'AGREE' THEN '待返还'
             WHEN 'REJECT' THEN '驳回'
             WHEN 'REFUNDED' THEN '已返还'
-            ELSE '' END AS flagName,
+            ELSE '' END AS flag_name,
             a.create_by,
             a.create_time,
             a.update_by,
@@ -791,20 +791,20 @@
             CASE a.apply_category WHEN 'HOME' THEN '家用空调'
             WHEN 'TRADE' THEN '商用空调'
             WHEN 'ELEC' THEN '生活电器(小家电)'
-            ELSE '' END AS applyCategoryName,
+            ELSE '' END AS apply_category_name,
             a.apply_type,
             CASE a.apply_type WHEN 'NEW' THEN '新件返还'
             WHEN 'LOST' THEN '破损返还'
             WHEN 'BUG' THEN '故障返还'
-            ELSE '' END AS applyTypeName,
+            ELSE '' END AS apply_type_name,
             a.refund_mode,
             CASE a.refund_mode WHEN 'EXPRESS' THEN '快递'
             WHEN 'SELF' THEN '网点自还'
-            ELSE '' END AS refundModeName,
+            ELSE '' END AS refund_mode_name,
             a.repair_flag,
             CASE a.repair_flag WHEN 'INNER' THEN '保内'
             WHEN 'OUTSIDE' THEN '保外'
-            ELSE '' END AS repairFlagName,
+            ELSE '' END AS repair_flag_name,
             a.express_no,
             a.receive_address,
             a.receive_websit_id,
@@ -823,7 +823,7 @@
             a.settlement_state,
             CASE a.settlement_state WHEN 0 THEN '未结算'
             WHEN 1 THEN '已结算'
-            ELSE '' END AS settlementStateName,
+            ELSE '' END AS settlement_state_name,
             a.remark,
             a.examine_remark,
             a.flag,
@@ -833,7 +833,7 @@
             WHEN a.flag = 'AGREE' and a.repair_flag = 'OUTSIDE' THEN '通过'
             WHEN a.flag = 'REJECT' THEN '驳回'
             WHEN a.flag = 'REFUNDED' THEN '已返还'
-            ELSE a.flag = '' END AS flagName,
+            ELSE a.flag = '' END AS flag_name,
             a.create_by,
             a.create_time,
             a.update_by,