master
wangning 7 years ago
commit e3c7927bab

@ -130,6 +130,9 @@ public class RetailAppController {
@RequestMapping("/{client_id}/settlement_logs/{clearingDetailId}/analysis/{channel}") @RequestMapping("/{client_id}/settlement_logs/{clearingDetailId}/analysis/{channel}")
public Map<String,JSONObject> channelAndDayOfAnalysis(@PathVariable int client_id, @PathVariable String clearingDetailId, public Map<String,JSONObject> channelAndDayOfAnalysis(@PathVariable int client_id, @PathVariable String clearingDetailId,
@PathVariable String channel,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { @PathVariable String channel,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
if ("all".equals(channel)){
channel = "null";
}
return retailAppService.channelAndDayOfAnalysis(client_id, clearingDetailId,channel,device); return retailAppService.channelAndDayOfAnalysis(client_id, clearingDetailId,channel,device);
} }

@ -18,7 +18,7 @@
<a class="text-primary" role="button" title="modify logs" <a class="text-primary" role="button" title="modify logs"
ng-click="showSubMerchantLogs(sub_merchant_id_logs)"> ng-click="showSubMerchantLogs(sub_merchant_id_logs)">
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary">logs</span> <span class="label label-primary">history</span>
</span> </span>
</a> </a>
</span> </span>

Loading…
Cancel
Save