aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-01-27 11:00:10 +08:00
parent 0ab1e7eef7 708280ca14
commit b185a94fcc
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/controller/ConvenientInquiryController.java
View File

@@ -211,9 +211,9 @@ public class ConvenientInquiryController {
} }
@ApiOperation("下载交易记录") @ApiOperation("下载交易记录")
@PostMapping("/queryTransaction/download") @GetMapping("/queryTransaction/download")
public void exportTransactionRecords(@Valid @RequestBody QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response){ public void exportTransactionRecords(@RequestParam String params, HttpServletResponse response){
convenientInquiryService.exportTransactionRecords(queryPaymentInfoDTO, response); convenientInquiryService.exportTransactionRecords(params, response);
// return Response.success(); // return Response.success();
} }
} }

2
src/main/java/com/ai/da/service/ConvenientInquiryService.java
View File

@@ -52,5 +52,5 @@ public interface ConvenientInquiryService extends IService<Questionnaire> {
Map<String, List<String>> getCities(); Map<String, List<String>> getCities();
void exportTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response); void exportTransactionRecords(String params, HttpServletResponse response);
} }

5
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.ai.da.model.enums.Language;
import com.ai.da.model.vo.*; import com.ai.da.model.vo.*;
import com.ai.da.service.*; import com.ai.da.service.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -629,7 +630,9 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
}}; }};
} }
public void exportTransactionRecords(QueryPaymentInfoDTO queryPaymentInfoDTO, HttpServletResponse response){ public void exportTransactionRecords(String params, HttpServletResponse response){
QueryPaymentInfoDTO queryPaymentInfoDTO = JSONObject.parseObject(params, QueryPaymentInfoDTO.class);
// 查询数据总量 // 查询数据总量
Long total = paymentInfoMapper.queryPaymentInfoCount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(), Long total = paymentInfoMapper.queryPaymentInfoCount(queryPaymentInfoDTO.getPlatform(), queryPaymentInfoDTO.getPayerTotal(),
queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(), queryPaymentInfoDTO.getType(), queryPaymentInfoDTO.getStatus(),